Changeset 2323 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.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/mondorestore/mondo-rstr-tools.c (modified) (71 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -144 +144 @@
 }
 
-mr_asprintf(&question_ptr, "Should I restore the image of %s ?", incoming_ptr);
+mr_asprintf(question_ptr, "Should I restore the image of %s ?", incoming_ptr);
 
 if (ask_me_yes_or_no(question_ptr)) {
@@ -228 +228 @@
 }
 log_msg(2, "Checking to see if f=%s, file=%s, is in the list of biggiefiles", f, file);
-mr_asprintf(&command, "grep -E '^%s$' %s", file, list_fname);
+mr_asprintf(command, "grep -E '^%s$' %s", file, list_fname);
 res = run_program_and_log_output(command, FALSE);
 mr_free(command);
@@ -260 +260 @@
     char *command = NULL;
     char *mds = NULL;
+    char *p = NULL;
     int retval = 0, i;
     bool already_mounted = FALSE;
     char *isodir_format = NULL;
 
-assert(bkpinfo != NULL);
 g_ISO_restore_mode = TRUE;
 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
@@ -271 +271 @@
     * Don't let this clobber an existing bkpinfo->isodir */
     if (!bkpinfo->isodir[0]) {
-        strcpy(bkpinfo->isodir, "/tmp/isodir");
+        mr_free(bkpinfo->isodir);
+        mr_asprintf(p, "/tmp/isodir");
+        bkpinfo->isodir = p;
     }
     /* End patch */
-    mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
+    mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
     run_program_and_log_output(command, 5);
     mr_free(command);
@@ -290 +292 @@
     already_mounted = TRUE;
 } else {
-    mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
+    mr_asprintf(mount_isodir_command, "mount %s", g_isodir_device);
     if (isodir_format) {
         mr_strcat(mount_isodir_command, " -t %s", isodir_format);
@@ -320 +322 @@
 log_msg(1, "%s #%d has been mounted via loopback mount", mds, i);
 if (i < 0) {
-popup_and_OK
-    ("Cannot find ISO images in the directory you specified.");
-retval = 1;
-}
-log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
-    bkpinfo->isodir);
+    popup_and_OK("Cannot find ISO images in the directory you specified.");
+    retval = 1;
+}
+log_msg(2, "bkpinfo->isodir is now %s", bkpinfo->isodir);
 return (retval);
 }
@@ -368 +368 @@
 
     if (!strcmp(mpt, "/1")) {
-        mr_asprintf(&mountpoint, "/");
+        mr_asprintf(mountpoint, "/");
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        mr_asprintf(&mountpoint, "%s", mpt);
+        mr_asprintf(mountpoint, "%s", mpt);
     }
 
@@ -380 +380 @@
         return (0);
     }
-    mr_asprintf(&tmp, "Mounting device %s   ", device);
+    mr_asprintf(tmp, "Mounting device %s   ", device);
     log_msg(1, tmp);
     /* Deal with additional params only if not /proc or /sys */
-    mr_asprintf(&additional_parameters, "");
+    mr_asprintf(additional_parameters, "");
     if (strcmp(format, "proc") && strcmp(format, "sys")) {
         if (writeable) {
@@ -399 +399 @@
 
     if (!strcmp(mountpoint, "swap")) {
-        mr_asprintf(&command, "swapon %s", device);
-        mr_asprintf(&mountdir, "swap");
+        mr_asprintf(command, "swapon %s", device);
+        mr_asprintf(mountdir, "swap");
     } else {
         if (!strcmp(mountpoint, "/")) {
-            mr_asprintf(&mountdir, "%s", MNT_RESTORING);
+            mr_asprintf(mountdir, "%s", MNT_RESTORING);
         } else {
-            mr_asprintf(&mountdir, "%s%s", MNT_RESTORING, mountpoint);
-        }
-        mr_asprintf(&command, "mkdir -p %s", mountdir);
+            mr_asprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        mr_asprintf(command, "mkdir -p %s", mountdir);
         run_program_and_log_output(command, FALSE);
         mr_free(command);
 
-        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device, additional_parameters, mountdir, MONDO_LOGFILE);
+        mr_asprintf(command, "mount -t %s %s %s %s 2>> %s", format, device, additional_parameters, mountdir, MONDO_LOGFILE);
         log_msg(2, "command='%s'", command);
     }
@@ -420 +420 @@
         log_msg(1, "Re-trying without the fancy extra parameters");
         mr_free(command);
-        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device, mountdir, MONDO_LOGFILE);
+        mr_asprintf(command, "mount -t %s %s %s 2>> %s", format, device, mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
     }
