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

Timestamp:

Sep 10, 2009, 2:55:51 AM (15 years ago)

Author:

Bruno Cornec

Message:

call_program_and_get_last_line_of_output is now allocating memory and returning that string

File:

• branches/2.2.10/mondo/src/common/libmondo-fork.c (modified) (1 diff)

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

@@ -37 +37 @@
 {
     /*@ buffers ***************************************************** */
-    static char result[512];
-    char *tmp = NULL;
+    char *result = NULL;
 
     /*@ pointers **************************************************** */
     FILE *fin;
 
-    /*@ initialize data ********************************************* */
-    result[0] = '\0';
-
     /*@******************************************************************** */
 
     assert_string_is_neither_NULL_nor_zerolength(call);
     if ((fin = popen(call, "r"))) {
-        for (mr_getline(tmp, fin); !feof(fin); mr_getline(tmp, fin)) {
-            if (strlen(tmp) > 1) {
-                strncpy(result, tmp, 511);
-            }
-            mr_free(tmp);
-        }
-        mr_free(tmp);
+        for (mr_getline(result, fin); !feof(fin); mr_getline(result, fin));
         paranoid_pclose(fin);
     } else {
         log_OS_error("Unable to popen call");
     }
-    strip_spaces(result);
-    return (result);
+    mr_strip_spaces(result);
+    return(result);
 }