Changeset 3610 in MondoRescue for branches/3.2/mondo/src/common/libmondo-fork.c

Timestamp:

Nov 5, 2016, 6:12:23 PM (7 years ago)

Author:

Bruno Cornec

Message:

• Change interfaces for the call_program_and_get_last_line_of_output and where_is_root_mounted(now return dynamically allocated string)
• removes useless function store_netfs_config

File:

• branches/3.2/mondo/src/common/libmondo-fork.c (modified) (4 diffs)

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

@@ -35 +35 @@
  * @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 storage that needs to be freed by the
+ * caller
  */
 char *call_program_and_get_last_line_of_output(char *call)
 {
     /*@ buffers ***************************************************** */
-    static char result[MAX_STR_LEN];
+    char *result = NULL;
     char *tmp = NULL;
 
@@ -46 +47 @@
     FILE *fin = NULL;
     char *eng_call = NULL;
-
-    /*@ initialize data ********************************************* */
-    result[0] = '\0';
 
     /*@******************************************************************** */
@@ -57 +55 @@
     if ((fin = popen(eng_call, "r"))) {
         while (!feof(fin)) {
-            mr_getline(tmp, fin);
-            if (strlen(tmp) > 1) {
-                strcpy(result, tmp);
+            mr_free(result);
+            mr_getline(result, fin);
+            if (strlen(result) > 1) {
                 log_msg(7, "result = '%s'", result);
             }
-            mr_free(tmp);
         }
         paranoid_pclose(fin);
@@ -69 +66 @@
     }
     mr_free(eng_call);
-    strip_spaces(result);
+    mr_strip_spaces(result);
     log_msg(5, "cpaglloo returns '%s'", result);
     return(result);