Changeset 900 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Oct 24, 2006, 8:49:18 AM (18 years ago)

Author:

Bruno Cornec

Message:

Huge patch to introduce low level functions that will bw used everywhere (mr_free, mr_asprintf, ...)
Nearly linking now due to that.

File:

• trunk/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (93 diffs)

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -13 +13 @@
 #include <pthread.h>
 #endif
+#include "mr_mem.h"
 
 extern bool g_sigpipe_caught;
@@ -52 +53 @@
 void free_MR_global_filenames()
 {
-    paranoid_free(g_biggielist_txt);
-    paranoid_free(g_filelist_full);
-    paranoid_free(g_filelist_imagedevs);
-    paranoid_free(g_imagedevs_restthese);
-    paranoid_free(g_mondo_cfg_file);
-    paranoid_free(g_mountlist_fname);
-    paranoid_free(g_mondo_home);
-    paranoid_free(g_tmpfs_mountpt);
-    paranoid_free(g_isodir_device);
-    paranoid_free(g_isodir_format);
+    mr_free(g_biggielist_txt);
+    mr_free(g_filelist_full);
+    mr_free(g_filelist_imagedevs);
+    mr_free(g_imagedevs_restthese);
+    mr_free(g_mondo_cfg_file);
+    mr_free(g_mountlist_fname);
+    mr_free(g_mondo_home);
+    mr_free(g_tmpfs_mountpt);
+    mr_free(g_isodir_device);
+    mr_free(g_isodir_format);
 
 }
@@ -94 +95 @@
         fatal_error("Cannot openin outfname");
     }
-    for (getline(&incoming, &n, fin);
-         !feof(fin); getline(&incoming, &n, fin)) {
+    for (mr_getline(&incoming, &n, fin);
+         !feof(fin); mr_getline(&incoming, &n, fin)) {
         strip_spaces(incoming);
 
@@ -102 +103 @@
         }
 
-        asprintf(&question,
+        mr_asprintf(&question,
                  _("Should I restore the image of %s ?"), incoming);
 
@@ -108 +109 @@
             fprintf(fout, "%s\n", incoming);
         }
-        paranoid_free(question);
+        mr_free(question);
     }
 
   /*** free memory ***********/
-    paranoid_free(incoming);
+    mr_free(incoming);
 
     paranoid_fclose(fout);
@@ -147 +148 @@
     assert_string_is_neither_NULL_nor_zerolength(output_cfg_file);
     assert_string_is_neither_NULL_nor_zerolength(output_mountlist_file);
-    asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    asprintf(&command, "mkdir -p %s", mountpt);
+    mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    mr_asprintf(&command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "gzip -dc %s > %s/mindi.rd 2> /dev/null",
+    mr_free(command);
+
+    mr_asprintf(&command, "gzip -dc %s > %s/mindi.rd 2> /dev/null",
             ramdisk_fname, bkpinfo->tmpdir);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "umount %s", mountpt);
+    mr_free(command);
+
+    mr_asprintf(&command, "umount %s", mountpt);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "mount -o loop %s/mindi.rd -t ext2 %s",
+    mr_free(command);
+
+    mr_asprintf(&command, "mount -o loop %s/mindi.rd -t ext2 %s",
             bkpinfo->tmpdir, mountpt);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "mkdir -p %s/tmp", bkpinfo->tmpdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "mkdir -p %s/tmp", bkpinfo->tmpdir);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "cp -f %s/%s %s",    // %s/%s becomes {mountpt}/tmp/m*ndo-restore.cfg
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s/%s %s", // %s/%s becomes {mountpt}/tmp/m*ndo-restore.cfg
             mountpt, g_mondo_cfg_file, output_cfg_file);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&orig_fname, "%s/%s", mountpt, g_mountlist_fname);
+    mr_free(command);
+
+    mr_asprintf(&orig_fname, "%s/%s", mountpt, g_mountlist_fname);
     if (does_file_exist(orig_fname)) {
-        asprintf(&command, "cp -f %s %s", orig_fname, output_mountlist_file);
+        mr_asprintf(&command, "cp -f %s %s", orig_fname, output_mountlist_file);
         run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
-    }
-    asprintf(&command, "umount %s", mountpt);
-    paranoid_free(mountpt);
+        mr_free(command);
+    }
+    mr_asprintf(&command, "umount %s", mountpt);
+    mr_free(mountpt);
 
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
 
     if (!does_file_exist(output_cfg_file)
@@ -196 +197 @@
         retval = 0;
     }
-    paranoid_free(orig_fname);
+    mr_free(orig_fname);
     return (retval);
 }
@@ -240 +241 @@
 
     if (strncmp(preamble, f, strlen(preamble)) == 0) {
-        asprintf(&file, f + strlen(preamble));
-    } else {
-        asprintf(&file, f);
+        mr_asprintf(&file, f + strlen(preamble));
+    } else {
+        mr_asprintf(&file, f);
     }
     if (file[0] == '/' && file[1] == '/') {
-        asprintf(&tmp, file);
-        paranoid_free(file);
-        asprintf(&file, tmp + 1);
-        paranoid_free(tmp);
-    }
-    asprintf(&tmp,
+        mr_asprintf(&tmp, file);
+        mr_free(file);
+        mr_asprintf(&file, tmp + 1);
+        mr_free(tmp);
+    }
+    mr_asprintf(&tmp,
             "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
             f, file);
     log_msg(2, tmp);
-    paranoid_free(tmp);
-
-    asprintf(&command, "grep -x \"%s\" %s", file, list_fname);
-    paranoid_free(file);
+    mr_free(tmp);
+
+    mr_asprintf(&command, "grep -x \"%s\" %s", file, list_fname);
+    mr_free(file);
 
     res = run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         return (FALSE);
