Changeset 3034 in MondoRescue for branches/3.0/mondo

Timestamp:

Sep 26, 2012, 11:39:22 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Backport a 3.1 patch to use dynamic memory allocation for the function run_program_and_log_output and try to solve #644

File:

• branches/3.0/mondo/src/common/libmondo-fork.c (modified) (5 diffs)

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

@@ -255 +255 @@
 {
     /*@ buffer ****************************************************** */
-    char callstr[MAX_STR_LEN * 2];
+    char *callstr = NULL;
     char incoming[MAX_STR_LEN * 2];
-    char tmp[MAX_STR_LEN * 2];
-    char initial_label[MAX_STR_LEN * 2];
+    char *tmp1 = NULL;
 
     /*@ int ********************************************************* */
@@ -286 +285 @@
         log_if_failure = TRUE;
     }
-    sprintf(callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err",
-             program, bkpinfo->tmpdir, bkpinfo->tmpdir);
+    mr_asprintf(callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err", program, bkpinfo->tmpdir, bkpinfo->tmpdir);
     while ((p = strchr(callstr, '\r'))) {
         *p = ' ';
@@ -311 +309 @@
     if (((res == 0) && log_if_success) || ((res != 0) && log_if_failure)) {
         log_msg(0, "running: %s", callstr);
-        log_msg(0,
-                "--------------------------------start of output-----------------------------");
-    }
-    sprintf(callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+        log_msg(0, "--------------------------------start of output-----------------------------");
+    }
+    mr_free(callstr);
+
+    mr_asprintf(callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
     if (log_if_failure && system(callstr)) {
         log_OS_error("Command failed");
     }
-    sprintf(tmp, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
-    unlink(tmp);
-    sprintf(tmp, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
-    fin = fopen(tmp, "r");
+    mr_free(callstr);
+
+    mr_asprintf(tmp1, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    unlink(tmp1);
+    mr_free(tmp1);
+
+    mr_asprintf(tmp1, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
+    fin = fopen(tmp1, "r");
     if (fin) {
-        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin);
-             fgets(incoming, MAX_STR_LEN, fin)) {
-            /* patch by Heiko Schlittermann */
+        for (fgets(incoming, MAX_STR_LEN, fin); !feof(fin); fgets(incoming, MAX_STR_LEN, fin)) {
             p = incoming;
             while (p && *p) {
@@ -335 +336 @@
             /* end of patch */
             strip_spaces(incoming);
-            if ((res == 0 && log_if_success)
-                || (res != 0 && log_if_failure)) {
+            if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
                 log_msg(0, incoming);
             }
@@ -342 +342 @@
         paranoid_fclose(fin);
     }
-    unlink(tmp);
+    unlink(tmp1);
+    mr_free(tmp1);
+
     if ((res == 0 && log_if_success) || (res != 0 && log_if_failure)) {
         log_msg(0,