@@ -432 +432 @@
             log_msg(2, "Retrying w/o the '-t' switch");
             mr_free(command);
-            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir, MONDO_LOGFILE);
+            mr_asprintf(command, "mount %s %s 2>> %s", device, mountdir, MONDO_LOGFILE);
             log_msg(2, "2nd command = '%s'", command);
             res = run_program_and_log_output(command, TRUE);
@@ -492 +492 @@
                "", mountlist->entries);
 
-    mr_asprintf(&these_failed, "");
+    mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
@@ -498 +498 @@
                 "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            mr_asprintf(&tmp, "%s is already mounted", mountlist->el[lino].device);
+            mr_asprintf(tmp, "%s is already mounted", mountlist->el[lino].device);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -505 +505 @@
            && strcmp(mountlist->el[lino].mountpoint, "raid")
            && strcmp(mountlist->el[lino].mountpoint, "image")) {
-            mr_asprintf(&tmp, "Mounting %s", mountlist->el[lino].device);
+            mr_asprintf(tmp, "Mounting %s", mountlist->el[lino].device);
             update_progress_form(tmp);
             mr_free(tmp);
@@ -529 +529 @@
                 ("format and restore *without* partitioning first. Sorry for the inconvenience.");
         }
-        mr_asprintf(&tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
+        mr_asprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
 
         if (!ask_me_yes_or_no(tmp)) {
@@ -570 +570 @@
 * @return 0 for success, nonzero for failure.
 */
-int mount_media()
-{
-char *mount_cmd = NULL;
-int i, res;
+int mount_media() {
+
+    char *mount_cmd = NULL;
+    char *p = NULL;
+    int i, res;
 #ifdef __FreeBSD__
-char mdd[32];
-char *mddev = mdd;
+    char mdd[32];
+    char *mddev = mdd;
 #endif
 
-assert(bkpinfo != NULL);
-
-    if (bkpinfo->backup_media_type == tape
-        || bkpinfo->backup_media_type == udev) {
+    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
         log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
         return 0;
@@ -595 +593 @@
         log_msg(2, "Mounting for NFS thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
-            && am_I_in_disaster_recovery_mode()) {
-            strcpy(bkpinfo->isodir, "/tmp/isodir");
+        if (!strcmp(bkpinfo->isodir, "/") && am_I_in_disaster_recovery_mode()) {
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(p, "/tmp/isodir");
+            bkpinfo->isodir = p;
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         mr_free(mount_cmd);
 
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
     } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
         mr_free(mount_cmd);
 
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
     } else if (bkpinfo->backup_media_type == usb) {
-        mr_asprintf(&mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
     } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     } else {
@@ -638 +637 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
 #else
-        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     }
@@ -727 +726 @@
 malloc_string(iso_mnt);
 malloc_string(iso_path);
-malloc_string(old_isodir);
 malloc_string(value);
 malloc_string(tmp);
@@ -774 +772 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(&tmp1, "%s", value);
+        mr_asprintf(tmp1, "%s", value);
     } else {
-        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+        mr_asprintf(tmp1, "%s", STD_PREFIX);
     }
     bkpinfo->prefix = tmp1;
@@ -784 +782 @@
     mr_free(bkpinfo->prefix);
     if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        mr_asprintf(&tmp1, "%s", value);
+        mr_asprintf(tmp1, "%s", value);
     } else {
-        mr_asprintf(&tmp1, "%s", STD_PREFIX);
+        mr_asprintf(tmp1, "%s", STD_PREFIX);
     }
     bkpinfo->prefix = tmp1;
@@ -798 +796 @@
         }
         mr_free(bkpinfo->prefix);
-        mr_asprintf(&tmp1, "%s", envtmp1);
+        mr_asprintf(tmp1, "%s", envtmp1);
         bkpinfo->prefix = tmp1;
     }
@@ -863 +861 @@
 read_cfg_var(cfg_file, "acl", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfacl,"setfacl");
+    mr_asprintf(g_getfacl,"setfacl");
     log_msg(1, "We will restore ACLs");
     if (! find_home_of_exe("setfacl")) {
@@ -871 +869 @@
 read_cfg_var(cfg_file, "xattr", value);
 if (strstr(value, "TRUE")) {
-    mr_asprintf(&g_getfattr,"setfattr");
+    mr_asprintf(g_getfattr,"setfattr");
     log_msg(1, "We will restore XATTRs");
     if (! find_home_of_exe("setfattr")) {
@@ -968 +966 @@
     * isodir in disaster recovery mode
     */
-    strcpy(old_isodir, bkpinfo->isodir);
+    mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
     read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
     read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
-    sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+    mr_free(bkpinfo->isodir);
+    mr_asprintf(tmp1, "%s%s", iso_mnt, iso_path);
+    bkpinfo->isodir = tmp1;
     if (!bkpinfo->isodir[0]) {
-        strcpy(bkpinfo->isodir, old_isodir);
+        mr_free(bkpinfo->isodir);
+        bkpinfo->isodir = old_isodir;
+    } else {
+        mr_free(old_isodir);
     }
     if (!bkpinfo->disaster_recovery) {
         if (strcmp(old_isodir, bkpinfo->isodir)) {
-            log_it
-                ("user nominated isodir differs from archive, keeping user's choice: %s %s\n",
-                old_isodir, bkpinfo->isodir);
-            strcpy(bkpinfo->isodir, old_isodir);
+            log_it("user nominated isodir %s differs from archive, keeping user's choice: %s\n", bkpinfo->isodir, old_isodir );
+            mr_free(bkpinfo->isodir);
+            bkpinfo->isodir = old_isodir;
+        } else {
+            mr_free(old_isodir);
         }
     }
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
-    log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir,
-            g_isodir_device);
+    log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
+
     if (bkpinfo->disaster_recovery) {
         if (is_this_device_mounted(g_isodir_device)) {
             log_msg(2, "NB: isodir is already mounted");
             /* Find out where it's mounted */
-            mr_asprintf(&command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
+            mr_asprintf(command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
             log_it("command = %s", command);
             log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
@@ -997 +1001 @@
         } else {
             sprintf(iso_mnt, "/tmp/isodir");
-            mr_asprintf(&tmp1, "mkdir -p %s", iso_mnt);
+            mr_asprintf(tmp1, "mkdir -p %s", iso_mnt);
             run_program_and_log_output(tmp1, 5);
             mr_free(tmp1);
 
-            mr_asprintf(&tmp1, "mount %s %s", g_isodir_device, iso_mnt);
+            mr_asprintf(tmp1, "mount %s %s", g_isodir_device, iso_mnt);
             if (run_program_and_log_output(tmp1, 3)) {
                 log_msg(1,
@@ -1007 +1011 @@
                 bkpinfo->backup_media_type = cdr;
                 strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
-                bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
+                iso_mnt[0] = iso_path[0] = '\0';
                 if (mount_media()) {
                     mr_free(tmp1);
-                    fatal_error
-                        ("Unable to mount isodir. Failed to mount CD-ROM as well.");
+                    fatal_error("Unable to mount isodir. Failed to mount CD-ROM as well.");
                 } else {
-                    log_msg(1,
-                            "You backed up to disk, then burned some CDs.");
+                    log_msg(1, "You backed up to disk, then burned some CDs.");
                 }
             }
@@ -1021 +1023 @@
         /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
         if (bkpinfo->backup_media_type == iso) {
-            sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(tmp1, "%s%s", iso_mnt, iso_path);
+            bkpinfo->isodir = tmp1;
         }
     }
@@ -1047 +1051 @@
 paranoid_free(iso_mnt);
 paranoid_free(iso_path);
-paranoid_free(old_isodir);
 return (0);
 
@@ -1105 +1108 @@
     unlink(FILELIST_FULL_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(&command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
@@ -1113 +1116 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command, "tar -b %ld -zxf %s %s %s %s %s %s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
+            mr_asprintf(command, "tar -b %ld -zxf %s %s %s %s %s %s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
@@ -1119 +1122 @@
         }
     } else {
-        log_msg(2,
-            "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
-            bkpinfo->isodir);
+        log_msg(2, "Calling insist_on_this_cd_number; bkpinfo->isodir=%s", bkpinfo->isodir);
         insist_on_this_cd_number(1);
         log_msg(2, "Back from iotcn");
         run_program_and_log_output("mount", 1);
-        mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
         log_msg(1, "tarcommand = %s", command);
@@ -1134 +1135 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command, "tar -zxf %s/images/all.tar.gz %s %s %s %s %s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
+            mr_asprintf(command, "tar -zxf %s/images/all.tar.gz %s %s %s %s %s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
             log_msg(1, "tarcommand = %s", command);
@@ -1149 +1150 @@
         }
     }
-    mr_asprintf(&command, "cp -f %s %s", MONDO_CFG_FILE_STUB, g_mondo_cfg_file);
+    mr_asprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB, g_mondo_cfg_file);
     run_program_and_log_output(command, FALSE);
     mr_free(command);
 
-    mr_asprintf(&command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
+    mr_asprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
     mr_free(command);
 
-    mr_asprintf(&command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
+    mr_asprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
@@ -1170 +1171 @@
     &&
     ask_me_yes_or_no("Do you want to retrieve the mountlist as well?")) {
-        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
+        mr_asprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
         paranoid_system(command);
         mr_free(command);
@@ -1195 +1196 @@
         log_to_screen("Pre-processing filelist");
         if (!does_file_exist(g_biggielist_txt)) {
-            mr_asprintf(&command, "echo -n > %s", g_biggielist_txt);
+            mr_asprintf(command, "echo -n > %s", g_biggielist_txt);
             paranoid_system(command);
             mr_free(command);
         }
-        mr_asprintf(&command, "grep -E '^/dev/.*' %s > %s", g_biggielist_txt, g_filelist_imagedevs);
+        mr_asprintf(command, "grep -E '^/dev/.*' %s > %s", g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
         mr_free(command);
@@ -1276 +1277 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
 
-    mr_asprintf(&tmp, "%s/%s", path_root, filename);
-    mr_asprintf(&command, "cp -f %s %s.pristine", tmp, tmp);
+    mr_asprintf(tmp, "%s/%s", path_root, filename);
+    mr_asprintf(command, "cp -f %s %s.pristine", tmp, tmp);
     mr_free(tmp);
 
@@ -1334 +1335 @@
      * the current /dev location 
      */
-    mr_asprintf(&cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
+    mr_asprintf(cmd,"tar cf - /dev | ( cd %s ; tar xf - )",MNT_RESTORING);
     run_program_and_log_output(cmd, 3);
     paranoid_free(cmd);
@@ -1361 +1362 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        mr_asprintf(&tmp, "boot0cfg -B %s", device);
+        mr_asprintf(tmp, "boot0cfg -B %s", device);
         res = run_program_and_log_output(tmp, FALSE);
         paranoid_free(tmp);
     } else {
-        mr_asprintf(&tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
+        mr_asprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
             mr_free(tmp);
-            mr_asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            mr_asprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
@@ -1452 +1453 @@
     assert_string_is_neither_NULL_nor_zerolength(bd);
     strcpy(editor, find_my_editor());
-    mr_asprintf(&boot_device, "%s", bd);
+    mr_asprintf(boot_device, "%s", bd);
 
     if (offer_to_run_stabgrub
@@ -1469 +1470 @@
                 continue;
             }
-            mr_asprintf(&command, "stabgrub-me %s", p);
+            mr_asprintf(command, "stabgrub-me %s", p);
             mr_free(p);
 
@@ -1489 +1490 @@
                 newtSuspend();
             }
-            mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
 
-            mr_asprintf(&tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+            mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
             paranoid_system(tmp);
             mr_free(tmp);
@@ -1513 +1514 @@
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
-            mr_asprintf(&command, "grub-MR %s /tmp/mountlist.txt", boot_device);
+            mr_asprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
             log_msg(1, "command = %s", command);
         } else {
-            mr_asprintf(&command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
+            mr_asprintf(command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
             log_msg(1, "WARNING - grub-MR not found; using grub-install");
         }
@@ -1591 +1592 @@
                             0,
                             "Modifying fstab and elilo.conf...                             ");
-        mr_asprintf(&command, "stabelilo-me");
+        mr_asprintf(command, "stabelilo-me");
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1602 +1603 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
+                mr_asprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1667 +1668 @@
                             0,
                             "Modifying fstab and lilo.conf, and running LILO...                             ");
-        mr_asprintf(&command, "stablilo-me");
+        mr_asprintf(command, "stablilo-me");
         res = run_program_and_log_output(command, 3);
         mr_free(command);
@@ -1678 +1679 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1770 +1771 @@
 
     strcpy(editor, find_my_editor());
-    mr_asprintf(&boot_device, "%s", bd);
+    mr_asprintf(boot_device, "%s", bd);
 
     if (offer_to_hack_scripts
@@ -1783 +1784 @@
                     newtSuspend();
                 }
-                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
                 mr_free(tmp);
@@ -1798 +1799 @@
                 continue;
             }
-            mr_asprintf(&command, "stabraw-me %s", p);
+            mr_asprintf(command, "stabraw-me %s", p);
             mr_free(p);
 
@@ -1812 +1813 @@
     } else {
         /* nuke mode */
-        mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", boot_device);
+        mr_asprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
@@ -1939 +1940 @@
     for (i = 0; i < 20; i++) {
         g_current_progress = i;
-        mr_asprintf(&tmp, "You have %d seconds left to abort.", 20 - i);
+        mr_asprintf(tmp, "You have %d seconds left to abort.", 20 - i);
         update_progress_form(tmp);
         mr_free(tmp);
@@ -1991 +1992 @@
     paranoid_system("sync");
 
-    mr_asprintf(&tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
+    mr_asprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
     if (run_program_and_log_output(tmp, FALSE)) {
         log_msg(1,
@@ -2010 +2011 @@
             continue;
         }
-        mr_asprintf(&tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+        mr_asprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
 
         update_progress_form(tmp);
@@ -2016 +2017 @@
         if (is_this_device_mounted(mountlist->el[lino].device)) {
             if (!strcmp(mountlist->el[lino].mountpoint, "swap")) {
-                mr_asprintf(&command, "swapoff %s", mountlist->el[lino].device);
+                mr_asprintf(command, "swapoff %s", mountlist->el[lino].device);
             } else {
                 if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
-                    mr_asprintf(&command, "umount %s/", MNT_RESTORING);
+                    mr_asprintf(command, "umount %s/", MNT_RESTORING);
                     log_msg(3,
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    mr_asprintf(&command, "umount " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
+                    mr_asprintf(command, "umount " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
 
                     /* To support latest Ubuntu where /var is a separate FS 
@@ -2090 +2091 @@
     }
 
-    mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+    mr_asprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
@@ -2101 +2102 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            mr_asprintf(&command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_asprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
@@ -2148 +2149 @@
     log_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
-    mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     device[0] = '\0';
     chdir(bkpinfo->tmpdir);
-    mr_asprintf(&cfg_file, "%s", MONDO_CFG_FILE_STUB);
+    mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
     unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
     mr_free(cfg_file);
@@ -2157 +2158 @@
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    mr_asprintf(&command, "mkdir -p %s", mountpt);
+    mr_asprintf(command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
     mr_free(command);
 
-    mr_asprintf(&cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    mr_asprintf(&mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+    mr_asprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+    mr_asprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
     mr_free(mountpt);
@@ -2192 +2193 @@
                 log_msg(2, "media_device is blank; assuming %s");
             }
-            mr_asprintf(&tmp, "%s", bkpinfo->media_device);
+            mr_asprintf(tmp, "%s", bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2231 +2232 @@
                 log_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);   // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);    // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
                 mr_free(command);
@@ -2238 +2239 @@
                     /* Doing that allow us to remain compatible with pre-2.2.5 versions */
                     log_msg(2, "pre-2.2.4 compatible mode on");
-                    mr_asprintf(&command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                    mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                     run_program_and_log_output(command, TRUE);
                     mr_free(command);
@@ -2251 +2252 @@
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
         log_msg(1, "gcffa --- great! We've got the config file");
-        mr_asprintf(&tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
-        mr_asprintf(&command, "cp -f %s %s", tmp, cfg_file);
+        mr_asprintf(tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
         if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
@@ -2261 +2262 @@
         mr_free(command);
 
-        mr_asprintf(&command, "cp -f %s/%s %s", call_program_and_get_last_line_of_output("pwd"),
+        mr_asprintf(command, "cp -f %s/%s %s", call_program_and_get_last_line_of_output("pwd"),
             MOUNTLIST_FNAME_STUB, mountlist_file);
         log_it("%s",command);
@@ -2271 +2272 @@
 
                 mr_free(command);
-                mr_asprintf(&command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
+                mr_asprintf(command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
                 if (run_program_and_log_output(command, 1)) {
                     log_msg(1, "Failed to copy mountlist to /tmp");
@@ -2277 +2278 @@
                     log_msg(1, "Copied mountlist to /tmp as well OK");
                     mr_free(command);
-                    mr_asprintf(&command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+                    mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
                     run_program_and_log_output(command, 1);
                 }
@@ -2301 +2302 @@
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {
-            mr_asprintf(&command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+            mr_asprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
             run_program_and_log_output(command, FALSE);
             mr_free(command);
@@ -2307 +2308 @@
     }
 
-    mr_asprintf(&command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    mr_asprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
     mr_free(cfg_file);
 
@@ -2314 +2315 @@
 
     if (extract_mountlist_stub) {
-        mr_asprintf(&command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+        mr_asprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
         run_program_and_log_output(command, FALSE);
         mr_free(command);
@@ -2320 +2321 @@
     mr_free(mountlist_file);
 
-    mr_asprintf(&command, "cp -f etc/raidtab /etc/");
+    mr_asprintf(command, "cp -f etc/raidtab /etc/");
     run_program_and_log_output(command, FALSE);
     mr_free(command);
 
     if (extract_i_want_my_lvm) {
-        mr_asprintf(&command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+        mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
         run_program_and_log_output(command, FALSE);
         mr_free(command);
@@ -2382 +2383 @@
                 }
                 log_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
-                mr_asprintf(&screen_message, "Sync'ing %s", raidlist->el[i].raid_device);
+                mr_asprintf(screen_message, "Sync'ing %s", raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
                 mr_free(screen_message);