Changeset 2323 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

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)

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (71 diffs)
• mondo-rstr-compare.c (modified) (6 diffs)
• mondo-rstr-newt.c (modified) (9 diffs)
• mondo-rstr-tools.c (modified) (71 diffs)
• mondorestore.c (modified) (63 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -79 +79 @@
         make_list_of_drives_in_mountlist(mountlist, drivelist);
         for (lino = 0; lino < drivelist->entries; lino++) {
-            mr_asprintf(&command, "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"", drivelist->el[lino].device, MONDO_WAS_HERE);
+            mr_asprintf(command, "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"", drivelist->el[lino].device, MONDO_WAS_HERE);
             res = run_program_and_log_output(command, 1);
             mr_free(command);
@@ -258 +258 @@
         strcpy(vgremove_sz, "vgremove");
     }
-    mr_asprintf(&tmp1, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
+    mr_asprintf(tmp1, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
     run_program_and_log_output(tmp1, 5);
     mr_free(tmp1);
@@ -305 +305 @@
             *q = '\0';
             log_msg(1, "Deleting old entries at /dev/%s", tmp);
-            mr_asprintf(&tmp1, "rm -Rf /dev/%s", tmp);
+            mr_asprintf(tmp1, "rm -Rf /dev/%s", tmp);
             run_program_and_log_output(tmp1, 1);
             mr_free(tmp1);
@@ -335 +335 @@
             log_it("%s... so I'll get creative.", tmp);
             if (lvmversion == 2) {
-                mr_asprintf(&tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
             } else {
-                mr_asprintf(&tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
+                mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
                 strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
                 mr_free(tmp1);
@@ -393 +393 @@
             retval++;
         }
-        mr_asprintf(&tmp1, "echo \"%s\" >> /tmp/out.sh", command);
+        mr_asprintf(tmp1, "echo \"%s\" >> /tmp/out.sh", command);
         system(tmp1);
         mr_free(tmp1);
@@ -484 +484 @@
                  fgets(incoming, MAX_STR_LEN - 1, fin));
             if (!feof(fin)) {
-                mr_asprintf(&tmp, "Investigating %s", old_mountlist->el[lino].device);
+                mr_asprintf(tmp, "Investigating %s", old_mountlist->el[lino].device);
                 log_it(tmp);
                 mr_free(tmp);
@@ -497 +497 @@
                         *p = '\0';
                         for (p--; p > incoming && *(p - 1) > 32; p--);
-                        mr_asprintf(&tmp, "Extrapolating %s", p);
+                        mr_asprintf(tmp, "Extrapolating %s", p);
                         log_it(tmp);
                         mr_free(tmp);
@@ -518 +518 @@
                             new_mountlist->entries++;
                         } else {
-                            mr_asprintf(&tmp, "Not adding %s to mountlist: it's already there", p);
+                            mr_asprintf(tmp, "Not adding %s to mountlist: it's already there", p);
                             log_it(tmp);
                             mr_free(tmp);
@@ -582 +582 @@
   }
   // create device list from normal disks followed by spare ones
-  mr_asprintf(&devices, "%s", raidlist->el[i].data_disks.el[0].device);
+  mr_asprintf(devices, "%s", raidlist->el[i].data_disks.el[0].device);
   for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
-    mr_asprintf(&strtmp, "%s", devices);
+    mr_asprintf(strtmp, "%s", devices);
     paranoid_free(devices);
-    mr_asprintf(&devices, "%s %s", strtmp,
+    mr_asprintf(devices, "%s %s", strtmp,
          raidlist->el[i].data_disks.el[j].device);
     paranoid_free(strtmp);
   }
   for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
-    mr_asprintf(&strtmp, "%s", devices);
+    mr_asprintf(strtmp, "%s", devices);
     paranoid_free(devices);
-    mr_asprintf(&devices, "%s %s", strtmp,
+    mr_asprintf(devices, "%s %s", strtmp,
          raidlist->el[i].spare_disks.el[j].device);
     paranoid_free(strtmp);
@@ -599 +599 @@
   // translate RAID level
   if (raidlist->el[i].raid_level == -2) {
-    mr_asprintf(&level, "multipath");
+    mr_asprintf(level, "multipath");
   } else if (raidlist->el[i].raid_level == -1) {
-    mr_asprintf(&level, "linear");
+    mr_asprintf(level, "linear");
   } else {
-    mr_asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+    mr_asprintf(level, "raid%d", raidlist->el[i].raid_level);
   }
   // create RAID device:
@@ -610 +610 @@
   // - faulty devices ignored
   // - persistent superblock always used as this is recommended
-  mr_asprintf(&program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
+  mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
   if (raidlist->el[i].parity != -1) {
-    mr_asprintf(&strtmp, "%s", program);
+    mr_asprintf(strtmp, "%s", program);
     paranoid_free(program);
     switch(raidlist->el[i].parity) {
     case 0:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "la");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "la");
       break;
     case 1:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "ra");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "ra");
       break;
     case 2:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "ls");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "ls");
       break;
     case 3:
-      mr_asprintf(&program, "%s --parity=%s", strtmp, "rs");
+      mr_asprintf(program, "%s --parity=%s", strtmp, "rs");
       break;
     default:
@@ -634 +634 @@
   }
   if (raidlist->el[i].chunk_size != -1) {
-    mr_asprintf(&strtmp, "%s", program);
+    mr_asprintf(strtmp, "%s", program);
     paranoid_free(program);
-    mr_asprintf(&program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
+    mr_asprintf(program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
     paranoid_free(strtmp);
   }
   if (raidlist->el[i].spare_disks.entries > 0) {
-    mr_asprintf(&strtmp, "%s", program);
+    mr_asprintf(strtmp, "%s", program);
     paranoid_free(program);
-    mr_asprintf(&program, "%s --spare-devices=%d", strtmp, raidlist->el[i].spare_disks.entries);
+    mr_asprintf(program, "%s --spare-devices=%d", strtmp, raidlist->el[i].spare_disks.entries);
     paranoid_free(strtmp);
   }
-  mr_asprintf(&strtmp, "%s", program);
+  mr_asprintf(strtmp, "%s", program);
   paranoid_free(program);
-  mr_asprintf(&program, "%s %s", strtmp, devices);
+  mr_asprintf(program, "%s %s", strtmp, devices);
   paranoid_free(strtmp);
   res = run_program_and_log_output(program, 1);
@@ -688 +688 @@
 
     if (strstr(format, "raid")) {   // do not form RAID disks; do it to /dev/md* instead
-        mr_asprintf(&tmp, "Not formatting %s (it is a RAID disk)", device);
+        mr_asprintf(tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
         mr_free(tmp);
@@ -700 +700 @@
 #endif
     if (strlen(format) <= 2) {
-        mr_asprintf(&tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
+        mr_asprintf(tmp, "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it", device, format);
         log_it(tmp);
         mr_free(tmp);
@@ -706 +706 @@
     }
     if (is_this_device_mounted(device)) {
-        mr_asprintf(&tmp, "%s is mounted - cannot format it       ", device);
+        mr_asprintf(tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -736 +736 @@
             char line[MAX_STR_LEN];
 
-            mr_asprintf(&tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
+            mr_asprintf(tmp, "Initializing Vinum device %s (this may take a *long* time)", device);
             log_to_screen(tmp);
             mr_free(tmp);
 
             /* format raid partition */
-            mr_asprintf(&program, "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
+            mr_asprintf(program, "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes", basename(device));
             system(program);
             if (g_fprep) {
@@ -753 +753 @@
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
 
-                mr_asprintf(&tmp, "Initializing plex: %s", line);
+                mr_asprintf(tmp, "Initializing plex: %s", line);
                 open_evalcall_form(tmp);
                 mr_free(tmp);
 
-                mr_asprintf(&tmp, "vinum init %s", line);
+                mr_asprintf(tmp, "vinum init %s", line);
                 system(tmp);
                 mr_free(tmp);
 
                 while (1) {
-                    mr_asprintf(&tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
+                    mr_asprintf(tmp, "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'", line);
                     FILE *pin = popen(tmp, "r");
                     mr_free(tmp);
@@ -782 +782 @@
         }
 #else
-        mr_asprintf(&tmp, "Initializing RAID device %s", device);
+        mr_asprintf(tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -798 +798 @@
             log_msg(1, "Creating RAID device %s via mdadm returned %d", device, res);
         } else {
-            mr_asprintf(&program, "mkraid --really-force %s", device);
+            mr_asprintf(program, "mkraid --really-force %s", device);
             res = run_program_and_log_output(program, 1);
             log_msg(1, "%s returned %d", program, res);
@@ -822 +822 @@
     }
     program = which_format_command_do_i_need(format);
-    mr_asprintf(&tmp, "%s %s", program, device);
+    mr_asprintf(tmp, "%s %s", program, device);
     if (strstr(program, "kludge")) {
         mr_strcat(tmp, " /");
@@ -828 +828 @@
     mr_free(program);
 
-    mr_asprintf(&program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
+    mr_asprintf(program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "Formatting %s as %s", device, format);
+    mr_asprintf(tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
     mr_free(tmp);
@@ -848 +848 @@
         mr_free(program);
 #ifdef __FreeBSD__
-        mr_asprintf(&program, "newfs_msdos -F 32 %s", device);
+        mr_asprintf(program, "newfs_msdos -F 32 %s", device);
 #else
 #ifdef __IA64__
         /* For EFI partitions take fat16 
          * as we want to make small ones */
-        mr_asprintf(&program, "mkfs -t %s -F 16 %s", format, device);
+        mr_asprintf(program, "mkfs -t %s -F 16 %s", format, device);
 #else
-        mr_asprintf(&program, "mkfs -t %s -F 32 %s", format, device);
+        mr_asprintf(program, "mkfs -t %s -F 32 %s", format, device);
 #endif
 #endif
@@ -911 +911 @@
 
     assert(mountlist != NULL);
-    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
+    mr_asprintf(tmp, "format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
     log_it(tmp);
     mr_free(tmp);
@@ -939 +939 @@
             if (interactively) {
                 // ask user if we should format the current device
-                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
+                mr_asprintf(tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
                 mr_free(tmp);
@@ -989 +989 @@
         me = &mountlist->el[lino];  // the current mountlist entry
         if (!strcmp(me->mountpoint, "image")) {
-            mr_asprintf(&tmp, "Not formatting %s - it's an image", me->device);
+            mr_asprintf(tmp, "Not formatting %s - it's an image", me->device);
             log_it(tmp);
             mr_free(tmp);
         } else if (!strcmp(me->format, "raid")) {
-            mr_asprintf(&tmp, "Not formatting %s - it's a raid-let", me->device);
+            mr_asprintf(tmp, "Not formatting %s - it's a raid-let", me->device);
             log_it(tmp);
             mr_free(tmp);
             continue;
         } else if (!strcmp(me->format, "lvm")) {
-            mr_asprintf(&tmp, "Not formatting %s - it's an LVM", me->device);
+            mr_asprintf(tmp, "Not formatting %s - it's an LVM", me->device);
             log_it(tmp);
             mr_free(tmp);
             continue;
         } else if (!strncmp(me->device, "/dev/md", 7)) {
-            mr_asprintf(&tmp, "Already formatted %s - it's a soft-RAID dev", me->device);
+            mr_asprintf(tmp, "Already formatted %s - it's a soft-RAID dev", me->device);
             log_it(tmp);
             mr_free(tmp);
@@ -1010 +1010 @@
                    && strncmp(me->device, "/dev/hd", 7)
                    && strncmp(me->device, "/dev/sd", 7)) {
-            mr_asprintf(&tmp, "Not formatting %s yet - doesn't exist - probably an LVM", me->device);
+            mr_asprintf(tmp, "Not formatting %s yet - doesn't exist - probably an LVM", me->device);
             log_it(tmp);
             mr_free(tmp);
@@ -1017 +1017 @@
             if (interactively) {
                 // ask user if we should format the current device
-                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
+                mr_asprintf(tmp, "Shall I format %s (%s) ?", me->device, me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
                 mr_free(tmp);
@@ -1048 +1048 @@
     }
 
-    mr_asprintf(&tmp, "format_everything () - %s", (retval) ? "failed!" : "finished successfully");
+    mr_asprintf(tmp, "format_everything () - %s", (retval) ? "failed!" : "finished successfully");
     log_it(tmp);
     mr_free(tmp);
@@ -1111 +1111 @@
 
     if (devno_we_must_allow_for >= 5) {
-        mr_asprintf(&tmp, "Making dummy primary 1 on %s", drivename);
+        mr_asprintf(tmp, "Making dummy primary 1 on %s", drivename);
         log_it(tmp);
         mr_free(tmp);
@@ -1127 +1127 @@
     }
     for (; current_devno < devno_we_must_allow_for; current_devno++) {
-        mr_asprintf(&tmp, "Creating dummy partition %d on %s", current_devno, drivename);
+        mr_asprintf(tmp, "Creating dummy partition %d on %s", current_devno, drivename);
         log_it(tmp);
         mr_free(tmp);
@@ -1360 +1360 @@
     for (c = 'a'; c <= 'z'; ++c) {
         int idx;
-        mr_asprintf(&subdev_str, "%s%c", drivename, c);
+        mr_asprintf(subdev_str, "%s%c", drivename, c);
         if ((idx = find_device_in_mountlist(mountlist, subdev_str)) < 0) {
             lp->d_partitions[c - 'a'].p_size = 0;
@@ -1416 +1416 @@
     display_disklabel(ftmp, lp);
     fclose(ftmp);
-    mr_asprintf(&command, "disklabel -wr %s auto", canonical_name(drivename));
+    mr_asprintf(command, "disklabel -wr %s auto", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
     mr_free(command);
 
-    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel", canonical_name(drivename));
+    mr_asprintf(command, "disklabel -R %s /tmp/disklabel", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
     mr_free(command);
@@ -1468 +1468 @@
     malloc_string(format);
 
-    mr_asprintf(&tmp, "Partitioning drive %s", drivename);
+    mr_asprintf(tmp, "Partitioning drive %s", drivename);
     log_it(tmp);
     mr_free(tmp);
@@ -1477 +1477 @@
 #else
     make_hole_for_file(FDISK_LOG);
-    mr_asprintf(&tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
+    mr_asprintf(tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
     pout_to_fdisk = popen(tmp, "w");
     mr_free(tmp);
@@ -1500 +1500 @@
                 // try DangerouslyDedicated mode
                 for (c = 'a'; c <= 'z'; c++) {
-                    mr_asprintf(&subdev_str, "%s%c", drivename, c);
+                    mr_asprintf(subdev_str, "%s%c", drivename, c);
                     if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
                         fbsd_part = TRUE;
@@ -1510 +1510 @@
                                                  drivename,
                                                  0);
-                    mr_asprintf(&command, "disklabel -B %s", basename(drivename));
+                    mr_asprintf(command, "disklabel -B %s", basename(drivename));
                     if (system(command)) {
                         log_to_screen
@@ -1522 +1522 @@
             }
             for (c = 'a'; c <= 'z'; c++) {
-                mr_asprintf(&subdev_str, "%s%c", device_str, c);
+                mr_asprintf(subdev_str, "%s%c", device_str, c);
                 if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
                     fbsd_part = TRUE;
@@ -1535 +1535 @@
                 partsize = 0;
                 for (i = 'a'; i < 'z'; ++i) {
-                    mr_asprintf(&subdev_str, "%s%c", device_str, i);
+                    mr_asprintf(subdev_str, "%s%c", device_str, i);
                     line = find_device_in_mountlist(mountlist, subdev_str);
                     mr_free(subdev_str);
@@ -1565 +1565 @@
             file = open(drivename, O_WRONLY);
             if (file != -1) {
-                mr_asprintf(&tmp, "Warning - unable to open %s for wiping it's partition table", drivename);
+                mr_asprintf(tmp, "Warning - unable to open %s for wiping it's partition table", drivename);
                 log_to_screen(tmp);
                 mr_free(tmp);
@@ -1572 +1572 @@
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    mr_asprintf(&tmp, "Warning - unable to write to %s", drivename);
+                    mr_asprintf(tmp, "Warning - unable to write to %s", drivename);
                     log_to_screen(tmp);
                     mr_free(tmp);
@@ -1618 +1618 @@
 #ifdef __FreeBSD__
         if ((current_devno <= 4) && fbsd_part) {
-            mr_asprintf(&tmp, "disklabel -B %s", basename(device_str));
+            mr_asprintf(tmp, "disklabel -B %s", basename(device_str));
             retval += label_drive_or_slice(mountlist, device_str, 0);
             if (system(tmp)) {
@@ -1634 +1634 @@
     if (pout_to_fdisk) {
 // mark relevant partition as bootable
-        mr_asprintf(&tmp, "a\n%s\n", call_program_and_get_last_line_of_output("make-me-bootable /tmp/mountlist.txt dummy"));
+        mr_asprintf(tmp, "a\n%s\n", call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy"));
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
         mr_free(tmp);
@@ -1644 +1644 @@
         log_msg(0,
                 "------------------- fdisk.log looks like this ------------------");
-        mr_asprintf(&tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
+        mr_asprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
         mr_free(tmp);
@@ -1650 +1650 @@
         log_msg(0,
                 "------------------- end of fdisk.log... word! ------------------");
-        mr_asprintf(&tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
+        mr_asprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
         if (!run_program_and_log_output(tmp, 5)) {
             g_partition_table_locked_up++;
@@ -1656 +1656 @@
         mr_free(tmp);
 
-        mr_asprintf(&tmp, "partprobe %s", drivename);
+        mr_asprintf(tmp, "partprobe %s", drivename);
         if (!run_program_and_log_output(tmp, 5)) {
             g_partition_table_locked_up--;
@@ -1708 +1708 @@
 
     if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-        mr_asprintf(&tmp, "Not partitioning %s - it is a virtual drive", drive);
+        mr_asprintf(tmp, "Not partitioning %s - it is a virtual drive", drive);
         log_it(tmp);
         mr_free(tmp);
@@ -1716 +1716 @@
     partition_name = build_partition_name(drive, partno);
     if (partsize <= 0) {
-        mr_asprintf(&tmp, "Partitioning device %s (max size)", partition_name);
+        mr_asprintf(tmp, "Partitioning device %s (max size)", partition_name);
     } else {
-        mr_asprintf(&tmp, "Partitioning device %s (%lld MB)", partition_name, (long long) partsize / 1024);
+        mr_asprintf(tmp, "Partitioning device %s (%lld MB)", partition_name, (long long) partsize / 1024);
     }
     update_progress_form(tmp);
@@ -1725 +1725 @@
 
     if (is_this_device_mounted(partition_name)) {
-        mr_asprintf(&tmp, "%s is mounted, and should not be partitioned", partition_name);
+        mr_asprintf(tmp, "%s is mounted, and should not be partitioned", partition_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1737 +1737 @@
     /* BERLIOS: should not be called each time */
     part_table_fmt = which_partition_format(drive);
-    mr_asprintf(&output, "");
+    mr_asprintf(output, "");
     /* make it a primary/extended/logical */
     if (partno <= 4) {
@@ -1769 +1769 @@
     }
     mr_strcat(output, "\n");
-    mr_asprintf(&tmp,"PARTSIZE = +%ld",(long)partsize);
+    mr_asprintf(tmp,"PARTSIZE = +%ld",(long)partsize);
     log_it(tmp);
     mr_free(tmp);
@@ -1777 +1777 @@
     log_it("---end of fdisk---");
 
-    mr_asprintf(&program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
     if (pout_to_fdisk) {
         log_msg(1, "Doing the new all-in-one fdisk thing");
@@ -1783 +1783 @@
         fput_string_one_char_at_a_time(pout_to_fdisk, output);
         fput_string_one_char_at_a_time(pout_to_fdisk, "\n\np\n");
-        mr_asprintf(&tmp, "%s", last_line_of_file(FDISK_LOG));
+        mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
         if (strstr(tmp, " (m ")) {
             log_msg(1, "Successfully created partition %d on %s", partno, drive);
@@ -1826 +1826 @@
                                  format, -1);
             if (res) {
-                mr_asprintf(&tmp, "Failed to vacuum-pack %s", partition_name);
+                mr_asprintf(tmp, "Failed to vacuum-pack %s", partition_name);
                 log_it(tmp);
                 mr_free(tmp);
@@ -1840 +1840 @@
                                    partsize);
             if (retval) {
-                mr_asprintf(&tmp, "Partitioned %s but failed to set its type", partition_name);
+                mr_asprintf(tmp, "Partitioned %s but failed to set its type", partition_name);
                 log_it(tmp);
                 mr_free(tmp);
             } else {
                 if (partsize > 0) {
-                    mr_asprintf(&tmp, "Partition %s created+configured OK", partition_name);
+                    mr_asprintf(tmp, "Partition %s created+configured OK", partition_name);
                     log_to_screen(tmp);
                     mr_free(tmp);
@@ -1853 +1853 @@
             }
         } else {
-            mr_asprintf(&tmp, "Failed to partition %s", partition_name);
+            mr_asprintf(tmp, "Failed to partition %s", partition_name);
             if (partsize > 0) {
                 log_to_screen(tmp);
@@ -1997 +1997 @@
     p = (char *) strrchr(partition, '/');
     if (strcmp(format, "swap") == 0) {
-        mr_asprintf(&partcode, "82");
+        mr_asprintf(partcode, "82");
     } else if (strcmp(format, "vfat") == 0) {
         if (partsize / 1024 > 8192) {
-            mr_asprintf(&partcode, "c");
+            mr_asprintf(partcode, "c");
         } else {
-            mr_asprintf(&partcode, "b");
+            mr_asprintf(partcode, "b");
         }
     } else if (strcmp(format, "ext2") == 0
@@ -2010 +2010 @@
                || strcmp(format, "xfs") == 0
                || strcmp(format, "jfs") == 0) {
-        mr_asprintf(&partcode, "83");
+        mr_asprintf(partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
-        mr_asprintf(&partcode, "81");
+        mr_asprintf(partcode, "81");
     } else if (strcmp(format, "vmfs3") == 0) {
-        mr_asprintf(&partcode, "fb");
+        mr_asprintf(partcode, "fb");
     } else if (strcmp(format, "vmkcore") == 0) {
-        mr_asprintf(&partcode, "fc");
+        mr_asprintf(partcode, "fc");
     } else if (strcmp(format, "raid") == 0) {
-        mr_asprintf(&partcode, "fd");
+        mr_asprintf(partcode, "fd");
     } else if (strcmp(format, "ntfs") == 0) {
-        mr_asprintf(&partcode, "7");
+        mr_asprintf(partcode, "7");
     } else if ((strcmp(format, "ufs") == 0)
                || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
-        mr_asprintf(&partcode, "a5");
+        mr_asprintf(partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
-        mr_asprintf(&partcode, "8e");
+        mr_asprintf(partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        mr_asprintf(&partcode, "");
+        mr_asprintf(partcode, "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
-        mr_asprintf(&partcode, format);
+        mr_asprintf(partcode, format);
     } else {
         /* probably an image */
-        mr_asprintf(&tmp, "Unknown format ('%s') - using supplied string anyway", format);
+        mr_asprintf(tmp, "Unknown format ('%s') - using supplied string anyway", format);
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         mr_free(tmp);
 #ifdef __FreeBSD__
-        mr_asprintf(&partcode, format); // was a5
+        mr_asprintf(partcode, format);  // was a5
 #else
-        mr_asprintf(&partcode, format); // was 83
+        mr_asprintf(partcode, format);  // was 83
 #endif
     }
@@ -2052 +2052 @@
                 || strstr(last_line_of_file(FDISK_LOG), " (1-4)")) {
                 log_msg(5, "Specifying partno (%d) - yay", partno);
-                mr_asprintf(&tmp, "%d\n", partno);
+                mr_asprintf(tmp, "%d\n", partno);
                 fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
                 mr_free(tmp);
@@ -2060 +2060 @@
             }
 
-            mr_asprintf(&tmp, "%s\n", partcode);
+            mr_asprintf(tmp, "%s\n", partcode);
             fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
             mr_free(tmp);
@@ -2070 +2070 @@
                     last_line_of_file(FDISK_LOG));
 
-            mr_asprintf(&tmp, "%s", last_line_of_file(FDISK_LOG));
+            mr_asprintf(tmp, "%s", last_line_of_file(FDISK_LOG));
             if (!strstr(tmp, " (m ")) {
                 log_msg(1, "last line = '%s'; part type set failed", tmp);
@@ -2080 +2080 @@
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
-            mr_asprintf(&output, "t\n%d\n%s\nw\n", partno, partcode);
-            mr_asprintf(&command, "parted2fdisk %s >> %s 2>> %s", drive,
+            mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
+            mr_asprintf(command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
             log_msg(5, "output = '%s'", output);
@@ -2123 +2123 @@
         return 1;
     }
-    mr_asprintf(&program, "vinum start -f %s", raid_device);
+    mr_asprintf(program, "vinum start -f %s", raid_device);
 #else
-    mr_asprintf(&program, "raidstart %s", raid_device);
+    mr_asprintf(program, "raidstart %s", raid_device);
 #endif
     log_msg(1, "program = %s", program);
@@ -2168 +2168 @@
         return 1;
     }
-    mr_asprintf(&program, "vinum stop -f %s", raid_device);
+    mr_asprintf(program, "vinum stop -f %s", raid_device);
 #else
     // use raidstop if it exists, otherwise use mdadm
     if (run_program_and_log_output("which raidstop", FALSE)) {
-        mr_asprintf(&program, "mdadm -S %s", raid_device);
+        mr_asprintf(program, "mdadm -S %s", raid_device);
     } else {
-        mr_asprintf(&program, "raidstop %s", raid_device);
+        mr_asprintf(program, "raidstop %s", raid_device);
     }
 #endif
@@ -2320 +2320 @@
     if (strcmp(format, "swap") == 0) {
 #ifdef __FreeBSD__
-        mr_asprintf(&program, "true");
+        mr_asprintf(program, "true");
 #else
-        mr_asprintf(&program, "mkswap");
+        mr_asprintf(program, "mkswap");
 #endif
     } else if (strcmp(format, "vfat") == 0) {
-        mr_asprintf(&program, "format-and-kludge-vfat");
+        mr_asprintf(program, "format-and-kludge-vfat");
 #ifndef __FreeBSD__
     } else if (strcmp(format, "reiserfs") == 0) {
-        mr_asprintf(&program, "mkreiserfs -ff");
+        mr_asprintf(program, "mkreiserfs -ff");
     } else if (strcmp(format, "xfs") == 0) {
-        mr_asprintf(&program, "mkfs.xfs -f -q");
+        mr_asprintf(program, "mkfs.xfs -f -q");
     } else if (strcmp(format, "jfs") == 0) {
-        mr_asprintf(&program, "mkfs.jfs");
+        mr_asprintf(program, "mkfs.jfs");
     } else if (strcmp(format, "ext3") == 0) {
-        mr_asprintf(&program, "mkfs -t ext3 -F -q");
+        mr_asprintf(program, "mkfs -t ext3 -F -q");
     } else if (strcmp(format, "ext4") == 0) {
-        mr_asprintf(&program, "mkfs -t ext4 -F -q");
+        mr_asprintf(program, "mkfs -t ext4 -F -q");
     } else if (strcmp(format, "minix") == 0) {
-        mr_asprintf(&program, "mkfs.minix");
+        mr_asprintf(program, "mkfs.minix");
     } else if (strcmp(format, "vmfs") == 0) {
-        mr_asprintf(&program, "mkfs -t vmfs");
+        mr_asprintf(program, "mkfs -t vmfs");
     } else if (strcmp(format, "ntfs") == 0) { 
         /* 
@@ -2346 +2346 @@
          * so the default "mkfs -t %s -c" command structure fails 
          */ 
-        mr_asprintf(&program, "mkfs -t ntfs");
+        mr_asprintf(program, "mkfs -t ntfs");
     } else if (strcmp(format, "ocfs2") == 0) {
         /*
@@ -2352 +2352 @@
          *
          */
-        mr_asprintf(&program, "mkfs -t ocfs2 -F");
+        mr_asprintf(program, "mkfs -t ocfs2 -F");
 #endif
     } else if (strcmp(format, "ext2") == 0) {
-        mr_asprintf(&program, "mke2fs -F -q");
+        mr_asprintf(program, "mke2fs -F -q");
     } else {
 #ifdef __FreeBSD__
-        mr_asprintf(&program, "newfs_%s", format);
+        mr_asprintf(program, "newfs_%s", format);
 #else
-        mr_asprintf(&program, "mkfs -t %s -c", format); // -c checks for bad blocks
-#endif
-        mr_asprintf(&tmp, "Unknown format (%s) - assuming '%s' will do", format, program);
+        mr_asprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
+#endif
+        mr_asprintf(tmp, "Unknown format (%s) - assuming '%s' will do", format, program);
         log_it(tmp);
         mr_free(tmp);
@@ -2425 +2425 @@
         return;
     }
-    mr_asprintf(&tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name, current_size_of_drive);
+    mr_asprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name, current_size_of_drive);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -2445 +2445 @@
 
     if (original_size_of_drive <= 0) {
-        mr_asprintf(&tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
+        mr_asprintf(tmp, "Cannot resize %s's entries. Drive not found.", drive_name);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2451 +2451 @@
     }
     factor = (float) (current_size_of_drive) / (float) (original_size_of_drive);
-    mr_asprintf(&tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f", drive_name, original_size_of_drive, current_size_of_drive, factor);
+    mr_asprintf(tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f", drive_name, original_size_of_drive, current_size_of_drive, factor);
     log_to_screen(tmp);
     mr_free(tmp);
@@ -2478 +2478 @@
         }
 
-        mr_asprintf(&tmp, "Changing %s from %lld KB to %ld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
+        mr_asprintf(tmp, "Changing %s from %lld KB to %ld KB", drivemntlist->el[partno]->device, drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -2484 +2484 @@
     }
     final_size = get_phys_size_of_drive(drive_name);
-    mr_asprintf(&tmp, "final_size = %ld MB", final_size);
+    mr_asprintf(tmp, "final_size = %ld MB", final_size);
     log_to_screen(tmp);
     mr_free(tmp);

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

@@ -79 +79 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            mr_asprintf(&tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
+            mr_asprintf(tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
             log_msg(2, tmp_ptr);
             paranoid_free(tmp_ptr);
@@ -86 +86 @@
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        mr_asprintf(&tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
+        mr_asprintf(tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
         log_to_screen(tmp_ptr);
         paranoid_free(tmp_ptr);
@@ -101 +101 @@
 
     if (!g_text_mode) {
-        mr_asprintf(&tmp_ptr, "Comparing %s", bigfile_fname_ptr);
+        mr_asprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
         newtDrawRootText(0, 22, tmp_ptr);
         paranoid_free(tmp_ptr);
@@ -120 +120 @@
     mr_free(command_ptr);
 
-    mr_asprintf(&tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+    mr_asprintf(tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
     paranoid_system(tmp_ptr);
     paranoid_free(tmp_ptr);
@@ -146 +146 @@
         }
     }
-    mr_asprintf(&tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
+    mr_asprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
     if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
         mr_strcat(tmp_ptr, " ... OK");
@@ -274 +274 @@
 
     if (use_star) {
-        mr_asprintf(&archiver_exe, "star");
-    } else {
-        mr_asprintf(&archiver_exe, "afio");
+        mr_asprintf(archiver_exe, "star");
+    } else {
+        mr_asprintf(archiver_exe, "afio");
     }
 

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

@@ -472 +472 @@
     char *prompt = NULL;
 
-    mr_asprintf(&prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
+    mr_asprintf(prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
-        mr_asprintf(&tmp, "concat");
+        mr_asprintf(tmp, "concat");
     } else if (raidrec->raidlevel == 0) {
-        mr_asprintf(&tmp, "striped");
+        mr_asprintf(tmp, "striped");
     } else {
-        mr_asprintf(&tmp, "raid%i", raidrec->raidlevel);
+        mr_asprintf(tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
@@ -538 +538 @@
 
     system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    mr_asprintf(&personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
-    mr_asprintf(&prompt, "Please enter the RAID level you want. %s", personalities);
+    mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
     mr_free(personalities);
 
     if (raidrec->raid_level == -1) {
-        mr_asprintf(&tmp, "linear");
+        mr_asprintf(tmp, "linear");
     } else {
-        mr_asprintf(&tmp, "%d", raidrec->raid_level);
+        mr_asprintf(tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
@@ -1850 +1850 @@
             char *tmp = NULL;
 
-            mr_asprintf(&tmp, "%i", raidrec->stripesize);
+            mr_asprintf(tmp, "%i", raidrec->stripesize);
             p = popup_and_get_string("Stripe size", "Please enter the stripe size in kilobytes.", tmp);
             mr_free(tmp);
@@ -1899 +1899 @@
     assert(lino >= 0);
 
-    mr_asprintf(&sz_out, "%s", raidrec->additional_vars.el[lino].value);
-    mr_asprintf(&header, "Edit %s", raidrec->additional_vars.el[lino].label);
-    mr_asprintf(&comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
+    mr_asprintf(sz_out, "%s", raidrec->additional_vars.el[lino].value);
+    mr_asprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
+    mr_asprintf(comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
     p = popup_and_get_string(header, comment, sz_out);
     if (p != NULL) {
@@ -1957 +1957 @@
     assert(raidlist != NULL);
 
-    mr_asprintf(&flaws_str_A, "%s", "         ");
-    mr_asprintf(&flaws_str_B, "%s", "         ");
-    mr_asprintf(&flaws_str_C, "%s", "         ");
+    mr_asprintf(flaws_str_A, "%s", "         ");
+    mr_asprintf(flaws_str_B, "%s", "         ");
+    mr_asprintf(flaws_str_C, "%s", "         ");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
         log_to_screen("Arbitrary limits suck, man!");
@@ -2283 +2283 @@
     log_it("isodir_path = %s", isodir_path);
     if (isodir_device[0] == '\0') {
-        mr_asprintf(&idev, "/dev/");
+        mr_asprintf(idev, "/dev/");
     } else {
-        mr_asprintf(&idev, "%s", isodir_device);
-    }
-
-    if (isodir_path[0] == '\0') {
-        strcpy(isodir_path, "/");
-    }
+        mr_asprintf(idev, "%s", isodir_device);
+    }
+
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
         mr_free(idev);
-        mr_asprintf(&idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
-        mr_asprintf(&isodir_format, "nfs");
-        strcpy(isodir_path, last_line_of_file("/tmp/NFS-SERVER-PATH"));
+        mr_asprintf(idev, "%s", last_line_of_file("/tmp/NFS-SERVER-MOUNT"));
+        mr_asprintf(isodir_format, "nfs");
+        mr_free(isodir_path);
+        mr_asprintf(isodir_path, "%s", last_line_of_file("/tmp/NFS-SERVER-PATH"));
     }
 
@@ -2319 +2317 @@
                     /* modify for the caller */
                     strcpy(isodir_device, p);
-                    strcpy(isodir_path, r);
+                    mr_free(isodir_path);
+                    isodir_path = r;
                     log_it("isodir_device = %s - isodir_format = %s - isodir_path = %s", isodir_device, isodir_format, isodir_path);
-                    mr_free(r);
     
                     ret = TRUE;
@@ -2770 +2768 @@
 
     log_it("Post-malloc");
-    mr_asprintf(&help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
-    mr_asprintf(&header_text, "%-24s    %s", "Device", "Index");
-    mr_asprintf(&title_of_window, "%s contains...", raidrec->raid_device);
+    mr_asprintf(help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
+    mr_asprintf(header_text, "%-24s    %s", "Device", "Index");
+    mr_asprintf(title_of_window, "%s contains...", raidrec->raid_device);
     newtPushHelpLine(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
@@ -2827 +2825 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    mr_asprintf(&tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
-                    mr_asprintf(&sz_res, "%d", disklist->el[currline].index);
+                    mr_asprintf(tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
+                    mr_asprintf(sz_res, "%d", disklist->el[currline].index);
                     p = popup_and_get_string("Set index", tmp, sz_res);
                     mr_free(tmp);

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);

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -280 +280 @@
         }
         if (g_ISO_restore_mode) {
-            mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
+            mr_asprintf(tmp, "umount %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -361 +361 @@
 
     /* 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);
@@ -376 +376 @@
 
     /* 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");
@@ -391 +391 @@
 
     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) {
@@ -490 +490 @@
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
-            mr_asprintf(&tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
+            mr_asprintf(tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
             res = system(tmp1);
             mr_free(tmp1);
@@ -663 +663 @@
             strcpy(fstab_fname, "/tmp/fstab");
         }
-        mr_asprintf(&tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_asprintf(tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
         res = system(tmp1);
         mr_free(tmp1);
@@ -780 +780 @@
     assert(raidlist != NULL);
 
-    mr_asprintf(&tmpA, "%s", "         ");
-    mr_asprintf(&tmpB, "%s", "         ");
-    mr_asprintf(&tmpC, "%s", "         ");
+    mr_asprintf(tmpA, "%s", "         ");
+    mr_asprintf(tmpB, "%s", "         ");
+    mr_asprintf(tmpC, "%s", "         ");
 
     log_msg(2, "nuke_mode --- starting");
@@ -803 +803 @@
     }
     if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
-        mr_asprintf(&tmp, "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?", tmpA, tmpB, tmpC);
+        mr_asprintf(tmp, "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?", tmpA, tmpB, tmpC);
         res = ask_me_yes_or_no(tmp);
         mr_free(tmp);
@@ -895 +895 @@
                         "Using tune2fs to identify your ext2,3 partitions");
 
-    mr_asprintf(&tmp, "label-partitions-as-necessary %s < /tmp/fstab", g_mountlist_fname);
+    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab", g_mountlist_fname);
     res = run_program_and_log_output(tmp, TRUE);
     mr_free(tmp);
@@ -915 +915 @@
             ("Please visit our website at http://www.mondorescue.org for more information.");
     } else {
-        mr_asprintf(&tmp,"%s","Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
+        mr_asprintf(tmp,"%s","Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
         popup_and_OK(tmp);
         mr_free(tmp);
@@ -1121 +1121 @@
     if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
     {
-        mr_asprintf(&outfile_fname, "%s", biggiestruct.filename);
+        mr_asprintf(outfile_fname, "%s", biggiestruct.filename);
     } else {
-        mr_asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
+        mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
     }
 
@@ -1159 +1159 @@
         use_ntfsprog_hack = TRUE;
         log_msg(2, "Calling ntfsclone in background because %s is an NTFS /dev entry", outfile_fname);
-        mr_asprintf(&sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
+        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
                 (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
@@ -1232 +1232 @@
             mr_free(mds);
 
-            mr_asprintf(&tmp, "Restoring from %s #%d", mds, g_current_media_number);
+            mr_asprintf(tmp, "Restoring from %s #%d", mds, g_current_media_number);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -1239 +1239 @@
             log_to_screen("Continuing to restore.");
         } else {
-            mr_asprintf(&tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
+            mr_asprintf(tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
             if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
                 log_msg(2,
@@ -1251 +1251 @@
                     (slice_fname
                      (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
-                    mr_asprintf(&bzip2_command, "lzop");
+                    mr_asprintf(bzip2_command, "lzop");
                     strcpy(suffix, "lzo");
                 } else
@@ -1257 +1257 @@
                         (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
-                    mr_asprintf(&bzip2_command, "gzip");
+                    mr_asprintf(bzip2_command, "gzip");
                     strcpy(suffix, "gz");
                 } else
@@ -1263 +1263 @@
                         (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-                    mr_asprintf(&bzip2_command, "bzip2");
+                    mr_asprintf(bzip2_command, "bzip2");
                     strcpy(suffix, "bz2");
                 } else
@@ -1269 +1269 @@
                         (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, ""))) {
-                    mr_asprintf(&bzip2_command, "");
+                    mr_asprintf(bzip2_command, "");
                     strcpy(suffix, "");
                 } else {
@@ -1282 +1282 @@
                         slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             } else {
-                mr_asprintf(&bzip2_command, "cat %s 2>> %s",
+                mr_asprintf(bzip2_command, "cat %s 2>> %s",
                         slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            mr_asprintf(&tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
+            mr_asprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
             mr_free(mds);
             log_msg(2, tmp);
@@ -1321 +1321 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(&tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
@@ -1452 +1452 @@
     if (use_ntfsprog) {
         g_loglevel = 4;
-        mr_asprintf(&outfile_fname, "%s", orig_bf_fname);
+        mr_asprintf(outfile_fname, "%s", orig_bf_fname);
         use_ntfsprog_hack = TRUE;
         log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
-        mr_asprintf(&sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
+        mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
         strcpy(ntfsprog_fifo, sz_devfile);
@@ -1475 +1475 @@
         if (!strncmp(orig_bf_fname, "/dev/", 5))    {
             // non-NTFS partition
-            mr_asprintf(&outfile_fname, "%s", orig_bf_fname);
+            mr_asprintf(outfile_fname, "%s", orig_bf_fname);
         } else {
             // biggiefile
-            mr_asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
+            mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
         }
         use_ntfsprog_hack = FALSE;
@@ -1492 +1492 @@
     if (dummy_restore) {
         mr_free(outfile_fname);
-        mr_asprintf(&outfile_fname, "/dev/null");
+        mr_asprintf(outfile_fname, "/dev/null");
     }
 
     if (!bkpinfo->zip_exe[0]) {
-        mr_asprintf(&command, "cat > \"%s\"", file_to_openout);
+        mr_asprintf(command, "cat > \"%s\"", file_to_openout);
     } else {
-        mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
+        mr_asprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
         if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
             /* Ignore SIGPIPE for gzip as it causes errors on big files
@@ -1568 +1568 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        mr_asprintf(&tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp1) == 0) {
             sleep(1);
@@ -1637 +1637 @@
     log_msg(5, "Entering");
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-    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);
 
-    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
+    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
         log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
@@ -1654 +1654 @@
         log_msg(3, "length_of_file(%s) = %llu", tarball_fname, length_of_file(tarball_fname));
         log_msg(3, "count_lines_in_file(%s) = %llu", tarball_fname, count_lines_in_file(tarball_fname));
-        mr_asprintf(&tmp, "Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
+        mr_asprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -1663 +1663 @@
 
     if (filelist) {
-        mr_asprintf(&filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
+        mr_asprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
         if ((matches =
              save_filelist_entries_in_common(filelist_name, filelist,
@@ -1672 +1672 @@
             log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
         }
-        mr_asprintf(&screen_message, "Tarball #%ld --- %ld matches", current_tarball_number, matches);
+        mr_asprintf(screen_message, "Tarball #%ld --- %ld matches", current_tarball_number, matches);
         log_to_screen(screen_message);
         mr_free(screen_message);
@@ -1680 +1680 @@
     if (filelist == NULL || matches > 0) {
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (g_getfacl) {
-            mr_asprintf(&acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (strstr(tarball_fname, ".bz2")) {
-            mr_asprintf(&executable, "bzip2");
+            mr_asprintf(executable, "bzip2");
         } else if (strstr(tarball_fname, ".gz")) {
-            mr_asprintf(&executable, "gzip");
+            mr_asprintf(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
-            mr_asprintf(&executable, "lzop");
+            mr_asprintf(executable, "lzop");
         }
         if (executable) {
-            mr_asprintf(&tmp, "which %s > /dev/null 2> /dev/null", executable);
+            mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
             res = run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -1702 +1702 @@
             }
             tmp = executable;
-            mr_asprintf(&executable, "-P %s -Z", tmp);
+            mr_asprintf(executable, "-P %s -Z", tmp);
             mr_free(tmp);
         }
@@ -1712 +1712 @@
 
         if (use_star) {
-            mr_asprintf(&command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
+            mr_asprintf(command, "star -x -force-remove -U " STAR_ACL_SZ " errctl= file=%s", tarball_fname);
             if (strstr(tarball_fname, ".bz2")) {
                 mr_strcat(command, " -bz");
@@ -1721 +1721 @@
             } else {
                 if (filelist_subset_fname != NULL) {
-                    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);
                 }
             }
@@ -1730 +1730 @@
 
 #undef BUFSIZE
-        mr_asprintf(&temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
+        mr_asprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
 
         mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
@@ -1776 +1776 @@
         }
         if (retval) {
-            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
             paranoid_free(command);
@@ -1865 +1865 @@
    * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
    ****************************************************************************/
-    mr_asprintf(&afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
-    mr_asprintf(&filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
-    mr_asprintf(&filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
+    mr_asprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
+    mr_asprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
+    mr_asprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
 
     res = read_file_from_stream_to_file(afio_fname, size);
@@ -1877 +1877 @@
     }
     if (bkpinfo->compression_level == 0) {
-        mr_asprintf(&executable, "%s", "");
+        mr_asprintf(executable, "%s", "");
     } else {
         if (bkpinfo->use_star) {
-            mr_asprintf(&executable, "%s", " -bz");
+            mr_asprintf(executable, "%s", " -bz");
         } else {
-            mr_asprintf(&executable, "-P %s -Z", bkpinfo->zip_exe);
+            mr_asprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
         }
     }
@@ -1893 +1893 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            mr_asprintf(&command, "star -t file=%s %s", afio_fname, executable);
+            mr_asprintf(command, "star -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
-            mr_asprintf(&command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
+            mr_asprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
         }
         mr_strcat(command, " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
@@ -1927 +1927 @@
     if (strstr(tarball_fname, ".star.")) {
         // star
-        mr_asprintf(&command, "star -x file=%s %s", afio_fname, executable);
+        mr_asprintf(command, "star -x file=%s %s", afio_fname, executable);
         if (filelist) {
             mr_strcat(command, " list=%s", filelist_subset_fname);
@@ -1933 +1933 @@
     } else {
         // afio
-        mr_asprintf(&command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
+        mr_asprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
         if (filelist) {
             mr_strcat(command, " -w %s", filelist_subset_fname);
@@ -2026 +2026 @@
     assert(bkpinfo != NULL);
 
-    mr_asprintf(&biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
         log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
@@ -2033 +2033 @@
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
     total_slices = atol(tmp);
-    mr_asprintf(&tmp1, "Reassembling large files      ");
+    mr_asprintf(tmp1, "Reassembling large files      ");
     mvaddstr_and_log_it(g_currentY, 0, tmp1);
     mr_free(tmp1);
@@ -2066 +2066 @@
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
                 insist_on_this_cd_number(++g_current_media_number);
-                mr_asprintf(&tmp1, "Restoring from %s #%d", mds, g_current_media_number);
+                mr_asprintf(tmp1, "Restoring from %s #%d", mds, g_current_media_number);
                 log_to_screen(tmp1);
                 mr_free(tmp1);
@@ -2081 +2081 @@
         } else {
             just_changed_cds = FALSE;
-            mr_asprintf(&tmp1, "Restoring big file %ld", bigfileno + 1);
+            mr_asprintf(tmp1, "Restoring big file %ld", bigfileno + 1);
             update_progress_form(tmp1);
             mr_free(tmp1);
@@ -2098 +2098 @@
         fclose(fbw);
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(xattr_fname) > 0) {
                 set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
@@ -2105 +2105 @@
         }
         if (g_getfacl) {
-            mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(acl_fname) > 0) {
                 set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
@@ -2177 +2177 @@
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    mr_asprintf(&progress_str, "Restoring from %s #%d", mds, g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
 
     log_to_screen(progress_str);
@@ -2189 +2189 @@
         mr_free(progress_str);
 
-        mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
+        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
-            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -2224 +2224 @@
             }
             g_current_media_number++;
-            mr_asprintf(&progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
+            mr_asprintf(progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
+            mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
             for (res = 999, attempts = 0; attempts < 3 && res != 0;
                  attempts++) {
@@ -2235 +2235 @@
                                               filelist);
             }
-            mr_asprintf(&tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
+            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
             if (res) {
                 mr_strcat(tmp1, "reported errors");
@@ -2319 +2319 @@
     total_slices = atol(tmp);
     if (g_getfattr) {
-        mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-    mr_asprintf(&tmp1, "Reassembling large files      ");
+        mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    mr_asprintf(tmp1, "Reassembling large files      ");
     mvaddstr_and_log_it(g_currentY, 0, tmp1);
     mr_free(tmp1);
 
-    mr_asprintf(&biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
         log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
@@ -2364 +2364 @@
             p++;
         }
-        mr_asprintf(&tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
+        mr_asprintf(tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp1);
         mr_free(tmp1);
@@ -2479 +2479 @@
     run_program_and_log_output("pwd", 5);
 
-    mr_asprintf(&progress_str, "Restoring from media #%d", g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from media #%d", g_current_media_number);
     log_to_screen(progress_str);
     open_progress_form("Restoring from archives",
@@ -2501 +2501 @@
         update_progress_form(progress_str);
         if (g_getfattr) {
-            mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
+            mr_asprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(xattr_fname);
         }
         if (g_getfacl) {
-            mr_asprintf(&acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
+            mr_asprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(acl_fname);
         }
@@ -2519 +2519 @@
         retval += res;
         if (res) {
-            mr_asprintf(&tmp, "Fileset %ld - errors occurred", current_afioball_number);
+            mr_asprintf(tmp, "Fileset %ld - errors occurred", current_afioball_number);
             log_to_screen(tmp);
             mr_free(tmp);
@@ -2534 +2534 @@
 
         mr_free(progress_str);
-        mr_asprintf(&progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
+        mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
         mr_free(mds);
         res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
@@ -2594 +2594 @@
     g_current_media_number = 1;
     getcwd(cwd, MAX_STR_LEN - 1);
-    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->restore_path);
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
     mr_free(tmp);
@@ -2666 +2666 @@
 {
     log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
-    log_msg(0,
-            "DON'T PANIC! Mondorestore logs almost everything, so please ");
-    log_msg(0,
-            "don't break out in a cold sweat just because you see a few  ");
-    log_msg(0,
-            "error messages in the log. Read them; analyze them; see if  ");
-    log_msg(0,
-            "they are significant; above all, verify your backups! Please");
-    log_msg(0,
-            "attach a compressed copy of this log to any e-mail you send ");
-    log_msg(0,
-            "to the Mondo mailing list when you are seeking technical    ");
-    log_msg(0,
-            "support. Without it, we can't help you.            - DevTeam");
-    log_msg(0,
-            "------------------------------------------------------------");
-    log_msg(0,
-            "BTW, despite (or perhaps because of) the wealth of messages,");
-    log_msg(0,
-            "some users are inclined to stop reading this log.  If Mondo ");
-    log_msg(0,
-            "stopped for some reason, chances are it's detailed here.    ");
-    log_msg(0,
-            "More than likely there's a message at the very end of this  ");
-    log_msg(0,
-            "log that will tell you what is wrong.  Please read it!      ");
-    log_msg(0,
-            "------------------------------------------------------------");
+    log_msg(0, "DON'T PANIC! Mondorestore logs almost everything, so please ");
+    log_msg(0, "don't break out in a cold sweat just because you see a few  ");
+    log_msg(0, "error messages in the log. Read them; analyze them; see if  ");
+    log_msg(0, "they are significant; above all, verify your backups! Please");
+    log_msg(0, "attach a compressed copy of this log to any e-mail you send ");
+    log_msg(0, "to the Mondo mailing list when you are seeking technical    ");
+    log_msg(0, "support. Without it, we can't help you.            - DevTeam");
+    log_msg(0, "------------------------------------------------------------");
+    log_msg(0, "BTW, despite (or perhaps because of) the wealth of messages,");
+    log_msg(0, "some users are inclined to stop reading this log.  If Mondo ");
+    log_msg(0, "stopped for some reason, chances are it's detailed here.    ");
+    log_msg(0, "More than likely there's a message at the very end of this  ");
+    log_msg(0, "log that will tell you what is wrong.  Please read it!      ");
+    log_msg(0, "------------------------------------------------------------");
 }
 
@@ -2768 +2754 @@
 
     /* Backup original mountlist.txt */
-    mr_asprintf(&tmp, "%s.orig", g_mountlist_fname);
+    mr_asprintf(tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
         log_msg(2, "%ld: Warning - g_mountlist_fname (%s) does not exist yet", __LINE__, g_mountlist_fname);
     } else if (!does_file_exist(tmp)) {
         mr_free(tmp);
-        mr_asprintf(&tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
+        mr_asprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
         run_program_and_log_output(tmp, FALSE);
     }
@@ -2948 +2934 @@
         log_msg(2, "Still here. Yay.");
         if ((strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
-            mr_asprintf(&tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
+            mr_asprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
             run_program_and_log_output(tmp, FALSE);
             mr_free(tmp);
@@ -2971 +2957 @@
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
                 log_msg(1, "Mounting nfs dir");
-                sprintf(bkpinfo->isodir, "/tmp/isodir");
+                mr_free(bkpinfo->isodir);
+                mr_asprintf(tmp, "/tmp/isodir");
+                bkpinfo->isodir = tmp;
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-                mr_asprintf(&tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir", bkpinfo->nfs_mount);
+                mr_asprintf(tmp, "mount %s -t nfs -o nolock,ro /tmp/isodir", bkpinfo->nfs_mount);
                 run_program_and_log_output(tmp, 1);
                 mr_free(tmp);
@@ -3070 +3058 @@
       } else {
         log_msg(1, "Re-mounted partitions for post-nuke stuff");
-        mr_asprintf(&tmp, "post-nuke %s %d", bkpinfo->restore_path, retval);
+        mr_asprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path, retval);
         log_msg(2, "Calling '%s'", tmp);
         if ((res = run_program_and_log_output(tmp, 0))) {
@@ -3091 +3079 @@
     set_signals(FALSE);
     log_to_screen("Restore log (%s) copied to /var/log on your hard disk", MONDO_LOGFILE);
-    mr_asprintf(&tmp, "Mondo-restore is exiting (retval=%d)                                      ", retval);
+    mr_asprintf(tmp, "Mondo-restore is exiting (retval=%d)                                      ", retval);
     log_to_screen(tmp);
     mr_free(tmp);
 
-    mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
+    mr_asprintf(tmp, "umount %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
     mr_free(tmp);
@@ -3105 +3093 @@
     }                           // for b0rken distros
     if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
-        mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
         system(tmp);
         mr_free(tmp);