Changeset 3615 in MondoRescue

Timestamp:

Nov 18, 2016, 5:31:43 PM (7 years ago)

Author:

Bruno Cornec

Message:

Fix call_program_and_get_last_line_of_output which was aborting due to an
excessive loop call

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-fork.c (modified) (3 diffs)
• common/libmondo-fork.h (modified) (1 diff)
• mondorestore/mr-externs.h (modified) (1 diff)

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

@@ -38 +38 @@
  * caller
  */
-char *call_program_and_get_last_line_of_output(char *call)
-{
+char *call_program_and_get_last_line_of_output(const char *call) {
     /*@ buffers ***************************************************** */
     char *result = NULL;
-    char *tmp = NULL;
+    char *resultbkp = NULL;
+    char *result2 = NULL;
 
     /*@ pointers **************************************************** */
@@ -59 +59 @@
             if (strlen(result) > 1) {
                 log_msg(7, "result = '%s'", result);
+                /* in case we have to loop, we keep the
+                 * previous value */
+                mr_free(resultbkp);
+                mr_asprintf(resultbkp, "%s", result);
+            } else {
+                /* we had to loop and got nothing useul, so we keep the
+                 * previous value */
+                mr_free(result);
+                result = resultbkp;
             }
         }
@@ -66 +75 @@
     }
     mr_free(eng_call);
-    mr_strip_spaces(result);
-    log_msg(5, "cpaglloo returns '%s'", result);
-    return(result);
+    if (result != NULL) {
+        result2 = mr_strip_spaces(result);
+        mr_free(result);
+        log_msg(5, "cpaglloo returns '%s'", result2);
+    } else {
+        mr_asprintf(result2, "");
+    }
+    return(result2);
 }
 

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

@@ -5 +5 @@
 
 
-char *call_program_and_get_last_line_of_output(char *call);
+char *call_program_and_get_last_line_of_output(const char *call);
 int run_program_and_log_to_screen(char *basic_call, char *what_i_am_doing);
 int run_program_and_log_output(char *program, int);

branches/3.2/mondo/src/mondorestore/mr-externs.h

@@ -21 +21 @@
 extern int closein_tape();
 extern void close_evalcall_form(void);
-extern char *call_program_and_get_last_line_of_output(char *);
+extern char *call_program_and_get_last_line_of_output(const char *);
 extern void close_progress_form(void);
 extern long count_lines_in_file(char *);