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

Timestamp:

Aug 18, 2009, 3:05:43 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3334@localhost: bruno | 2009-08-08 12:17:37 +0200

• Change mr_asprintf interface to pass only the char * (makes bkpinfo usage more easy)

File:

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

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

@@ -125 +125 @@
 
     if (bkpinfo->nfs_user) {
-        mr_asprintf(&tmp1, "su - %s -c \"%s\"", bkpinfo->nfs_user, basic_call);
+        mr_asprintf(tmp1, "su - %s -c \"%s\"", bkpinfo->nfs_user, basic_call);
     } else {
-        mr_asprintf(&tmp1, "%s", basic_call);
-    }
-
-    mr_asprintf(&cd_number_str, "%d", cd_no);
+        mr_asprintf(tmp1, "%s", basic_call);
+    }
+
+    mr_asprintf(cd_number_str, "%d", cd_no);
     log_msg(4, "basic call = '%s'", tmp1);
     midway_call = resolve_naff_tokens(tmp1, isofile, "_ISO_");
@@ -145 +145 @@
 
     log_msg(4, "ultimate call = '%s'", ultimate_call);
-    mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+    mr_asprintf(command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
     mr_free(ultimate_call);
 
@@ -153 +153 @@
             what_i_am_doing);
     if (bkpinfo->manual_cd_tray) {
-        mr_asprintf(&tmp2, "%s", command);
+        mr_asprintf(tmp2, "%s", command);
         p = strstr(tmp2, "2>>");
         if (p) {
@@ -272 +272 @@
         log_if_failure = TRUE;
     }
-    mr_asprintf(&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 = ' ';
@@ -288 +288 @@
     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);
+    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");
@@ -294 +294 @@
     mr_free(callstr);
 
-    mr_asprintf(&tmp1, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    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);
+    mr_asprintf(tmp1, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
     fin = fopen(tmp1, "r");
     if (fin) {
@@ -363 +363 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    mr_asprintf(&lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
-
-    mr_asprintf(&command, "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res", lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
+    mr_asprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
+
+    mr_asprintf(command, "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res", lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    mr_asprintf(&tmp, "Executing %s", basic_call);
+    mr_asprintf(tmp, "Executing %s", basic_call);
     log_msg(2, tmp);
     mr_free(tmp);
@@ -373 +373 @@
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        mr_asprintf(&tmp, "Failed utterly to call '%s'", command);
+        mr_asprintf(tmp, "Failed utterly to call '%s'", command);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -463 +463 @@
         fin = f_orig;
         fout = f_archived;
-        mr_asprintf(&tmp, "%-64s", PIMP_START_SZ);
+        mr_asprintf(tmp, "%-64s", PIMP_START_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
             mr_free(tmp);
@@ -475 +475 @@
                 break;
             }
-            mr_asprintf(&tmp, "%-64ld", bytes_read_in);
+            mr_asprintf(tmp, "%-64ld", bytes_read_in);
             if (fwrite(tmp, 1, 64, fout) != 64) {
                 mr_free(tmp);
@@ -486 +486 @@
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            mr_asprintf(&tmp, "%-64ld", subsliceno);
+            mr_asprintf(tmp, "%-64ld", subsliceno);
             if (fwrite(tmp, 1, 64, fout) != 64) {
                 mr_free(tmp);
@@ -495 +495 @@
             subsliceno++;
         }
-        mr_asprintf(&tmp, "%-64ld", 0L);
+        mr_asprintf(tmp, "%-64ld", 0L);
         if (fwrite(tmp, 1, 64L, fout) != 64L) {
             mr_free(tmp);
@@ -502 +502 @@
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "%-64s", PIMP_END_SZ);
+        mr_asprintf(tmp, "%-64s", PIMP_END_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
             mr_free(tmp);
@@ -559 +559 @@
             log_msg(5, "tmpB is %s", tmp1);
             if (!strstr(tmp1, PIMP_END_SZ)) {
-                mr_asprintf(&filestr, "%s/out.leftover", bkpinfo->tmpdir);
+                mr_asprintf(filestr, "%s/out.leftover", bkpinfo->tmpdir);
                 ftmp = fopen(filestr, "w");
                 mr_free(filestr);
@@ -604 +604 @@
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_asprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
     mr_free(command);
@@ -659 +659 @@
     malloc_string(title);
     strcpy(title, tt);
-    mr_asprintf(&command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    mr_asprintf(command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     log_msg(3, "command = '%s'", command);
     if ((res = pthread_create(&childthread, NULL, run_prog_in_bkgd_then_exit, (void *) command))) {
@@ -719 +719 @@
         fatal_error("ntfsclone not found");
     }
-    mr_asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_asprintf(command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
     mr_free(command);