@@ -292 +293 @@
     g_ISO_restore_mode = TRUE;
 
-    paranoid_free(g_isodir_device);
+    mr_free(g_isodir_device);
     read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
     if (bkpinfo->disaster_recovery) {
@@ -298 +299 @@
  * Don't let this clobber an existing bkpinfo->isodir */
         if (!bkpinfo->isodir) {
-            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
+            mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
         }
 /* End patch */
-        asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
+        mr_asprintf(&command, "mkdir -p %s", bkpinfo->isodir);
         run_program_and_log_output(command, 5);
-        paranoid_free(command);
+        mr_free(command);
         log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
     }
@@ -319 +320 @@
     } else {
         if (g_isodir_format != NULL) {
-            asprintf(&mount_isodir_command, "mount %s -t %s -o ro %s", g_isodir_device, g_isodir_format, bkpinfo->isodir);
+            mr_asprintf(&mount_isodir_command, "mount %s -t %s -o ro %s", g_isodir_device, g_isodir_format, bkpinfo->isodir);
         } else {
-            asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir);
+            mr_asprintf(&mount_isodir_command, "mount %s -o ro %s", g_isodir_device, bkpinfo->isodir);
         }
         run_program_and_log_output("df -m", FALSE);
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
                 mount_isodir_command);
         log_msg(1, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (run_program_and_log_output(mount_isodir_command, FALSE)) {
@@ -334 +335 @@
                 (_
                  ("Cannot mount the device where the ISO files are stored."));
-            paranoid_free(mount_isodir_command);
+            mr_free(mount_isodir_command);
             return (1);
         }
-        paranoid_free(mount_isodir_command);
+        mr_free(mount_isodir_command);
         log_to_screen
             (_
@@ -346 +347 @@
     }
     i = what_number_cd_is_this(bkpinfo);    /* has the side-effect of calling mount_cdrom() */
-    asprintf(&tmp, "%s #%d has been mounted via loopback mount",
+    mr_asprintf(&tmp, "%s #%d has been mounted via loopback mount",
             bkpinfo->backup_media_string, i);
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (i < 0) {
@@ -368 +369 @@
 {
     char *command;
-    asprintf(&command,
+    mr_asprintf(&command,
             "kill `ps 2> /dev/null | grep petris 2> /dev/null | grep -v grep | cut -d' ' -f2` 2> /dev/null");
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 }
 
@@ -413 +414 @@
                     "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            asprintf(&tmp, _("%s is already mounted"),
+            mr_asprintf(&tmp, _("%s is already mounted"),
                     mountlist->el[lino].device);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else if (strcmp(mountlist->el[lino].mountpoint, "none")
                    && strcmp(mountlist->el[lino].mountpoint, "lvm")
                    && strcmp(mountlist->el[lino].mountpoint, "raid")
                    && strcmp(mountlist->el[lino].mountpoint, "image")) {
-            asprintf(&tmp, "Mounting %s", mountlist->el[lino].device);
+            mr_asprintf(&tmp, "Mounting %s", mountlist->el[lino].device);
             update_progress_form(tmp);
-            paranoid_free(tmp);
-
-            asprintf(&format, mountlist->el[lino].format);
+            mr_free(tmp);
+
+            mr_asprintf(&format, mountlist->el[lino].format);
             if (!strcmp(format, "ext3")) {
-                paranoid_free(format);
-                asprintf(&format, "ext2");
+                mr_free(format);
+                mr_asprintf(&format, "ext2");
             }
             res = mount_device(mountlist->el[lino].device,
@@ -436 +437 @@
             if (res) {
                 if (these_failed != NULL) { /* not the first time */
-                    asprintf(&tmp, "%s %s", these_failed, mountlist->el[lino].device);
-                    paranoid_free(these_failed);
+                    mr_asprintf(&tmp, "%s %s", these_failed, mountlist->el[lino].device);
+                    mr_free(these_failed);
                     these_failed = tmp;
                 } else { /* The first time */
-                    asprintf(&these_failed, "%s ", mountlist->el[lino].device);
+                    mr_asprintf(&these_failed, "%s ", mountlist->el[lino].device);
                 }
             }
-            paranoid_free(format);
+            mr_free(format);
         }
         g_current_progress++;
@@ -459 +460 @@
                           ("format and restore *without* partitioning first. Sorry for the inconvenience."));
         }
-        asprintf(&tmp, _("Could not mount devices %s- shall I abort?"),
+        mr_asprintf(&tmp, _("Could not mount devices %s- shall I abort?"),
                 these_failed);
-        paranoid_free(these_failed);
+        mr_free(these_failed);
 
         if (!ask_me_yes_or_no(tmp)) {
@@ -474 +475 @@
                 (_("Unable to mount some or all of your partitions."));
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         log_to_screen(_("All partitions were mounted OK."));
@@ -480 +481 @@
     }
     run_program_and_log_output("df -m", 3);
-    paranoid_free(mountlist);
+    mr_free(mountlist);
     return (retval);
 }
@@ -523 +524 @@
         if ((!bkpinfo->isodir || !strcmp(bkpinfo->isodir, "/"))
             && am_I_in_disaster_recovery_mode()) {
-            paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
+            mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
-        asprintf(&mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+        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);
-        paranoid_free(mount_cmd);
-
-        asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
-        paranoid_free(mddev);
+        mr_free(mount_cmd);
+
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        mr_free(mddev);
 #else
-        asprintf(&mount_cmd,
+        mr_asprintf(&mount_cmd,
                 "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
                 bkpinfo->isodir, bkpinfo->nfs_remote_dir, bkpinfo->prefix,
@@ -544 +545 @@
     } else if (bkpinfo->backup_media_type == iso) {
 #ifdef __FreeBSD__
-        asprintf(&mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
+        mr_asprintf(&mount_cmd, "%s/%s-%d.iso", bkpinfo->isodir,
                 bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
-        paranoid_free(mount_cmd);
-
-        asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
-        paranoid_free(mddev);
+        mr_free(mount_cmd);
+
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        mr_free(mddev);
 #else
-        asprintf(&mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
+        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);
@@ -559 +560 @@
 #ifdef __FreeBSD__
     {
-        asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
                 MNT_CDROM);
     }
 #else
     {
-        asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
+        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
                 bkpinfo->media_device, MNT_CDROM);
     }
@@ -572 +573 @@
         if (bkpinfo->disaster_recovery
             && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-            paranoid_free(bkpinfo->media_device);
+            mr_free(bkpinfo->media_device);
             bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
         } else {
-            paranoid_free(bkpinfo->media_device);
+            mr_free(bkpinfo->media_device);
             bkpinfo->media_device = find_cdrom_device(TRUE);
         }
 
 #ifdef __FreeBSD__
-        asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        mr_asprintf(&mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
                 MNT_CDROM);
 #else
-        asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
+        mr_asprintf(&mount_cmd, "mount %s -t iso9660 -o ro %s",
                 bkpinfo->media_device, MNT_CDROM);
 #endif
@@ -599 +600 @@
         }
     }
-    paranoid_free(mount_cmd);
+    mr_free(mount_cmd);
 
     if (res) {
@@ -639 +640 @@
 
     if (!strcmp(mpt, "/1")) {
-        asprintf(&mountpoint, "/");
+        mr_asprintf(&mountpoint, "/");
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        asprintf(&mountpoint, mpt);
+        mr_asprintf(&mountpoint, mpt);
     }
 
     if (!strcmp(mountpoint, "lvm")) {
-        paranoid_free(mountpoint);
+        mr_free(mountpoint);
         return (0);
     }
     if (!strcmp(mountpoint, "image")) {
-        paranoid_free(mountpoint);
+        mr_free(mountpoint);
         return (0);
     }
-    asprintf(&tmp, "Mounting device %s   ", device);
+    mr_asprintf(&tmp, "Mounting device %s   ", device);
     log_msg(1, tmp);
 
     if (writeable) {
-        asprintf(&p1, "-o rw");
-    } else {
-        asprintf(&p1, "-o ro");
+        mr_asprintf(&p1, "-o rw");
+    } else {
+        mr_asprintf(&p1, "-o ro");
     }
     tmp = find_home_of_exe("setfattr");
     if (tmp) {
-        asprintf(&p2, ",user_xattr");
-    } else {
-        asprintf(&p2, "%s", "");
-    }
-    paranoid_free(tmp);
+        mr_asprintf(&p2, ",user_xattr");
+    } else {
+        mr_asprintf(&p2, "%s", "");
+    }
+    mr_free(tmp);
 
     tmp = find_home_of_exe("setfacl");
     if (tmp) {
-        asprintf(&p3, ",acl");
-    } else {
-        asprintf(&p3, "%s", "");
-    }
-    paranoid_free(tmp);
-
-    asprintf(&additional_parameters, "%s%s%s", p1, p2, p3);
-    paranoid_free(p1);
-    paranoid_free(p2);
-    paranoid_free(p3);
+        mr_asprintf(&p3, ",acl");
+    } else {
+        mr_asprintf(&p3, "%s", "");
+    }
+    mr_free(tmp);
+
+    mr_asprintf(&additional_parameters, "%s%s%s", p1, p2, p3);
+    mr_free(p1);
+    mr_free(p2);
+    mr_free(p3);
 
     if (!strcmp(mountpoint, "swap")) {
-        asprintf(&command, "swapon %s", device);
+        mr_asprintf(&command, "swapon %s", device);
     } else {
         if (!strcmp(mountpoint, "/")) {
-            asprintf(&mountdir, MNT_RESTORING);
+            mr_asprintf(&mountdir, MNT_RESTORING);
         } else {
-            asprintf(&mountdir, "%s%s", MNT_RESTORING, mountpoint);
-        }
-        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);
-        paranoid_free(command);
-
-        asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
+        mr_free(command);
+
+        mr_asprintf(&command, "mount -t %s %s %s %s 2>> %s", format, device,
                 additional_parameters, mountdir, MONDO_LOGFILE);
         log_msg(2, "command='%s'", command);
     }
-    paranoid_free(additional_parameters);
+    mr_free(additional_parameters);
 
     res = run_program_and_log_output(command, TRUE);
     if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
         log_msg(1, "Re-trying without the fancy extra parameters");
-        paranoid_free(command);
-
-        asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
+        mr_free(command);
+
+        mr_asprintf(&command, "mount -t %s %s %s 2>> %s", format, device,
                 mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
@@ -717 +718 @@
         } else {
             log_msg(2, "Retrying w/o the '-t' switch");
-            paranoid_free(command);
-
-            asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
+            mr_free(command);
+
+            mr_asprintf(&command, "mount %s %s 2>> %s", device, mountdir,
                     MONDO_LOGFILE);
             log_msg(2, "2nd command = '%s'", command);
@@ -731 +732 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(mountdir);
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(mountdir);
 
     if (res && !strcmp(mountpoint, "swap")) {
@@ -740 +741 @@
         res = 0;
     }
-    paranoid_free(mountpoint);
+    mr_free(mountpoint);
 
     return (res);
@@ -836 +837 @@
                 }
             }
-            paranoid_free(value);
+            mr_free(value);
 
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_alloc(bkpinfo->prefix,value);
+                mr_allocstr(bkpinfo->prefix,value);
             } else {
-                paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
+                mr_allocstr(bkpinfo->prefix, STD_PREFIX);
             }
         } else if (!strcmp(value, "nfs")) {
             bkpinfo->backup_media_type = nfs;
-            paranoid_free(value);
+            mr_free(value);
             if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-                paranoid_alloc(bkpinfo->prefix,value);
+                mr_allocstr(bkpinfo->prefix,value);
             } else {
-                paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
+                mr_allocstr(bkpinfo->prefix, STD_PREFIX);
             }
             /* We need to override prefix value in PXE mode as it's 
@@ -868 +869 @@
         fatal_error("backup-media-type not specified!");
     }
-    paranoid_free(value);
+    mr_free(value);
 
     if (bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type == cdstream) {
-            paranoid_alloc(bkpinfo->media_device, "/dev/cdrom");
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
             bkpinfo->media_size[0] = 1999 * 1024;
             bkpinfo->media_size[1] = 650;   /* good guess */
         } else if (bkpinfo->backup_media_type == tape
                    || bkpinfo->backup_media_type == udev) {
-            paranoid_free(bkpinfo->media_device);
+            mr_free(bkpinfo->media_device);
             if (read_cfg_var(cfg_file, "media-dev", bkpinfo->media_device)) {
                 fatal_error("Cannot get tape device name from cfg file");
@@ -883 +884 @@
             read_cfg_var(cfg_file, "media-size", value);
             bkpinfo->media_size[1] = atol(value);
-            paranoid_free(value);
-
-            asprintf(&tmp, "Backup medium is TAPE --- dev=%s",
+            mr_free(value);
+
+            mr_asprintf(&tmp, "Backup medium is TAPE --- dev=%s",
                     bkpinfo->media_device);
             log_msg(2, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else {
-            paranoid_alloc(bkpinfo->media_device, "/dev/cdrom");
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
             bkpinfo->media_size[0] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
             bkpinfo->media_size[1] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
@@ -905 +906 @@
         log_msg(1, "Goody! ... bkpinfo->use_star is now true.");
     }
-    paranoid_free(value);
+    mr_free(value);
 
     if (0 == read_cfg_var(cfg_file, "internal-tape-block-size", value)) {
@@ -917 +918 @@
                 DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
     }
-    paranoid_free(value);
+    mr_free(value);
 
     read_cfg_var(cfg_file, "use-lzo", value);
     if (strstr(value, "yes")) {
         bkpinfo->use_lzo = TRUE;
-        paranoid_alloc(bkpinfo->zip_exe, "lzop");
-        paranoid_alloc(bkpinfo->zip_suffix, "lzo");
-    } else {
-        paranoid_free(value);
+        mr_allocstr(bkpinfo->zip_exe, "lzop");
+        mr_allocstr(bkpinfo->zip_suffix, "lzo");
+    } else {
+        mr_free(value);
         read_cfg_var(cfg_file, "use-comp", value);
         if (strstr(value, "yes")) {
             bkpinfo->use_lzo = FALSE;
-            paranoid_alloc(bkpinfo->zip_exe, "bzip2");
-            paranoid_alloc(bkpinfo->zip_suffix, "bz2");
+            mr_allocstr(bkpinfo->zip_exe, "bzip2");
+            mr_allocstr(bkpinfo->zip_suffix, "bz2");
         } else {
             // Just to be sure
@@ -937 +938 @@
         }
     }
-    paranoid_free(value);
+    mr_free(value);
 
     read_cfg_var(cfg_file, "differential", value);
@@ -944 +945 @@
     }
     log_msg(2, "differential var = '%s'", value);
-    paranoid_free(value);
+    mr_free(value);
 
     if (bkpinfo->differential) {
@@ -962 +963 @@
         log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
     }
-    paranoid_free(tmp);
-    paranoid_free(tmp1);
+    mr_free(tmp);
+    mr_free(tmp1);
 
     if (bkpinfo->backup_media_type == nfs) {
@@ -973 +974 @@
                     "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
         } else {
-            paranoid_free(bkpinfo->nfs_mount);
-            paranoid_free(bkpinfo->nfs_remote_dir);
+            mr_free(bkpinfo->nfs_mount);
+            mr_free(bkpinfo->nfs_remote_dir);
             read_cfg_var(g_mondo_cfg_file, "nfs-server-mount",
                          bkpinfo->nfs_mount);
@@ -994 +995 @@
          * isodir in disaster recovery mode
          */
-        paranoid_alloc(old_isodir,bkpinfo->isodir);
+        mr_allocstr(old_isodir,bkpinfo->isodir);
         read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
         read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
         if (iso_mnt && iso_path) {
-            paranoid_free(bkpinfo->isodir);
-            asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
-        }
-        paranoid_free(iso_mnt);
-        paranoid_free(iso_path);
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+        }
+        mr_free(iso_mnt);
+        mr_free(iso_path);
 
         if (!bkpinfo->disaster_recovery) {
@@ -1011 +1012 @@
             }
         }
-        paranoid_free(old_isodir);
-
-        paranoid_free(g_isodir_device);
+        mr_free(old_isodir);
+
+        mr_free(g_isodir_device);
         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);
@@ -1020 +1021 @@
                 log_msg(2, "NB: isodir is already mounted");
                 /* Find out where it's mounted */
-                asprintf(&command,
+                mr_asprintf(&command,
                         "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
                         g_isodir_device);
@@ -1027 +1028 @@
                 log_it("res of it = %s", tmp);
                 iso_mnt = tmp;
-                paranoid_free(command);
+                mr_free(command);
             } else {
-                asprintf(&iso_mnt, "/tmp/isodir");
-                asprintf(&tmp, "mkdir -p %s", iso_mnt);
+                mr_asprintf(&iso_mnt, "/tmp/isodir");
+                mr_asprintf(&tmp, "mkdir -p %s", iso_mnt);
                 run_program_and_log_output(tmp, 5);
-                paranoid_free(tmp);
-
-                asprintf(&tmp, "mount %s %s", g_isodir_device, iso_mnt);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "mount %s %s", g_isodir_device, iso_mnt);
                 if (run_program_and_log_output(tmp, 3)) {
                     log_msg(1,
                             "Unable to mount isodir. Perhaps this is really a CD backup?");
                     bkpinfo->backup_media_type = cdr;
-                    paranoid_alloc(bkpinfo->media_device, "/dev/cdrom");
-                    paranoid_free(bkpinfo->isodir);
-                    paranoid_free(iso_mnt);
-                    paranoid_free(iso_path);
-                    asprintf(&iso_mnt, "%s", "");
-                    asprintf(&iso_path, "%s", "");
+                    mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
+                    mr_free(bkpinfo->isodir);
+                    mr_free(iso_mnt);
+                    mr_free(iso_path);
+                    mr_asprintf(&iso_mnt, "%s", "");
+                    mr_asprintf(&iso_path, "%s", "");
 
                     if (mount_cdrom(bkpinfo)) {
@@ -1054 +1055 @@
                     }
                 }
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
             /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
             if (bkpinfo->backup_media_type == iso) {
-                paranoid_free(bkpinfo->isodir);
-                asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
-            }
-            paranoid_free(iso_mnt);
-            paranoid_free(iso_path);
+                mr_free(bkpinfo->isodir);
+                mr_asprintf(&bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
+            }
+            mr_free(iso_mnt);
+            mr_free(iso_path);
         }
     }
