Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/libmondo-fork.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

File:

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

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

@@ -134 +134 @@
 
     if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
-        mr_asprintf(&tmp1, "su - %s -c \"%s\"", bkpinfo->netfs_user, basic_call);
+        mr_asprintf(tmp1, "su - %s -c \"%s\"", bkpinfo->netfs_user, basic_call);
     } else {
-        mr_asprintf(&tmp1, "%s", basic_call);
+        mr_asprintf(tmp1, "%s", basic_call);
     }
 
@@ -285 +285 @@
         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 = ' ';
@@ -301 +301 @@
     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");
@@ -307 +307 @@
     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) {
@@ -378 +378 @@
     sprintf(lockfile, "%s/mojo-jojo.bla.bla", bkpinfo->tmpdir);
 
-    mr_asprintf(&command,
+    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);
@@ -388 +388 @@
     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);