Changeset 2392 in MondoRescue

Timestamp:

Sep 11, 2009, 3:22:01 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Solve issues around call_program_and_get_last_line_of_output

File:

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

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

@@ -32 +32 @@
  * @param call The program to run.
  * @return The last line of its output.
- * @note The returned value points to static storage that will be overwritten with each call.
+ * @note The returned value points to an allocated string that the caller needs to free
  */
 char *call_program_and_get_last_line_of_output(char *call)
@@ -38 +38 @@
     /*@ buffers ***************************************************** */
     char *result = NULL;
+    char *p = NULL;
 
     /*@ pointers **************************************************** */
@@ -45 +46 @@
 
     assert_string_is_neither_NULL_nor_zerolength(call);
+
+    log_msg(4, "Calling command: %s", call);
+    /* By default return an empty string in any case */
+    mr_asprintf(result, "");
+
+    /* popen seems to always return an empty line after the interesting last line result */
     if ((fin = popen(call, "r"))) {
-        for (mr_getline(result, fin); !feof(fin); mr_getline(result, fin));
+        while (!feof(fin)) {
+            mr_getline(p, fin);
+            log_msg(9, "p: %s", p);
+            if ((p != NULL) && (strlen(p) > 1)) {
+                mr_free(result);
+                mr_asprintf(result, "%s", p);
+                log_msg(9, "Result: %s", result);
+            }
+            mr_free(p);
+        }
+        log_msg(4, "Result: %s", result);
+        mr_strip_spaces(result);
         paranoid_pclose(fin);
     } else {
         log_OS_error("Unable to popen call");
     }
-    mr_strip_spaces(result);
+    log_msg(4, "Returns: %s", result);
     return(result);
 }