Changeset 2421 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-fork.c

Timestamp:

Sep 24, 2009, 3:50:38 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove some compiler warnings on main
• Adds function mr_chomp and mr_strip_char and use them in mr_date and call_program_and_get_last_line_of_output
• Fix call_program_and_get_last_line_of_output to return the right result using a temp file instead of popen
• Fix an issue in mr_getline_int in case of eof (returns now an empty string)
• Sequencing of Init of bkpinfo reviewed

File:

• branches/2.2.10/mondo/src/common/libmondo-fork.c (modified) (3 diffs)

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -8 +8 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -39 +40 @@
     char *result = NULL;
     char *tmpf = NULL;
+    char *newcall = NULL;
+    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
-    FILE *fin;
+    FILE *fin = NULL;
 
     /*@******************************************************************** */
@@ -47 +50 @@
     assert_string_is_neither_NULL_nor_zerolength(call);
 
-    mr_asprintf(tmpf, "%s/cpgll.out", bkpinfo->scratchdir);
-    mr_strcat(call, " > %s", tmpf);
-    log_msg(4, "Calling command: %s", call);
+    mr_asprintf(tmpf, "%s/cpgll.out", bkpinfo->tmpdir);
+    mr_asprintf(newcall, "%s > %s", call, tmpf);
+    log_msg(4, "Calling command: %s", newcall);
     /* By default return an empty string in any case */
     mr_asprintf(result, "");
 
-    system(call);
-    if ((fin = fopen(ftmp, "r"))) {
+    system(newcall);
+    mr_free(newcall);
+
+    if ((fin = fopen(tmpf, "r"))) {
         while (!feof(fin)) {
-            mr_getline(result, fin);
-            log_msg(9, "Loop result: %s", result);
-        }
-        log_msg(4, "Final Result: %s", result);
+            mr_getline(tmp, fin);
+            mr_chomp(tmp);
+            /* In case of extreme debug ;-)
+            log_msg(9, "Loop result: ***%s***", tmp);
+            */
+            /*  There is empty contant at the end of the file that needs to be skiped */
+            if (strlen(tmp) > 0) {
+                mr_free(result);
+                mr_asprintf(result, "%s", tmp);
+            }
+            mr_free(tmp);
+        }
+        log_msg(4, "Result: %s", result);
         mr_strip_spaces(result);
         paranoid_pclose(fin);
     } else {
-        log_OS_error("Unable to popen call");
-    }
-    mr_free(ftmp)
-    log_msg(4, "Returns: %s", result);
+        log_OS_error("Unable to open resulting file");
+    }
+    mr_free(tmpf);
     return(result);
 }