@@ -1131 +1132 @@
         unlink("/tmp/i-want-my-lvm");
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            asprintf(&command,
+            mr_asprintf(&command,
                     "tar -zxf %s %s %s %s %s %s",
                     bkpinfo->media_device,
@@ -1140 +1141 @@
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
-            paranoid_free(command);
+            mr_free(command);
         } else {
             log_msg(2,
@@ -1148 +1149 @@
             log_msg(2, "Back from iotcn");
             run_program_and_log_output("mount", 1);
-            asprintf(&command,
+            mr_asprintf(&command,
                     "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
                     MNT_CDROM,
@@ -1158 +1159 @@
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
-            paranoid_free(command);
+            mr_free(command);
 
             if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
@@ -1169 +1170 @@
             }
         }
-        asprintf(&command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
+        mr_asprintf(&command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
                 g_mondo_cfg_file);
         run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
-
-        asprintf(&command, "cp -f %s/%s %s", bkpinfo->tmpdir,
+        mr_free(command);
+
+        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);
-        paranoid_free(command);
-
-        asprintf(&command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
+        mr_free(command);
+
+        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);
-        paranoid_free(command);
+        mr_free(command);
     }
 
@@ -1192 +1193 @@
                          ("Do you want to retrieve the mountlist as well?")))
     {
-        asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
+        mr_asprintf(&command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
                 bkpinfo->tmpdir);
         paranoid_system(command);
-        paranoid_free(command);
+        mr_free(command);
     }
 
     chdir(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!does_file_exist(g_biggielist_txt)) {
@@ -1219 +1220 @@
         log_to_screen(("Pre-processing filelist"));
         if (!does_file_exist(g_biggielist_txt)) {
-            asprintf(&command, "> %s", g_biggielist_txt);
+            mr_asprintf(&command, "> %s", g_biggielist_txt);
             paranoid_system(command);
-            paranoid_free(command);
-        }
-        asprintf(&command, "grep  -x \"/dev/.*\" %s > %s",
+            mr_free(command);
+        }
+        mr_asprintf(&command, "grep  -x \"/dev/.*\" %s > %s",
                 g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
-        paranoid_free(command);
+        mr_free(command);
         exit(0);
         break;
@@ -1245 +1246 @@
     if (g_text_mode) {
         printf(_("Restore which directory? --> "));
-        getline(&tmp, &n, stdin);
+        mr_getline(&tmp, &n, stdin);
         toggle_path_selection(filelist, tmp, TRUE);
         if (strlen(tmp) == 0) {
@@ -1252 +1253 @@
             res = 0;
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         res = edit_filelist(filelist);
@@ -1296 +1297 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
 
-    asprintf(&command, "cp -f %s/%s %s/%s.pristine", path_root, filename,path_root, filename);
+    mr_asprintf(&command, "cp -f %s/%s %s/%s.pristine", path_root, filename,path_root, filename);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }
@@ -1324 +1325 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
+    mr_asprintf(&tmp, "run_boot_loader: device='%s', name='%s'", device, name);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     sync();
@@ -1349 +1350 @@
 #ifdef __FreeBSD__
     else if (!strcmp(name, "BOOT0")) {
-        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 {
-        asprintf(&tmp, "ls /dev | grep -xq %ss[1-4].*", device);
+        mr_free(tmp);
+    } else {
+        mr_asprintf(&tmp, "ls /dev | grep -xq %ss[1-4].*", device);
         if (!system(tmp)) {
-            paranoid_free(tmp);
-            asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
+            mr_free(tmp);
+            mr_asprintf(&tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
@@ -1362 +1363 @@
                     "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 #else
@@ -1372 +1373 @@
     }
 #endif
-    paranoid_free(device);
-    paranoid_free(name);
+    mr_free(device);
+    mr_free(name);
 
     retval += res;
@@ -1401 +1402 @@
     tmp = find_home_of_exe("pico");
     if (tmp) {
-        asprintf(&output, "pico");
+        mr_asprintf(&output, "pico");
     } else {
         tmp = find_home_of_exe("nano");
         if (tmp) {
-            asprintf(&output, "nano");
+            mr_asprintf(&output, "nano");
         } else {
             tmp = find_home_of_exe("vi");
             if (tmp) {
-                asprintf(&output, "vi");
+                mr_asprintf(&output, "vi");
             } else {
-                asprintf(&output, "emacs");
-            }
-        }
-    }
-    paranoid_free(tmp);
+                mr_asprintf(&output, "emacs");
+            }
+        }
+    }
+    mr_free(tmp);
 
     tmp = find_home_of_exe(output);
@@ -1421 +1422 @@
         log_msg(2, " (find_my_editor) --- warning - %s not found", output);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (output);
 }
@@ -1454 +1455 @@
             popup_and_get_string(_("Boot device"),
                                  _("Please confirm/enter the boot device. If in doubt, try /dev/hda"), bd);
-            asprintf(&command, "stabgrub-me %s", bd);
+            mr_asprintf(&command, "stabgrub-me %s", bd);
             res = run_program_and_log_output(command, 1);
-            paranoid_free(command);
+            mr_free(command);
 
             if (res) {
@@ -1474 +1475 @@
             }
             editor = find_my_editor();
-            asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+            mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
             paranoid_system(tmp);
-            paranoid_free(tmp);
-
-            asprintf(&tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
-            paranoid_free(editor);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/grub.conf", editor);
+            mr_free(editor);
 
             paranoid_system(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             if (!g_text_mode) {
@@ -1492 +1493 @@
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
-            asprintf(&command, "grub-MR %s /tmp/mountlist.txt", bd);
+            mr_asprintf(&command, "grub-MR %s /tmp/mountlist.txt", bd);
             log_msg(1, "command = %s", command);
         } else {
-            asprintf(&command, "chroot " MNT_RESTORING " grub-install %s", bd);
+            mr_asprintf(&command, "chroot " MNT_RESTORING " grub-install %s", bd);
             log_msg(1, "WARNING - grub-MR not found; using grub-install");
         }
@@ -1504 +1505 @@
         iamhere(command);
         res = run_program_and_log_output(command, 1);
-        paranoid_free(command);
+        mr_free(command);
 
         if (res) {
@@ -1563 +1564 @@
                             _
                             ("Modifying fstab and elilo.conf...                             "));
-        asprintf(&command, "stabelilo-me");
+        mr_asprintf(&command, "stabelilo-me");
         res = run_program_and_log_output(command, 3);
-        paranoid_free(command);
+        mr_free(command);
 
         if (res) {
@@ -1576 +1577 @@
                 }
                 editor = find_my_editor();
-                asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
-                paranoid_free(tmp);
-
-                asprintf(&tmp, "%s " MNT_RESTORING "/etc/elilo.conf", editor);
-                paranoid_free(editor);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/elilo.conf", editor);
+                mr_free(editor);
 
                 paranoid_system(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 if (!g_text_mode) {
@@ -1638 +1639 @@
                             _
                             ("Modifying fstab and lilo.conf, and running LILO...                             "));
-        asprintf(&command, "stablilo-me");
+        mr_asprintf(&command, "stablilo-me");
         res = run_program_and_log_output(command, 3);
-        paranoid_free(command);
+        mr_free(command);
 
         if (res) {
@@ -1651 +1652 @@
                 }
                 editor = find_my_editor();
-                asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
-                paranoid_free(tmp);
-
-                asprintf(&tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
-                paranoid_free(editor);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
+                mr_free(editor);
 
                 paranoid_system(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 if (!g_text_mode) {
@@ -1753 +1754 @@
                 }
                 editor = find_my_editor();
-                asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
-                paranoid_free(editor);
+                mr_asprintf(&tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_free(editor);
 
                 paranoid_system(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 if (!g_text_mode) {
@@ -1767 +1768 @@
                                  _
                                  ("Please confirm/enter the boot device. If in doubt, try /dev/hda"), bd);
-            asprintf(&command, "stabraw-me %s", bd);
+            mr_asprintf(&command, "stabraw-me %s", bd);
             res = run_program_and_log_output(command, 3);
-            paranoid_free(command);
+            mr_free(command);
 
             if (res) {
@@ -1783 +1784 @@
                             _
                             ("Restoring MBR...                                               "));
-        asprintf(&command, "raw-MR %s /tmp/mountlist.txt", bd);
+        mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", bd);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
         res = run_program_and_log_output(command, 3);
-        paranoid_free(command);
+        mr_free(command);
     }
     if (res) {
@@ -1839 +1840 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&g_biggielist_txt, "%s/%s",bkpinfo->tmpdir , BIGGIELIST_TXT_STUB);
-    asprintf(&g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
-    asprintf(&g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", bkpinfo->tmpdir);
-    asprintf(&g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
+    mr_asprintf(&g_biggielist_txt, "%s/%s",bkpinfo->tmpdir , BIGGIELIST_TXT_STUB);
+    mr_asprintf(&g_filelist_full, "%s/%s", bkpinfo->tmpdir, FILELIST_FULL_STUB);
+    mr_asprintf(&g_filelist_imagedevs, "%s/tmp/filelist.imagedevs", bkpinfo->tmpdir);
+    mr_asprintf(&g_imagedevs_restthese, "%s/tmp/imagedevs.restore-these",
             bkpinfo->tmpdir);
-    paranoid_free(g_mondo_cfg_file);
-    paranoid_free(g_mountlist_fname);
+    mr_free(g_mondo_cfg_file);
+    mr_free(g_mountlist_fname);
     if (bkpinfo->disaster_recovery) {
-        asprintf(&g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
-        asprintf(&g_mountlist_fname, "/%s", MOUNTLIST_FNAME_STUB);
-    } else {
-        asprintf(&g_mondo_cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-        asprintf(&g_mountlist_fname, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+        mr_asprintf(&g_mondo_cfg_file, "/%s", MONDO_CFG_FILE_STUB);
+        mr_asprintf(&g_mountlist_fname, "/%s", MOUNTLIST_FNAME_STUB);
+    } else {
+        mr_asprintf(&g_mondo_cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+        mr_asprintf(&g_mountlist_fname, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     }
 }
@@ -1882 +1883 @@
         fatal_error("cannot open output_file");
     }
-    for (getline(&incoming, &n, fin); !feof(fin);
-         getline(&incoming, &n, fin)) {
+    for (mr_getline(&incoming, &n, fin); !feof(fin);
+         mr_getline(&incoming, &n, fin)) {
         if (strncmp(incoming, "etc/adjtime", 11)
             && strncmp(incoming, "etc/mtab", 8)
@@ -1893 +1894 @@
             fprintf(fout, "%s", incoming);  /* don't need \n here, for some reason.. */
     }
-    paranoid_free(incoming);
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
@@ -1936 +1937 @@
     for (i = 0; i < 20; i++) {
         g_current_progress = i;
-        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);
-        paranoid_free(tmp);
+        mr_free(tmp);
         sleep(1);
     }
@@ -2025 +2026 @@
             continue;
         }
-        asprintf(&tmp, _("Unmounting device %s  "),
+        mr_asprintf(&tmp, _("Unmounting device %s  "),
                 mountlist->el[lino].device);
 
@@ -2032 +2033 @@
         if (is_this_device_mounted(mountlist->el[lino].device)) {
             if (!strcmp(mountlist->el[lino].mountpoint, "swap")) {
-                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")) {
-                    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 {
-                    asprintf(&command, "umount " MNT_RESTORING "%s",
+                    mr_asprintf(&command, "umount " MNT_RESTORING "%s",
                             mountlist->el[lino].mountpoint);
                 }
@@ -2045 +2046 @@
             log_msg(10, "The 'umount' command is '%s'", command);
             res = run_program_and_log_output(command, 3);
-            paranoid_free(command);
+            mr_free(command);
         } else {
-            asprintf(&tmp1, "%s%s", tmp, _("...not mounted anyway :-) OK"));
-            paranoid_free(tmp);
+            mr_asprintf(&tmp1, "%s%s", tmp, _("...not mounted anyway :-) OK"));
+            mr_free(tmp);
             tmp = tmp1;
             res = 0;
@@ -2054 +2055 @@
         g_current_progress++;
         if (res) {
-            asprintf(&tmp1, "%s%s", tmp, _("...Failed"));
-            paranoid_free(tmp);
+            mr_asprintf(&tmp1, "%s%s", tmp, _("...Failed"));
+            mr_free(tmp);
             tmp = tmp1;
             retval++;
@@ -2062 +2063 @@
             log_msg(2, tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     close_progress_form();
@@ -2097 +2098 @@
 
     // tar -zxvf-
-    asprintf(&command,
+    mr_asprintf(&command,
             "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
             dev,
@@ -2106 +2107 @@
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
-    paranoid_free(command);
+    mr_free(command);
 
     if (res != 0 && does_file_exist(MONDO_CFG_FILE_STUB)) {
@@ -2142 +2143 @@
     log_msg(2, "gcffa --- starting");
     log_to_screen(_("I'm thinking..."));
-    asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
+    mr_asprintf(&mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     chdir(bkpinfo->tmpdir);
     // MONDO_CFG_FILE_STUB is missing the '/' at the start, FYI, by intent
@@ -2150 +2151 @@
     unlink(BIGGIELIST_TXT_STUB);
     unlink("tmp/i-want-my-lvm");
-    asprintf(&command, "mkdir -p %s", mountpt);
+    mr_asprintf(&command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    asprintf(&mountlist_file, "%s/%s", bkpinfo->tmpdir,
+    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);
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
 
     /* Floppy? */
-    asprintf(&tmp, "mkdir -p %s", mountpt);
+    mr_asprintf(&tmp, "mkdir -p %s", mountpt);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s/tmp", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-
-    asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
-    asprintf(&tmp,
+    mr_free(tmp);
+
+    mr_asprintf(&command, "mount /dev/fd0u1722 %s", mountpt);
+    mr_asprintf(&tmp,
             "(sleep 15; kill `ps | grep \"%s\" | cut -d' ' -f1` 2> /dev/null) &",
             command);
     log_msg(1, "tmp = '%s'", tmp);
     system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     res = run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
 
     if (res) {
-        asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
+        mr_asprintf(&command, "mount /dev/fd0H1440 %s", mountpt);
         res = run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
+        mr_free(command);
     }
     if (res) {
@@ -2192 +2193 @@
 // NB: If busybox does not support 'mount -o loop' then Plan A WILL NOT WORK.
         log_msg(2, "Processing floppy (plan A?)");
-        asprintf(&ramdisk_fname, "%s/mindi.rdz", mountpt);
+        mr_asprintf(&ramdisk_fname, "%s/mindi.rdz", mountpt);
         if (!does_file_exist(ramdisk_fname)) {
-            paranoid_free(ramdisk_fname);
-            asprintf(&ramdisk_fname, "%s/initrd.img", mountpt);
+            mr_free(ramdisk_fname);
+            mr_asprintf(&ramdisk_fname, "%s/initrd.img", mountpt);
         }
         if (!does_file_exist(ramdisk_fname)) {
@@ -2206 +2207 @@
                     "Warning - failed to extract config file from ramdisk. I think this boot disk is mangled.");
         }
-        asprintf(&command, "umount %s", mountpt);
+        mr_asprintf(&command, "umount %s", mountpt);
         run_program_and_log_output(command, 5);
-        paranoid_free(command);
+        mr_free(command);
 
         unlink(ramdisk_fname);
-        paranoid_free(ramdisk_fname);
+        mr_free(ramdisk_fname);
     }
     if (!does_file_exist(cfg_file)) {
@@ -2237 +2238 @@
 
             if (bkpinfo->media_device == NULL) {
-                asprintf(&bkpinfo->media_device, "/dev/st0");
+                mr_asprintf(&bkpinfo->media_device, "/dev/st0");
                 log_msg(2, "media_device is blank; assuming %s",
                         bkpinfo->media_device);
             }
-            asprintf(&sav, bkpinfo->media_device);
+            mr_asprintf(&sav, bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
-                paranoid_alloc(bkpinfo->media_device, "/dev/st0");
+                mr_allocstr(bkpinfo->media_device, "/dev/st0");
                 if (extract_cfg_file_and_mountlist_from_tape_dev
                     (bkpinfo->media_device)) {
-                    paranoid_alloc(bkpinfo->media_device, "/dev/osst0");
+                    mr_allocstr(bkpinfo->media_device, "/dev/osst0");
                     if (extract_cfg_file_and_mountlist_from_tape_dev
                         (bkpinfo->media_device)) {
-                        paranoid_alloc(bkpinfo->media_device, "/dev/ht0");
+                        mr_allocstr(bkpinfo->media_device, "/dev/ht0");
                         if (extract_cfg_file_and_mountlist_from_tape_dev
                             (bkpinfo->media_device)) {
                             log_msg(3,
                                     "I tried lots of devices but none worked.");
-                            paranoid_alloc(bkpinfo->media_device, sav);
+                            mr_allocstr(bkpinfo->media_device, sav);
                         }
                     }
                 }
             }
-            paranoid_free(sav);
+            mr_free(sav);
 
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
@@ -2271 +2272 @@
                     "gcffa --- looking at mounted CD for mindi-boot.2880.img");
             /* BERLIOS : Useless ?
-            asprintf(&command,
+            mr_asprintf(&command,
                     "mount " MNT_CDROM
                     "/images/mindi-boot.2880.img -o loop %s", mountpt);
                     */
-            asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
+            mr_asprintf(&mounted_cfgf_path, "%s/%s", mountpt, cfg_file);
             if (!does_file_exist(mounted_cfgf_path)) {
                 log_msg(2,
                         "gcffa --- Plan C, a.k.a. untarring some file from all.tar.gz");
-                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, "tmp/i-want-my-lvm");    // 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, "tmp/i-want-my-lvm"); // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
-                paranoid_free(command);
+                mr_free(command);
 
                 if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
@@ -2288 +2289 @@
                 }
             }
-            paranoid_free(mounted_cfgf_path);
-        }
-    }
-    paranoid_free(mountpt);
+            mr_free(mounted_cfgf_path);
+        }
+    }
+    mr_free(mountpt);
 
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
         log_msg(1, "gcffa --- great! We've got the config file");
         tmp1 = call_program_and_get_last_line_of_output("pwd");
-        asprintf(&tmp, "%s/%s", tmp1,MONDO_CFG_FILE_STUB);
-        asprintf(&command, "cp -f %s %s", tmp, cfg_file);
+        mr_asprintf(&tmp, "%s/%s", tmp1,MONDO_CFG_FILE_STUB);
+        mr_asprintf(&command, "cp -f %s %s", tmp, cfg_file);
         iamhere(command);
 
@@ -2308 +2309 @@
             log_msg(1, "... and I moved it successfully to %s", cfg_file);
         }
-        paranoid_free(command);
-
-        asprintf(&command, "cp -f %s/%s %s",tmp1,
+        mr_free(command);
+
+        mr_asprintf(&command, "cp -f %s/%s %s",tmp1,
                 MOUNTLIST_FNAME_STUB, mountlist_file);
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         iamhere(command);
@@ -2320 +2321 @@
         } else {
             log_msg(1, "Got mountlist too");
-            paranoid_free(command);
-            asprintf(&command, "cp -f %s %s", mountlist_file,
+            mr_free(command);
+            mr_asprintf(&command, "cp -f %s %s", mountlist_file,
                     g_mountlist_fname);
             if (run_program_and_log_output(command, 1)) {
@@ -2327 +2328 @@
             } else {
                 log_msg(1, "Copied mountlist to /tmp as well OK");
-                paranoid_free(command);
-                asprintf(&command, "cp -f tmp/i-want-my-lvm /tmp/");
+                mr_free(command);
+                mr_asprintf(&command, "cp -f tmp/i-want-my-lvm /tmp/");
                 run_program_and_log_output(command, 1);
             }
         }
-        paranoid_free(command);
-        paranoid_free(tmp);
+        mr_free(command);
+        mr_free(tmp);
     }
     run_program_and_log_output("umount " MNT_CDROM, FALSE);
@@ -2351 +2352 @@
 /* start SAH */
     else {
-        asprintf(&command, "cp -f %s %s/%s", 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);
-        paranoid_free(command);
+        mr_free(command);
     }
 /* end SAH */
 
-    asprintf(&command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
-    paranoid_free(cfg_file);
+    mr_asprintf(&command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    mr_free(cfg_file);
 
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
-    paranoid_free(mountlist_file);
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+    mr_free(mountlist_file);
 
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "cp -f etc/raidtab /etc/");
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f etc/raidtab /etc/");
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
-
-    asprintf(&command, "cp -f tmp/i-want-my-lvm /tmp/");
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f tmp/i-want-my-lvm /tmp/");
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
 
     g_backup_media_type = bkpinfo->backup_media_type;
@@ -2412 +2413 @@
                 log_msg(1, "Sync'ing %s (i=%d)",
                         raidlist->el[i].raid_device, i);
-                asprintf(&screen_message, "Sync'ing %s",
+                mr_asprintf(&screen_message, "Sync'ing %s",
                         raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
-                paranoid_free(screen_message);
+                mr_free(screen_message);
 
                 if (raidlist->el[i].progress == -1) { // delayed while another partition inits
@@ -2434 +2435 @@
         }
     }
-    paranoid_free(raidlist);
-}
+    mr_free(raidlist);
+}