Changeset 3185 in MondoRescue for branches/3.0/mondo/src/mondorestore/mondorestore.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/mondorestore/mondorestore.c (modified) (8 diffs)

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -354 +354 @@
 
     /* Clean up blkid cache file if they exist */
-    mr_asprintf(&tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
+    mr_asprintf(tmp1,"%s/etc/blkid.tab",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
-    mr_asprintf(&tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
+    mr_asprintf(tmp1,"%s/etc/blkid.tab.old",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
@@ -369 +369 @@
 
     /* Clean up multiconf cache file if they exist */
-    mr_asprintf(&tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
+    mr_asprintf(tmp1,"%s/var/lib/multipath/bindings",bkpinfo->restore_path);
     (void)unlink(tmp1);
     paranoid_free(tmp1);
 
     /* Edit multipath.conf if needed to adapt wwid */
-    mr_asprintf(&tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
+    mr_asprintf(tmp1,"%s/etc/multipath.conf", MNT_RESTORING);
     if (does_file_exist(tmp1)) {
         log_msg(2, "We may need to clean /etc/multipath.conf");
@@ -384 +384 @@
 
     if (bkpinfo->restore_mode != nuke) {
-        mr_asprintf(&editor, "%s", find_my_editor());
-        mr_asprintf(&tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
+        mr_asprintf(editor, "%s", find_my_editor());
+        mr_asprintf(tmp1,"chroot %s %s /etc/multipath.conf", MNT_RESTORING, editor);
         popup_and_OK("You will now edit multipath.conf");
         if (!g_text_mode) {
@@ -1670 +1670 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
 //  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
-    mr_asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
+    mr_asprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
     paranoid_free(command);
@@ -1757 +1757 @@
 //      if (strstr(tarball_fname, ".star."))
         if (use_star) {
-            mr_asprintf(&command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
+            mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1763 +1763 @@
         } else {
             if (filelist_subset_fname[0] != '\0') {
-                mr_asprintf(&command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+                mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
             } else {
-                mr_asprintf(&command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
+                mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
             }
         }
@@ -1818 +1818 @@
         // Be verbose for star
         if (retval || use_star) {
-            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             paranoid_system(command);
             paranoid_free(command);
@@ -2310 +2310 @@
                                               filelist);
             }
-            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ",
+            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ",
                     mds, g_current_media_number, current_tarball_number);
             if (res) {