Changeset 900 in MondoRescue for trunk/mondo/src/common/libmondo-archive.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/common/libmondo-archive.c (modified) (138 diffs)

trunk/mondo/src/common/libmondo-archive.c

@@ -9 +9 @@
  * This is the main file (at least the longest one) in libmondo.
  */
+#include <sys/sem.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <stdarg.h>
+#include <unistd.h>
 
 #include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "mr_conf.h"
+#include "mr_mem.h"
+#include "mr_err.h"
+
 #include "libmondo-string-EXT.h"
 #include "libmondo-stream-EXT.h"
@@ -24 +32 @@
 #include "libmondo-verify-EXT.h"
 #include "libmondo-archive.h"
-#include <sys/sem.h>
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <stdarg.h>
-#include <unistd.h>
 #define DVDRWFORMAT 1
 
@@ -201 +204 @@
 
     if (!does_file_exist(filelist)) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "(archive_this_fileset) - filelist %s does not exist",
                  filelist);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
 
-    asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp);
-
-    asprintf(&command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
+    mr_free(tmp);
+
+    mr_asprintf(&command, "star H=star list=%s -c " STAR_ACL_SZ " file=%s",
              filelist, fname);
     if (bkpinfo->use_lzo) {
@@ -221 +224 @@
     }
     if (bkpinfo->compression_level > 0) {
-        asprintf(&tmp, "%s -bz", command);
-        paranoid_free(command);
+        mr_asprintf(&tmp, "%s -bz", command);
+        mr_free(command);
         command = tmp;
     }
-    asprintf(&tmp, "%s 2>> %s", command, MONDO_LOGFILE);
-    paranoid_free(command);
+    mr_asprintf(&tmp, "%s 2>> %s", command, MONDO_LOGFILE);
+    mr_free(command);
     command = tmp;
     log_msg(4, "command = '%s'", command);
@@ -241 +244 @@
             res = 0;
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         if (res) {
             log_OS_error(command);
@@ -256 +259 @@
         }
     }
-    paranoid_free(command);
+    mr_free(command);
 
     retval += res;
@@ -314 +317 @@
 
     if (!does_file_exist(filelist)) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "(archive_this_fileset) - filelist %s does not exist",
                  filelist);
         log_to_screen(tmp);
-        paranoid_free(tmp)
+        mr_free(tmp);
             return (1);
     }
-    asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp)
+    mr_free(tmp);
 
 
     if (bkpinfo->compression_level > 0) {
-        asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
+        mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
         //       -b %ld, TAPE_BLOCK_SIZE
-        asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
+        mr_asprintf(&zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
                  bkpinfo->compression_level);
         if (does_file_exist(tmp)) {
-            asprintf(&tmp1, "%s -E %s", zipparams, tmp);
-            paranoid_free(zipparams)
+            mr_asprintf(&tmp1, "%s -E %s", zipparams, tmp);
+            mr_free(zipparams);
             zipparams = tmp1;
         } else {
-            asprintf(&zipparams, " ");
+            mr_asprintf(&zipparams, " ");
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
-        paranoid_free(tmp)
+        mr_free(tmp);
     } else {
-        asprintf(&zipparams, " ");
+        mr_asprintf(&zipparams, " ");
     }
 
@@ -356 +359 @@
         fatal_error("scratchdir not found");
     }
-    asprintf(&command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
+    mr_asprintf(&command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
              fname, bkpinfo->zip_suffix);
     paranoid_system(command);
-    paranoid_free(command);
-
-    asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
+    mr_free(command);
+
+    mr_asprintf(&command, "afio -o -b %ld -M 16m %s %s < %s 2>> %s",
              TAPE_BLOCK_SIZE, zipparams, fname, filelist, MONDO_LOGFILE);
-    paranoid_free(zipparams);
-
-    asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
+    mr_free(zipparams);
+
+    mr_asprintf(&tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     for (res = 99, tries = 0; tries < 3 && res != 0; tries++) {
@@ -382 +385 @@
         }
     }
-    paranoid_free(command);
+    mr_free(command);
 
     retval += res;
@@ -396 +399 @@
                  ("df -m -P | grep dev/shm | grep -v none | tr -s ' ' '\t' | cut -f4");
         i = atoi(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (i > 0) {
@@ -440 +443 @@
                 ("Cannot find dvd+rw-format. Please install it or fix your PATH.");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 #endif
         tmp = find_home_of_exe("growisofs");
@@ -447 +450 @@
                 ("Cannot find growisofs. Please install it or fix your PATH.");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
@@ -458 +461 @@
 
 /*
-      asprintf(&tmp, "wc -l %s/archives/filelist.full > %s/archives/filelist.count",bkpinfo->scratchdir, bkpinfo->scratchdir);
+      mr_asprintf(&tmp, "wc -l %s/archives/filelist.full > %s/archives/filelist.count",bkpinfo->scratchdir, bkpinfo->scratchdir);
       if (run_program_and_log_output(tmp, 2))
         { fatal_error("Failed to count filelist.full"); }
 */
-    asprintf(&tmp, "gzip -9 %s/archives/filelist.full",
+    mr_asprintf(&tmp, "gzip -9 %s/archives/filelist.full",
              bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, 2)) {
         fatal_error("Failed to gzip filelist.full");
     }
-    paranoid_free(tmp);
-    asprintf(&tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
+    mr_free(tmp);
+    mr_asprintf(&tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
              bkpinfo->tmpdir);
     if (run_program_and_log_output(tmp, 2)) {
         fatal_error("Failed to copy to tmpdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     copy_mondo_and_mindi_stuff_to_scratchdir(bkpinfo);  // payload, too, if it exists
 #if __FreeBSD__ == 5
-    paranoid_alloc(bkpinfo->kernel_path, "/boot/kernel/kernel");
+    mr_allocstr(bkpinfo->kernel_path, "/boot/kernel/kernel");
 #elif __FreeBSD__ == 4
-    paranoid_alloc(bkpinfo->kernel_path, "/kernel");
+    mr_allocstr(bkpinfo->kernel_path, "/kernel");
 #elif linux
     if (figure_out_kernel_path_interactively_if_necessary
@@ -493 +496 @@
     }
     retval += do_that_initial_phase(bkpinfo);   // prepare
-    asprintf(&tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "rm -f %s/images/*.iso", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, 1);
-    paranoid_free(tmp);
+    mr_free(tmp);
     retval += make_those_slices_phase(bkpinfo); // backup BIG files
     retval += do_that_final_phase(bkpinfo); // clean up
@@ -564 +567 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&tmp,
+    mr_asprintf(&tmp,
              "echo '%s' | tr -s ' ' '\n' | grep -x '/dev/.*' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'",
              bkpinfo->exclude_paths);
     devs_to_exclude = call_program_and_get_last_line_of_output(tmp);
-    paranoid_free(tmp);
-    asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "devs_to_exclude = '%s'", devs_to_exclude);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     mvaddstr_and_log_it(g_currentY, 0,
                         "Calling MINDI to create boot+data disks");
-    asprintf(&tmp, "%s/filelist.full", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/filelist.full", bkpinfo->tmpdir);
     if (!does_file_exist(tmp)) {
-        paranoid_free(tmp);
-        asprintf(&tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
+        mr_free(tmp);
+        mr_asprintf(&tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
             fatal_error
@@ -584 +587 @@
     }
     lines_in_filelist = count_lines_in_file(tmp);
-    paranoid_free(tmp);
-    asprintf(&tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
     last_filelist_number = last_line_of_file(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
-        asprintf(&tape_device, bkpinfo->media_device);
+        mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
+        mr_asprintf(&tape_device, bkpinfo->media_device);
     } else {
-        asprintf(&tape_size_sz, " ");
-        asprintf(&tape_device, " ");
+        mr_asprintf(&tape_size_sz, " ");
+        mr_asprintf(&tape_device, " ");
     }
     if (bkpinfo->use_lzo) {
-        asprintf(&use_lzo_sz, "yes");
+        mr_asprintf(&use_lzo_sz, "yes");
     } else {
-        asprintf(&use_lzo_sz, "no");
+        mr_asprintf(&use_lzo_sz, "no");
     }
     if (bkpinfo->use_star) {
-        asprintf(&use_star_sz, "yes");
+        mr_asprintf(&use_star_sz, "yes");
     } else {
-        asprintf(&use_star_sz, "no");
+        mr_asprintf(&use_star_sz, "no");
     }
 
     if (bkpinfo->compression_level > 0) {
-        asprintf(&use_comp_sz, "yes");
+        mr_asprintf(&use_comp_sz, "yes");
     } else {
-        asprintf(&use_comp_sz, "no");
-    }
-
-    asprintf(&broken_bios_sz, "yes");   /* assume so */
+        mr_asprintf(&use_comp_sz, "no");
+    }
+
+    mr_asprintf(&broken_bios_sz, "yes");    /* assume so */
     if (g_cd_recovery) {
-        asprintf(&cd_recovery_sz, "yes");
+        mr_asprintf(&cd_recovery_sz, "yes");
     } else {
-        asprintf(&cd_recovery_sz, "no");
+        mr_asprintf(&cd_recovery_sz, "no");
     }
     /* Field shared between LILO/ELILO */
     if (bkpinfo->make_cd_use_lilo) {
-        asprintf(&use_lilo_sz, "yes");
+        mr_asprintf(&use_lilo_sz, "yes");
     } else {
-        asprintf(&use_lilo_sz, "no");
+        mr_asprintf(&use_lilo_sz, "no");
     }
 
@@ -644 +647 @@
         }
         if ((bootdev) && (strstr(bootdev, "/dev/cciss/"))) {
-            paranoid_free(bootdev);
+            mr_free(bootdev);
             bootdev = call_program_and_get_last_line_of_output
                      ("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
@@ -655 +658 @@
 
         if (bkpinfo->boot_loader != '\0') {
-            asprintf(&tmp, "User specified boot loader. It is '%c'.",
+            mr_asprintf(&tmp, "User specified boot loader. It is '%c'.",
                      bkpinfo->boot_loader);
             log_msg(2, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else {
             bkpinfo->boot_loader = ch;
         }
         if (bkpinfo->boot_device != NULL) {
-            asprintf(&tmp, "User specified boot device. It is '%s'.",
+            mr_asprintf(&tmp, "User specified boot device. It is '%s'.",
                      bkpinfo->boot_device);
             log_msg(2, tmp);
-            paranoid_free(tmp);
-            paranoid_free(bootdev);
+            mr_free(tmp);
+            mr_free(bootdev);
         } else {
             bkpinfo->boot_device = bootdev;
@@ -687 +690 @@
     }
     if (bkpinfo->boot_loader == 'L') {
-        asprintf(&bootldr_str, "LILO");
+        mr_asprintf(&bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
             fatal_error
@@ -693 +696 @@
         }
     } else if (bkpinfo->boot_loader == 'G') {
-        asprintf(&bootldr_str, "GRUB");
+        mr_asprintf(&bootldr_str, "GRUB");
         if (!does_file_exist("/etc/grub.conf")
             && does_file_exist("/boot/grub/grub.conf")) {
@@ -710 +713 @@
         }
     } else if (bkpinfo->boot_loader == 'E') {
-        asprintf(&bootldr_str, "ELILO");
+        mr_asprintf(&bootldr_str, "ELILO");
         /* BERLIOS: fix it for SuSE, Debian, Mandrake, ... */
         if (!does_file_exist("/etc/elilo.conf")
@@ -723 +726 @@
         }
     } else if (bkpinfo->boot_loader == 'R') {
-        asprintf(&bootldr_str, "RAW");
+        mr_asprintf(&bootldr_str, "RAW");
     }
 #ifdef __FreeBSD__
     else if (bkpinfo->boot_loader == 'D') {
-        asprintf(&bootldr_str, "DD");
+        mr_asprintf(&bootldr_str, "DD");
     }
 
     else if (bkpinfo->boot_loader == 'B') {
-        asprintf(&bootldr_str, "BOOT0");
+        mr_asprintf(&bootldr_str, "BOOT0");
     }
 #endif
     else {
-        asprintf(&bootldr_str, "unknown");
-    }
-    asprintf(&tmp, "Your boot loader is %s and it boots from %s",
+        mr_asprintf(&bootldr_str, "unknown");
+    }
+    mr_asprintf(&tmp, "Your boot loader is %s and it boots from %s",
              bootldr_str, bkpinfo->boot_device);
     log_to_screen(tmp);
-    paranoid_free(tmp);
-    asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "%s/BOOTLOADER.DEVICE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bkpinfo->boot_device)) {
         log_msg(1, "%ld: Unable to write one-liner boot device", __LINE__);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     /* BERLIOS: Use bkptype_to_string without LANG */
     switch (bkpinfo->backup_media_type) {
     case cdr:
-        asprintf(&value, "cdr");
+        mr_asprintf(&value, "cdr");
         break;
     case cdrw:
-        asprintf(&value, "cdrw");
+        mr_asprintf(&value, "cdrw");
         break;
     case cdstream:
-        asprintf(&value, "cdstream");
+        mr_asprintf(&value, "cdstream");
         break;
     case tape:
-        asprintf(&value, "tape");
+        mr_asprintf(&value, "tape");
         break;
     case udev:
-        asprintf(&value, "udev");
+        mr_asprintf(&value, "udev");
         break;
     case iso:
-        asprintf(&value, "iso");
+        mr_asprintf(&value, "iso");
         break;
     case nfs:
-        asprintf(&value, "nfs");
+        mr_asprintf(&value, "nfs");
         break;
     case dvd:
-        asprintf(&value, "dvd");
+        mr_asprintf(&value, "dvd");
         break;
     default:
         fatal_error("Unknown backup_media_type");
     }
-    asprintf(&tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/BACKUP-MEDIA-TYPE", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, value)) {
         res++;
@@ -781 +784 @@
                 __LINE__);
     }
-    paranoid_free(value);
-    paranoid_free(tmp);
+    mr_free(value);
+    mr_free(tmp);
     log_to_screen(bkpinfo->tmpdir);
-    asprintf(&tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/BOOTLOADER.NAME", bkpinfo->tmpdir);
     if (write_one_liner_data_file(tmp, bootldr_str)) {
         res++;
@@ -790 +793 @@
                 __LINE__);
     }
-    paranoid_free(bootldr_str);
-    paranoid_free(tmp);
-    asprintf(&tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
+    mr_free(bootldr_str);
+    mr_free(tmp);
+    mr_asprintf(&tmp, "%s/DIFFERENTIAL", bkpinfo->tmpdir);
     if (bkpinfo->differential) {
         res += write_one_liner_data_file(tmp, "1");
@@ -798 +801 @@
         res += write_one_liner_data_file(tmp, "0");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     estimated_total_noof_slices =
         size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-    asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
         res++;
         log_OS_error("Unable to make images directory");
     }
-    paranoid_free(command);
-
-    asprintf(&command, "mkdir -p %s%s", bkpinfo->scratchdir, MNT_FLOPPY);
+    mr_free(command);
+
+    mr_asprintf(&command, "mkdir -p %s%s", bkpinfo->scratchdir, MNT_FLOPPY);
     if (system(command)) {
         res++;
         log_OS_error("Unable to make mnt floppy directory");
     }
-    paranoid_free(command);
-
-    asprintf(&tmp, "BTW, I'm telling Mindi your kernel is '%s'",
+    mr_free(command);
+
+    mr_asprintf(&tmp, "BTW, I'm telling Mindi your kernel is '%s'",
              bkpinfo->kernel_path);
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
@@ -825 +828 @@
     // Watch it! This next line adds a parameter...
     if (bkpinfo->nonbootable_backup) {
-        asprintf(&tmp, " NONBOOTABLE");
+        mr_asprintf(&tmp, " NONBOOTABLE");
     } else {
-        asprintf(&tmp, " ");
-    }
-
-    asprintf(&command,
+        mr_asprintf(&tmp, " ");
+    }
+
+    mr_asprintf(&command,
 /*     "mindi --custom 2=%s 3=%s/images 4=\"%s\" 5=\"%s\" \
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
@@ -855 +858 @@
              bkpinfo->differential, // parameter #19 (INT)
              tmp);
-    paranoid_free(tmp);
-    paranoid_free(tape_size_sz);
-    paranoid_free(use_lzo_sz);
-    paranoid_free(tape_device);
-    paranoid_free(use_star_sz);
-    paranoid_free(use_comp_sz);
-    paranoid_free(broken_bios_sz);
-    paranoid_free(cd_recovery_sz);
-    paranoid_free(last_filelist_number);
-    paranoid_free(devs_to_exclude);
-    paranoid_free(use_lilo_sz);
+    mr_free(tmp);
+    mr_free(tape_size_sz);
+    mr_free(use_lzo_sz);
+    mr_free(tape_device);
+    mr_free(use_star_sz);
+    mr_free(use_comp_sz);
+    mr_free(broken_bios_sz);
+    mr_free(cd_recovery_sz);
+    mr_free(last_filelist_number);
+    mr_free(devs_to_exclude);
+    mr_free(use_lilo_sz);
 
     log_msg(2, command);
@@ -872 +875 @@
     res = run_program_and_log_to_screen(command,
                                         "Generating boot+data disks");
-    paranoid_free(command);
+    mr_free(command);
 
     if (bkpinfo->nonbootable_backup) {
@@ -879 +882 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        asprintf(&command, "mkdir -p /var/cache/mindi/");
+        mr_asprintf(&command, "mkdir -p /var/cache/mindi/");
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
-
-        asprintf(&command,
+        mr_free(command);
+
+        mr_asprintf(&command,
                  "cp -f %s/images/mindi.iso /var/cache/mindi/mondorescue.iso",
                  bkpinfo->scratchdir);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
+        mr_free(command);
 
         if (bkpinfo->nonbootable_backup) {
-            asprintf(&command, "cp -f %s/all.tar.gz %s/images",
+            mr_asprintf(&command, "cp -f %s/all.tar.gz %s/images",
                      bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
                 fatal_error("Unable to create temporary duff tarball");
-                paranoid_free(command);
-            }
-        }
-        asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
+                mr_free(command);
+            }
+        }
+        mr_asprintf(&command, "cp -f %s/mindi-*oot*.img %s/images",
                  bkpinfo->tmpdir, bkpinfo->scratchdir);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
-
-        asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
+        mr_free(command);
+
+        mr_asprintf(&tmp, "cp -f %s/images/all.tar.gz %s",
                  bkpinfo->scratchdir, bkpinfo->tmpdir);
         if (system(tmp)) {
             fatal_error("Cannot find all.tar.gz in tmpdir");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (res) {
@@ -919 +922 @@
     } else {
         log_to_screen("Mindi failed to create your boot+data disks.");
-        asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
+        mr_asprintf(&command, "grep 'Fatal error' /var/log/mindi.log");
         tmp = call_program_and_get_last_line_of_output(command);
-        paranoid_free(command);
+        mr_free(command);
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     return (res);
@@ -990 +993 @@
     bkpinfo = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
-    asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
+    mr_asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
              bkpinfo->tmpdir, 0L);
     archiving_set_no = 0;
     while (does_file_exist(archiving_filelist_fname)) {
-        paranoid_free(archiving_filelist_fname);
+        mr_free(archiving_filelist_fname);
         if (g_exiting) {
             fatal_error("Execution run aborted (pthread)");
@@ -1015 +1018 @@
 
         /* backup this set of files */
-        asprintf(&archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
+        mr_asprintf(&archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
-        asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
+        mr_asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
@@ -1024 +1027 @@
                     FORTY_SPACES, getpid(), this_thread_no,
                     archiving_set_no);
-            paranoid_free(archiving_filelist_fname);
-            paranoid_free(archiving_afioball_fname);
+            mr_free(archiving_filelist_fname);
+            mr_free(archiving_afioball_fname);
             break;
         }
 
-        asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
+        mr_asprintf(&tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
                  archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
@@ -1039 +1042 @@
             log_msg(4, "[%d] - continuing", getpid());
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
                 this_thread_no, archiving_set_no);
-        asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+        mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, archiving_set_no);
-        asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+        mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, archiving_set_no);
         get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
-        paranoid_free(curr_xattr_list_fname);
+        mr_free(curr_xattr_list_fname);
         get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
-        paranoid_free(curr_acl_list_fname);
+        mr_free(curr_acl_list_fname);
 
         log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
@@ -1057 +1060 @@
                                    archiving_afioball_fname,
                                    archiving_set_no);
-        paranoid_free(archiving_afioball_fname);
-        paranoid_free(archiving_filelist_fname);
+        mr_free(archiving_afioball_fname);
+        mr_free(archiving_filelist_fname);
         retval += res;
 
         if (res) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                      "Errors occurred while archiving set %ld. Please review logs.",
                      archiving_set_no);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         if (!semaphore_p()) {
@@ -1084 +1087 @@
                 this_thread_no, archiving_set_no);
         archiving_set_no++;
-        asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
+        mr_asprintf(&archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, archiving_set_no);
     }
@@ -1096 +1099 @@
     log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
             this_thread_no);
-    paranoid_free(archiving_filelist_fname);
+    mr_free(archiving_filelist_fname);
     pthread_exit(NULL);
 }
@@ -1178 +1181 @@
 
     assert(bkpinfo != NULL);
-    asprintf(&data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
+    mr_asprintf(&data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
     g_serial_string = call_program_and_get_last_line_of_output("dd \
 if=/dev/urandom bs=16 count=1 2> /dev/null | \
 hexdump | tr -s ' ' '0' | head -n1");
-    asprintf(&tmp, "%s...word.", g_serial_string);
-    paranoid_free(g_serial_string);
+    mr_asprintf(&tmp, "%s...word.", g_serial_string);
+    mr_free(g_serial_string);
     g_serial_string = tmp;
     log_msg(2, "g_serial_string = '%s'", g_serial_string);
 
-    asprintf(&tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
+    mr_asprintf(&tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
     if (write_one_liner_data_file(tmpfile, g_serial_string)) {
         log_msg(1, "%ld: Failed to write serial string", __LINE__);
     }
-    paranoid_free(g_serial_string);
-    paranoid_free(tmpfile);
+    mr_free(g_serial_string);
+    mr_free(tmpfile);
 
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to archive your data");
@@ -1210 +1213 @@
         log_msg(1, "Backing up to CD's");
     }
-    paranoid_free(data_disks_file);
-
-    asprintf(&command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
+    mr_free(data_disks_file);
+
+    mr_asprintf(&command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
              bkpinfo->nfs_remote_dir, bkpinfo->prefix);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
     wipe_archives(bkpinfo->scratchdir);
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1274 +1277 @@
 /* if not Debian then go ahead & use fdformat */
     tempfile = call_program_and_get_last_line_of_output("mktemp -q /tmp/mondo.XXXXXXXX");
-    asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile,
+    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile,
              tempfile, tempfile);
     log_msg(3, command);
@@ -1287 +1290 @@
         maxtracks = 80;
     }
-    paranoid_free(command);
+    mr_free(command);
 
     for (sleep(1); does_file_exist(tempfile); sleep(1)) {
@@ -1309 +1312 @@
     }
     unlink(tempfile);
-    paranoid_free(tempfile);
+    mr_free(tempfile);
     return (res);
 }
@@ -1338 +1341 @@
     assert_string_is_neither_NULL_nor_zerolength(device);
     if (!system("which superformat > /dev/null 2> /dev/null")) {
-        asprintf(&command, "superformat %s", device);
+        mr_asprintf(&command, "superformat %s", device);
     } else {
 #ifdef __FreeBSD__
-        asprintf(&command, "fdformat -y %s", device);
+        mr_asprintf(&command, "fdformat -y %s", device);
 #else
-        asprintf(&command, "fdformat %s", device);
+        mr_asprintf(&command, "fdformat %s", device);
 #endif
     }
-    asprintf(&title, "Formatting disk %s", device);
+    mr_asprintf(&title, "Formatting disk %s", device);
     while ((res = format_disk_SUB(command, title))) {
         if (!ask_me_yes_or_no("Failed to format disk. Retry?")) {
@@ -1352 +1355 @@
         }
     }
-    paranoid_free(title);
-    paranoid_free(command);
+    mr_free(title);
+    mr_free(command);
     return (res);
 }
@@ -1502 +1505 @@
             /* maybe  */
             tmp = percent_media_full_comment(bkpinfo);
-            asprintf(&media_usage_comment, "%s", tmp);
-            paranoid_free(tmp);
+            mr_asprintf(&media_usage_comment, "%s", tmp);
+            mr_free(tmp);
             if (!misc_counter_that_is_not_important) {
                 update_progress_form(media_usage_comment);
             }
-            paranoid_free(media_usage_comment);
+            mr_free(media_usage_comment);
             sleep(1);
         } else {
             // store set N
-            asprintf(&storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
+            mr_asprintf(&storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
                      bkpinfo->tmpdir, storing_set_no);
-            asprintf(&storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
+            mr_asprintf(&storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
                      bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
-            asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                      bkpinfo->tmpdir, storing_set_no);
-            asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+            mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                      bkpinfo->tmpdir, storing_set_no);
 
@@ -1529 +1532 @@
             }
             tmp = percent_media_full_comment(bkpinfo);
-            asprintf(&media_usage_comment, "%s", tmp);
-            paranoid_free(tmp);
+            mr_asprintf(&media_usage_comment, "%s", tmp);
+            mr_free(tmp);
             /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1552 +1555 @@
                                      storing_afioball_fname, NULL);
             }
-            paranoid_free(storing_filelist_fname);
-            paranoid_free(storing_afioball_fname);
-            paranoid_free(curr_xattr_list_fname);
-            paranoid_free(curr_acl_list_fname);
+            mr_free(storing_filelist_fname);
+            mr_free(storing_afioball_fname);
+            mr_free(curr_xattr_list_fname);
+            mr_free(curr_acl_list_fname);
             retval += res;
             g_current_progress++;
             update_progress_form(media_usage_comment);
-            paranoid_free(media_usage_comment);
+            mr_free(media_usage_comment);
 
             if (res) {
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "Failed to add archive %ld's files to CD dir\n",
                          storing_set_no);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 fatal_error
                     ("Is your hard disk full? If not, please send the author the logfile.");
@@ -1584 +1587 @@
     log_msg(2, "Done.");
     if (retval) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "Your regular files have been archived (with errors).");
     } else {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "Your regular files have been archived successfully");
     }
     log_to_screen(tmp);
-    paranoid_free(tmp);
-    paranoid_free(transfer_block);
-    paranoid_free(result_str);
+    mr_free(tmp);
+    mr_free(transfer_block);
+    mr_free(result_str);
     return (retval);
 }
@@ -1647 +1650 @@
     assert_string_is_neither_NULL_nor_zerolength(destfile);
 
-    asprintf(&tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
-    asprintf(&tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
+    mr_asprintf(&tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
     if (does_file_exist(tmp)) {
-        asprintf(&tmp3, "cp -f %s %s", tmp, tmp2);
+        mr_asprintf(&tmp3, "cp -f %s %s", tmp, tmp2);
         paranoid_system(tmp3);
-        paranoid_free(tmp3);
+        mr_free(tmp3);
     }
     if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
-        asprintf(&tmp3, "cp -f %s %s", tmp2, tmp);
+        mr_asprintf(&tmp3, "cp -f %s %s", tmp2, tmp);
         paranoid_system(tmp3);
-        paranoid_free(tmp3);
-    }
-    paranoid_free(tmp2);
-    paranoid_free(tmp);
+        mr_free(tmp3);
+    }
+    mr_free(tmp2);
+    mr_free(tmp);
 
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
@@ -1670 +1673 @@
     /* BERLIOS: Do not ignore getcwd result */
     (void) getcwd(old_pwd, MAX_STR_LEN - 1);
-    asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
+    mr_asprintf(&tmp, "chmod 755 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
     chdir(bkpinfo->scratchdir);
 
     if (bkpinfo->call_before_iso != NULL) {
-        asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
+        mr_asprintf(&message_to_screen, "Running pre-ISO call for CD#%d",
                  g_current_media_number);
         res = eval_call_to_make_ISO(bkpinfo, bkpinfo->call_before_iso,
@@ -1686 +1689 @@
             log_to_screen("%s...OK", message_to_screen);
         }
-        paranoid_free(message_to_screen);
+        mr_free(message_to_screen);
         retval += res;
     }
@@ -1692 +1695 @@
     if (bkpinfo->call_make_iso != NULL) {
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
-        asprintf(&tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
-        asprintf(&message_to_screen, "Making an ISO (%s #%d)",
+        mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+        mr_asprintf(&message_to_screen, "Making an ISO (%s #%d)",
                  bkpinfo->backup_media_string,
                  g_current_media_number);
@@ -1720 +1723 @@
             retval += res;
 #ifdef DVDRWFORMAT
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                      "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
                      MONDO_LOGFILE);
@@ -1738 +1741 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                asprintf(&sz_blank_disk, "dvd+rw-format %s",
+                mr_asprintf(&sz_blank_disk, "dvd+rw-format %s",
                          bkpinfo->media_device);
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
@@ -1757 +1760 @@
                         ("Format succeeded. Sleeping for 5 seconds to take a breath...");
                 }
-                paranoid_free(sz_blank_disk);
+                mr_free(sz_blank_disk);
                 pause_for_N_seconds(5, "Letting DVD drive settle");
                 if (!bkpinfo->please_dont_eject) {
@@ -1783 +1786 @@
                 }
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
 #endif
             if (g_backup_media_type == dvd && !bkpinfo->please_dont_eject) {
@@ -1789 +1792 @@
             }
         }
-        paranoid_free(message_to_screen);
+        mr_free(message_to_screen);
     } else {
-        asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
+        mr_asprintf(&message_to_screen, "Running mkisofs to make %s #%d",
                  bkpinfo->backup_media_string,
                  g_current_media_number);
         log_msg(1, message_to_screen);
-        asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
+        mr_asprintf(&result_sz, "Call to mkisofs to make ISO (%s #%d) ",
                  bkpinfo->backup_media_string,
                  g_current_media_number);
@@ -1821 +1824 @@
 #ifdef __IA64__
                 log_msg(1, "IA64 --> elilo");
-                asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", bkpinfo->mrconf->mindi_ia64_boot_size);
+                mr_asprintf(&tmp2,"mkisofs -no-emul-boot -b images/mindi-bootroot.%s.img -c boot.cat -o _ISO_ -J -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL -V _CD#_ .", bkpinfo->mrconf->mindi_ia64_boot_size);
                 res = eval_call_to_make_ISO(bkpinfo,
                                             tmp2,
@@ -1831 +1834 @@
 // FIXME --- change mkisofs string to MONDO_MKISOFS_REGULAR_SYSLINUX/LILO depending on bkpinfo->make_cd_usE_lilo
 // and add ' .' at end
-                paranoid_free(tmp2);
+                mr_free(tmp2);
                 log_msg(1, "Non-ia64 --> lilo");
                 res = eval_call_to_make_ISO(bkpinfo,
@@ -1857 +1860 @@
         }
         retval += res;
-        paranoid_free(message_to_screen);
-        paranoid_free(result_sz);
+        mr_free(message_to_screen);
+        mr_free(result_sz);
     }
 
@@ -1867 +1870 @@
                     "Warning - %s mounted. I'm unmounting it before I burn to it.",
                     bkpinfo->media_device);
-            asprintf(&tmp, "umount %s", bkpinfo->media_device);
+            mr_asprintf(&tmp, "umount %s", bkpinfo->media_device);
             run_program_and_log_output(tmp, FALSE);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
     }
@@ -1875 +1878 @@
     if (bkpinfo->call_burn_iso != NULL) {
         log_msg(2, "bkpinfo->call_burn_iso = %s", bkpinfo->call_burn_iso);
-        asprintf(&message_to_screen, "Burning %s #%d",
+        mr_asprintf(&message_to_screen, "Burning %s #%d",
                  bkpinfo->backup_media_string,
                  g_current_media_number);
@@ -1887 +1890 @@
             log_to_screen("%s...OK", message_to_screen);
         }
-        paranoid_free(message_to_screen);
+        mr_free(message_to_screen);
         retval += res;
     }
 
     if (bkpinfo->call_after_iso != NULL) {
-        asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
+        mr_asprintf(&message_to_screen, "Running post-ISO call (%s #%d)",
                  bkpinfo->backup_media_string,
                  g_current_media_number);
@@ -1903 +1906 @@
             log_to_screen("%s...OK", message_to_screen);
         }
-        paranoid_free(message_to_screen);
+        mr_free(message_to_screen);
         retval += res;
     }
@@ -1911 +1914 @@
         log_msg(1, "WARNING - make_iso_fs returned an error");
     }
-    paranoid_free(old_pwd);
+    mr_free(old_pwd);
     return (retval);
 }
@@ -1921 +1924 @@
     char *command;
     bool ret = TRUE;
-    asprintf(&command,
+    mr_asprintf(&command,
              "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1",
              bigfile_fname);
@@ -1927 +1930 @@
     tmp = call_program_and_get_last_line_of_output(command);
     log_msg(1, "--> tmp = '%s'", tmp);
-    paranoid_free(command);
+    mr_free(command);
     if (strstr(tmp, "NTFS")) {
         iamhere("TRUE");
@@ -1934 +1937 @@
         ret = FALSE;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return(ret);
 }
@@ -1997 +2000 @@
         return (0);
     }
-    asprintf(&tmp, "I am now backing up all large files.");
+    mr_asprintf(&tmp, "I am now backing up all large files.");
     log_to_screen(tmp);
     noof_biggie_files = count_lines_in_file(biggielist_fname);
@@ -2003 +2006 @@
                        "Please wait. This may take some time.", "",
                        estimated_total_noof_slices);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!(fin = fopen(biggielist_fname, "r"))) {
@@ -2009 +2012 @@
         return (1);
     }
-    for (getline(&bigfile_fname, &n, fin); !feof(fin);
-         getline(&bigfile_fname, &n, fin), biggie_file_number++) {
+    for (mr_getline(&bigfile_fname, &n, fin); !feof(fin);
+         mr_getline(&bigfile_fname, &n, fin), biggie_file_number++) {
         use_ntfsprog = FALSE;
         if (bigfile_fname[strlen(bigfile_fname) - 1] < 32) {
@@ -2021 +2024 @@
             ftmp = fopen(bigfile_fname, "w");
             paranoid_fclose(ftmp);
-            asprintf(&tmp, "bigfile %s was deleted - creating a dummy",
+            mr_asprintf(&tmp, "bigfile %s was deleted - creating a dummy",
                      bigfile_fname);
             delete_when_done = TRUE;
@@ -2035 +2038 @@
                         "Calling ntfsclone in background because %s is an NTFS partition",
                         bigfile_fname);
-                asprintf(&sz_devfile, "%s/%d.%d.000",
+                mr_asprintf(&sz_devfile, "%s/%d.%d.000",
                         bkpinfo->tmpdir,
                          (int) (random() % 32768),
@@ -2056 +2059 @@
                             (long int) (pid));
 
-                    paranoid_free(sz_devfile);
+                    mr_free(sz_devfile);
                 }
             }
@@ -2081 +2084 @@
                 tmp = calc_checksum_of_file(bigfile_fname);
                 write_header_block_to_stream((off_t)0, tmp, BLK_STOP_A_BIGGIE);
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
             retval += res;
@@ -2091 +2094 @@
             }
             if (res) {
-                asprintf(&tmp, "Archiving %s ... Failed!", bigfile_fname);
+                mr_asprintf(&tmp, "Archiving %s ... Failed!", bigfile_fname);
             } else {
-                asprintf(&tmp, "Archiving %s ... OK!", bigfile_fname);
+                mr_asprintf(&tmp, "Archiving %s ... OK!", bigfile_fname);
             }
 
@@ -2108 +2111 @@
 #endif
     }
-    paranoid_free(tmp);
-    paranoid_free(bigfile_fname);
+    mr_free(tmp);
+    mr_free(bigfile_fname);
     paranoid_fclose(fin);
 
@@ -2141 +2144 @@
 
     /* BERLIOS: Useless ?
-       asprintf(&tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
+       mr_asprintf(&tmp, "%s/archives/filelist.full", bkpinfo->scratchdir);
      */
 
@@ -2152 +2155 @@
                        get_last_filelist_number(bkpinfo) + 1);
 
-    asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
+    mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir,
              0L);
 
@@ -2158 +2161 @@
     while (does_file_exist(curr_filelist_fname)) {
         /* backup this set of files */
-        asprintf(&curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
+        mr_asprintf(&curr_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, curr_set_no, bkpinfo->zip_suffix);
 
         log_msg(1, "EXAT'g set %ld", curr_set_no);
-        asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+        mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, curr_set_no);
-        asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+        mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, curr_set_no);
         get_fattr_list(curr_filelist_fname, curr_xattr_list_fname);
@@ -2174 +2177 @@
         retval += res;
         if (res) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                      "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?",
                      curr_set_no);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
 
         tmp = percent_media_full_comment(bkpinfo);
-        asprintf(&media_usage_comment, "%s", tmp);
-        paranoid_free(tmp);
+        mr_asprintf(&media_usage_comment, "%s", tmp);
+        mr_free(tmp);
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2206 +2209 @@
         g_current_progress++;
         update_progress_form(media_usage_comment);
-        paranoid_free(media_usage_comment);
+        mr_free(media_usage_comment);
 
         if (res) {
-            asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
+            mr_asprintf(&tmp, "Failed to add archive %ld's files to CD dir\n",
                      curr_set_no);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             fatal_error
                 ("Is your hard disk is full? If not, please send the author the logfile.");
         }
-        paranoid_free(curr_filelist_fname);
-        paranoid_free(curr_afioball_fname);
-        paranoid_free(curr_xattr_list_fname);
-        paranoid_free(curr_acl_list_fname);
-        asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ,
+        mr_free(curr_filelist_fname);
+        mr_free(curr_afioball_fname);
+        mr_free(curr_xattr_list_fname);
+        mr_free(curr_acl_list_fname);
+        mr_asprintf(&curr_filelist_fname, FILELIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, ++curr_set_no);
     }
-    paranoid_free(curr_filelist_fname);
+    mr_free(curr_filelist_fname);
     close_progress_form();
     if (retval) {
@@ -2310 +2313 @@
     mvaddstr_and_log_it(g_currentY, 0,
                         "Archiving large files to media           ");
-    asprintf(&biggielist, "%s/archives/biggielist.txt",
+    mr_asprintf(&biggielist, "%s/archives/biggielist.txt",
              bkpinfo->scratchdir);
-    asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-
-    asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
+    mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+
+    mr_asprintf(&command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
              biggielist);
     paranoid_system(command);
-    paranoid_free(command);
-
-    asprintf(&blah, "biggielist = %s", biggielist);
+    mr_free(command);
+
+    mr_asprintf(&blah, "biggielist = %s", biggielist);
     log_msg(2, blah);
-    paranoid_free(blah);
+    mr_free(blah);
 
     if (!does_file_exist(biggielist)) {
@@ -2330 +2333 @@
     get_fattr_list(biggielist, xattr_fname);
     get_acl_list(biggielist, acl_fname);
-    asprintf(&command, "cp %s %s/archives/", xattr_fname,
+    mr_asprintf(&command, "cp %s %s/archives/", xattr_fname,
              bkpinfo->scratchdir);
     paranoid_system(command);
-    paranoid_free(command);
-
-    asprintf(&command, "cp %s %s/archives/", acl_fname,
+    mr_free(command);
+
+    mr_asprintf(&command, "cp %s %s/archives/", acl_fname,
              bkpinfo->scratchdir);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         res += write_EXAT_files_to_tape(bkpinfo, xattr_fname, acl_fname);
-        asprintf(&blah, "%ld", count_lines_in_file(biggielist));
+        mr_asprintf(&blah, "%ld", count_lines_in_file(biggielist));
         write_header_block_to_stream((off_t)0, blah, BLK_START_BIGGIEFILES);
-        paranoid_free(blah);
-    }
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+        mr_free(blah);
+    }
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
 
     res = make_slices_and_images(bkpinfo, biggielist);
-    paranoid_free(biggielist);
+    mr_free(biggielist);
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -2418 +2421 @@
             continue;
         }
-        asprintf(&curr_file, "%s", cf);
+        mr_asprintf(&curr_file, "%s", cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2427 +2430 @@
             would_occupy += length_of_file(curr_file) / 1024;
         }
-        paranoid_free(curr_file);
+        mr_free(curr_file);
     }
     va_end(ap);
@@ -2448 +2451 @@
             continue;
         }
-        asprintf(&curr_file, "%s", cf);
-
-        asprintf(&tmp, "mv -f %s %s/archives/", curr_file,
+        mr_asprintf(&curr_file, "%s", cf);
+
+        mr_asprintf(&tmp, "mv -f %s %s/archives/", curr_file,
                  bkpinfo->scratchdir);
         res = run_program_and_log_output(tmp, 5);
@@ -2459 +2462 @@
             log_msg(8, "Moved %s to CD OK", tmp);
         }
-        paranoid_free(tmp);
-        paranoid_free(curr_file);
+        mr_free(tmp);
+        mr_free(curr_file);
         //      unlink (curr_file);
     }
@@ -2518 +2521 @@
         system("/usr/sbin/fdcontrol -F 1722 /dev/fd0.1722");
 #endif
-        asprintf(&bootdisk_dev, "%s", DEFAULT_1722MB_DISK);
+        mr_asprintf(&bootdisk_dev, "%s", DEFAULT_1722MB_DISK);
     } else if (does_device_exist(BACKUP_1722MB_DISK)) {
-        asprintf(&bootdisk_dev, "/dev/fd0H1722");
+        mr_asprintf(&bootdisk_dev, "/dev/fd0H1722");
     } else {
         log_msg(1, "Warning - can't find a 1.72MB floppy device *sigh*");
-        asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
-    }
-    asprintf(&datadisk_dev, "%s", "/dev/fd0");
+        mr_asprintf(&bootdisk_dev, DEFAULT_1722MB_DISK);
+    }
+    mr_asprintf(&datadisk_dev, "%s", "/dev/fd0");
     if (!does_device_exist(datadisk_dev)) {
         log_msg(1, "Warning - can't find a 1.44MB floppy device *sigh*");
-        paranoid_free(datadisk_dev);
-        asprintf(&datadisk_dev, "%s", "/dev/fd0");
+        mr_free(datadisk_dev);
+        mr_asprintf(&datadisk_dev, "%s", "/dev/fd0");
     }
     format_first = ask_me_yes_or_no
@@ -2538 +2541 @@
         log_to_screen("Writing boot floppy");
 #ifdef __FreeBSD__
-        asprintf(&tmp, "%s/mindi-kern.1722.img", imagesdir);
+        mr_asprintf(&tmp, "%s/mindi-kern.1722.img", imagesdir);
         if (format_first) {
             format_disk(bootdisk_dev);
         }
         res += write_image_to_floppy(bootdisk_dev, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (ask_me_OK_or_cancel("About to write 1.44MB mfsroot disk")) {
@@ -2550 +2553 @@
                 format_disk(datadisk_dev);
             }
-            asprintf(&tmp, "%s/mindi-mfsroot.1440.img", imagesdir);
+            mr_asprintf(&tmp, "%s/mindi-mfsroot.1440.img", imagesdir);
             write_image_to_floppy(datadisk_dev, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
 #else
-        asprintf(&bootdisk_file, "%s/mindi-bootroot.1722.img", imagesdir);
+        mr_asprintf(&bootdisk_file, "%s/mindi-bootroot.1722.img", imagesdir);
         if (does_file_exist(bootdisk_file)) {
             if (format_first) {
@@ -2562 +2565 @@
             res += write_image_to_floppy(bootdisk_dev, bootdisk_file);
         } else {
-            paranoid_free(bootdisk_file);
-            asprintf(&bootdisk_file, "%s/mindi-boot.1440.img", imagesdir);
-            asprintf(&rootdisk_file, "%s/mindi-root.1440.img", imagesdir);
+            mr_free(bootdisk_file);
+            mr_asprintf(&bootdisk_file, "%s/mindi-boot.1440.img", imagesdir);
+            mr_asprintf(&rootdisk_file, "%s/mindi-root.1440.img", imagesdir);
             root_disk_exists = TRUE;
             if (!does_file_exist(rootdisk_file)
@@ -2572 +2575 @@
                 log_to_screen
                     ("Failed to find boot/root floppy images. Oh dear.");
-                paranoid_free(bootdisk_file);
-                paranoid_free(rootdisk_file);
-                paranoid_free(bootdisk_dev);
+                mr_free(bootdisk_file);
+                mr_free(rootdisk_file);
+                mr_free(bootdisk_dev);
                 return (1);
             }
@@ -2586 +2589 @@
                     format_disk(datadisk_dev);
                 }
-                asprintf(&tmp, "cat %s > %s", rootdisk_file, datadisk_dev);
+                mr_asprintf(&tmp, "cat %s > %s", rootdisk_file, datadisk_dev);
                 log_msg(1, "tmp = '%s'", tmp);
                 res +=
@@ -2592 +2595 @@
                     ("Writing root floppy", tmp);
 //              res += write_image_to_floppy (datadisk_dev, rootdisk_file);
-                paranoid_free(tmp);
-            }
-            paranoid_free(rootdisk_file);
-            paranoid_free(bootdisk_file);
+                mr_free(tmp);
+            }
+            mr_free(rootdisk_file);
+            mr_free(bootdisk_file);
         }
 #endif
     }
-    paranoid_free(bootdisk_dev);
+    mr_free(bootdisk_dev);
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -2607 +2610 @@
     }
     for (i = 1; i < 99; i++) {
-        asprintf(&tmp, "%s/mindi-data-%d.img", imagesdir, i);
+        mr_asprintf(&tmp, "%s/mindi-data-%d.img", imagesdir, i);
         log_msg(3, tmp);
         if (!does_file_exist(tmp)) {
@@ -2613 +2616 @@
             break;
         }
-        asprintf(&comment, "About to write data disk #%d", i);
+        mr_asprintf(&comment, "About to write data disk #%d", i);
         if (ask_me_OK_or_cancel(comment)) {
-            paranoid_free(comment);
-            asprintf(&comment, "Writing data disk #%3d", i);
+            mr_free(comment);
+            mr_asprintf(&comment, "Writing data disk #%3d", i);
             log_to_screen(comment);
-            paranoid_free(comment);
+            mr_free(comment);
             if (format_first) {
                 res += format_disk(datadisk_dev);
@@ -2625 +2628 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(datadisk_dev);
+    mr_free(tmp);
+    mr_free(datadisk_dev);
     return (res);
 }
@@ -2729 +2732 @@
             continue;
         }
-        asprintf(&curr_file, "%s", cf);
+        mr_asprintf(&curr_file, "%s", cf);
         if (!does_file_exist(curr_file)) {
             log_msg(1,
@@ -2752 +2755 @@
         retval += res;
         unlink(curr_file);
-        paranoid_free(curr_file);
+        mr_free(curr_file);
         /* write closing header */
         write_header_block_to_stream((off_t)0, "finished-writing-file", stop_chr);
@@ -2786 +2789 @@
     if ((cdrw_device = find_cdrw_device()) != NULL) {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
-            asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_device);
+            mr_asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_device);
         } else if (!system("which dvdrecord > /dev/null 2> /dev/null")) {
-            asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_device);
+            mr_asprintf(&cdrecord, "cdrecord dev=%s -atip", cdrw_device);
         } else {
-            asprintf(&cdrecord, " ");
+            mr_asprintf(&cdrecord, " ");
             log_msg(2, "Found no cdrecord nor dvdrecord in path.");
         }
@@ -2797 +2800 @@
                 run_program_and_log_output(cdrecord, 5);
         }
-        paranoid_free(cdrecord);
+        mr_free(cdrecord);
     }
     return(cdrw_device);
@@ -2827 +2830 @@
     char *szunmount;
 
-    asprintf(&szmsg, "I am about to burn %s #%d",
+    mr_asprintf(&szmsg, "I am about to burn %s #%d",
              g_backup_media_string,
              g_current_media_number);
     log_to_screen(szmsg);
-    paranoid_free(szmsg);
+    mr_free(szmsg);
     if (g_current_media_number < ask_for_one_if_more_than_this) {
         return;
     }
     log_to_screen("Scanning CD-ROM drive...");
-    asprintf(&mtpt, "/tmp/cd.mtpt.%ld.%ld", (long int) random(),
+    mr_asprintf(&mtpt, "/tmp/cd.mtpt.%ld.%ld", (long int) random(),
              (long int) random());
     make_hole_for_dir(mtpt);
@@ -2848 +2851 @@
       retract_CD_tray_and_defeat_autorun();
 */
-        asprintf(&tmp, "umount %s", cdrom_dev);
+        mr_asprintf(&tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
-        paranoid_free(tmp);
-        asprintf(&szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
-        asprintf(&szserfname, "%s/archives/SERIAL-STRING", mtpt);
-        asprintf(&szunmount, "umount %s", mtpt);
+        mr_free(tmp);
+        mr_asprintf(&szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
+        mr_asprintf(&szserfname, "%s/archives/SERIAL-STRING", mtpt);
+        mr_asprintf(&szunmount, "umount %s", mtpt);
         cd_number = -1;
-        asprintf(&tmp, "mount %s %s", cdrom_dev, mtpt);
+        mr_asprintf(&tmp, "mount %s %s", cdrom_dev, mtpt);
         if ((attempt_to_mount_returned_this =
              run_program_and_log_output(tmp, 1))) {
             log_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
             log_to_screen("If there's a CD/DVD in the drive, it's blank.");
-            asprintf(&our_serial_str, "%s", "");
+            mr_asprintf(&our_serial_str, "%s", "");
         } else if (!does_file_exist(szcdno)
                    || !does_file_exist(szserfname)) {
@@ -2866 +2869 @@
                 ("%s has data on it but it's probably not a Mondo CD.",
                  g_backup_media_string);
-            asprintf(&our_serial_str, "%s", "");
+            mr_asprintf(&our_serial_str, "%s", "");
         } else {
             log_to_screen("%s found in drive. It's a Mondo disk.",
@@ -2872 +2875 @@
             tmp1 = last_line_of_file(szcdno);
             cd_number = atoi(tmp1);
-            paranoid_free(tmp1);
-            asprintf(&tmp1, "cat %s 2> /dev/null", szserfname);
+            mr_free(tmp1);
+            mr_asprintf(&tmp1, "cat %s 2> /dev/null", szserfname);
             our_serial_str = call_program_and_get_last_line_of_output(tmp1);
-            paranoid_free(tmp1);
+            mr_free(tmp1);
             // FIXME - should be able to use last_line_of_file(), surely?
         }
-        paranoid_free(szcdno);
-        paranoid_free(szserfname);
-        paranoid_free(tmp);
+        mr_free(szcdno);
+        mr_free(szserfname);
+        mr_free(tmp);
 
         run_program_and_log_output(szunmount, 1);
-        paranoid_free(szunmount);
+        mr_free(szunmount);
 
         log_msg(2, "paafcd: cd_number = %d", cd_number);
@@ -2904 +2907 @@
             log_to_screen("...but not part of _our_ backup set.");
         }
-        paranoid_free(our_serial_str);
+        mr_free(our_serial_str);
     } else {
         log_msg(2,
@@ -2914 +2917 @@
                           g_backup_media_string);
         }
-        paranoid_free(cdrw_device);
-    }
-    paranoid_free(mtpt);
+        mr_free(cdrw_device);
+    }
+    mr_free(mtpt);
 
     if (!ok_go_ahead_burn_it) {
         eject_device(cdrom_dev);
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.",
                  g_backup_media_string,
@@ -2926 +2929 @@
                  g_backup_media_string);
         popup_and_OK(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         goto gotos_make_me_puke;
     } else {
         log_msg(2, "paafcd: OK, going ahead and burning it.");
     }
-    paranoid_free(cdrom_dev);
+    mr_free(cdrom_dev);
 
     log_msg(2,
@@ -3048 +3051 @@
     if (is_this_file_compressed(biggie_filename)
         || bkpinfo->compression_level == 0) {
-        asprintf(&suffix, "%s", "");
+        mr_asprintf(&suffix, "%s", "");
         //      log_it("%s is indeed compressed :-)", filename);
         should_I_compress_slices = FALSE;
     } else {
-        asprintf(&suffix, "%s", bkpinfo->zip_suffix);
+        mr_asprintf(&suffix, "%s", bkpinfo->zip_suffix);
         should_I_compress_slices = TRUE;
     }
@@ -3061 +3064 @@
     if (ntfsprog_fifo) {
         file_to_openin = ntfsprog_fifo;
-        asprintf(&checksum_line, "IGNORE");
+        mr_asprintf(&checksum_line, "IGNORE");
         log_msg(2,
                 "Not calculating checksum for %s: it would take too long",
@@ -3069 +3072 @@
             fatal_error("ntfsresize not found");
         }
-        paranoid_free(tmp);
-
-        asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
+        mr_free(tmp);
+
+        mr_asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
         log_it("command = %s", command);
         tmp = call_program_and_get_last_line_of_output(command);
-        paranoid_free(command);
+        mr_free(command);
 
         log_it("res of it = %s", tmp); 
         totallength = (off_t)atoll(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         file_to_openin = biggie_filename;
         if (strchr(biggie_filename,'\'') != NULL) {
-            asprintf(&command, "md5sum \"%s\"", biggie_filename);
+            mr_asprintf(&command, "md5sum \"%s\"", biggie_filename);
         } else {
-            asprintf(&command, "md5sum '%s'", biggie_filename);
+            mr_asprintf(&command, "md5sum '%s'", biggie_filename);
         }
         if (!(fin = popen(command, "r"))) {
             log_OS_error("Unable to popen-in command");
-            paranoid_free(command);
+            mr_free(command);
             return (1);
         }
-        paranoid_free(command);
-        (void) getline(&checksum_line, &n, fin);
+        mr_free(command);
+        mr_getline(&checksum_line, &n, fin);
         pclose(fin);
         totallength = length_of_file (biggie_filename);
@@ -3114 +3117 @@
         fatal_error("checksum_line too big");
     }
-    paranoid_free(checksum_line);
+    mr_free(checksum_line);
 
     tmp = slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, "");
     fout = fopen(tmp, "w");
-    paranoid_free(tmp);
+    mr_free(tmp);
     (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
     paranoid_fclose(fout);
@@ -3126 +3129 @@
     if (!(fin = fopen(file_to_openin, "r"))) {
         log_OS_error("Unable to openin biggie_filename");
-        asprintf(&tmp, "Cannot archive bigfile '%s': not found",
+        mr_asprintf(&tmp, "Cannot archive bigfile '%s': not found",
                  biggie_filename);
         log_to_screen(tmp);
-        paranoid_free(tmp);
-
-        paranoid_free(suffix);
+        mr_free(tmp);
+
+        mr_free(suffix);
         return (1);
     }
@@ -3140 +3143 @@
         res = move_files_to_cd(bkpinfo, tmp, NULL);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     i = bkpinfo->optimal_set_size / 256;
     for (slice_num = 1; !finished; slice_num++) {
@@ -3148 +3151 @@
         tmp = percent_media_full_comment(bkpinfo);
         update_progress_form(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
             log_OS_error(curr_slice_fname_uncompressed);
 
-            paranoid_free(curr_slice_fname_uncompressed);
-            paranoid_free(curr_slice_fname_compressed);
-            paranoid_free(suffix);
+            mr_free(curr_slice_fname_uncompressed);
+            mr_free(curr_slice_fname_compressed);
+            mr_free(suffix);
             return (1);
         }
@@ -3175 +3178 @@
             i = 0;
         }
-        paranoid_free(tempblock);
+        mr_free(tempblock);
         paranoid_fclose(fout);
         if (i > 0)              // length_of_file (curr_slice_fname_uncompressed)
@@ -3185 +3188 @@
             }
             if (should_I_compress_slices && bkpinfo->compression_level > 0) {
-                asprintf(&command, "%s -%d %s", bkpinfo->zip_exe,
+                mr_asprintf(&command, "%s -%d %s", bkpinfo->zip_exe,
                          bkpinfo->compression_level,
                          curr_slice_fname_uncompressed);
@@ -3195 +3198 @@
             } else {
                 /* BERLIOS: Useless 
-                   asprintf(&command, "mv %s %s 2>> %s",
+                   mr_asprintf(&command, "mv %s %s 2>> %s",
                    curr_slice_fname_uncompressed,
                    curr_slice_fname_compressed, MONDO_LOGFILE);
@@ -3212 +3215 @@
             }
             if (res) {
-                asprintf(&tmp, "Problem with slice # %ld", slice_num);
+                mr_asprintf(&tmp, "Problem with slice # %ld", slice_num);
             } else {
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "%s - Bigfile #%ld, slice #%ld compressed OK          ",
                          biggie_filename, biggie_file_number + 1,
@@ -3229 +3232 @@
             log_msg(2, tmp);
 #endif
-            paranoid_free(tmp);
-            asprintf(&file_to_archive, "%s", curr_slice_fname_compressed);
+            mr_free(tmp);
+            mr_asprintf(&file_to_archive, "%s", curr_slice_fname_compressed);
             g_current_progress++;
         } else {                /* if i==0 then ... */
 
             finished = TRUE;
-            asprintf(&file_to_archive, "%s",
+            mr_asprintf(&file_to_archive, "%s",
                      curr_slice_fname_uncompressed);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -3251 +3254 @@
             res = move_files_to_cd(bkpinfo, file_to_archive, NULL);
         }
-        paranoid_free(file_to_archive);
+        mr_free(file_to_archive);
         retval += res;
         if (res) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                      "Failed to add slice %ld of bigfile %ld to scratchdir",
                      slice_num, biggie_file_number + 1);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             fatal_error
                 ("Hard disk full. You should have bought a bigger one.");
         }
-        paranoid_free(curr_slice_fname_uncompressed);
-        paranoid_free(curr_slice_fname_compressed);
-    }
-    paranoid_free(suffix);
+        mr_free(curr_slice_fname_uncompressed);
+        mr_free(curr_slice_fname_compressed);
+    }
+    mr_free(suffix);
     paranoid_fclose(fin);
     if (retval) {
-        asprintf(&tmp, "Sliced bigfile #%ld...FAILED",
+        mr_asprintf(&tmp, "Sliced bigfile #%ld...FAILED",
                  biggie_file_number + 1);
     } else {
-        asprintf(&tmp, "Sliced bigfile #%ld...OK!",
+        mr_asprintf(&tmp, "Sliced bigfile #%ld...OK!",
                  biggie_file_number + 1);
     }
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -3300 +3303 @@
     assert_string_is_neither_NULL_nor_zerolength(d);
 
-    asprintf(&dir, "%s/archives", d);
-    asprintf(&tmp, "find %s -name '*.afio*' -exec rm -f '{}' \\;", dir);
+    mr_asprintf(&dir, "%s/archives", d);
+    mr_asprintf(&tmp, "find %s -name '*.afio*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;",
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "find %s -name '*list.[0-9]*' -exec rm -f '{}' \\;",
              dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "find %s -name 'slice*' -exec rm -f '{}' \\;", dir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "find %s -name 'slice*' -exec rm -f '{}' \\;", dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "rm -f %s/cklist*", dir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "rm -f %s/cklist*", dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "rm -f %s/zero", dir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "rm -f %s/zero", dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_msg(1, "Wiped %s's archives", dir);
-    asprintf(&tmp, "ls -l %s", dir);
+    mr_asprintf(&tmp, "ls -l %s", dir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
-
-    paranoid_free(dir);
+    mr_free(tmp);
+
+    mr_free(dir);
 }
 
@@ -3357 +3360 @@
 // I should really check if there are any slices or tarballs to be copied to CD-R(W)'s; the odds are approx. 1 in a million that there are no files here, so I'll just go ahead & make one more CD anyway
 
-    asprintf(&tmp, "Writing the final ISO");
+    mr_asprintf(&tmp, "Writing the final ISO");
     log_msg(2, tmp);
     /* BERLIOS: center_string is now broken
@@ -3367 +3370 @@
     }
 #endif
-    paranoid_free(tmp);
+    mr_free(tmp);
     res = write_iso_and_go_on(bkpinfo, TRUE);
 #ifndef _XWIN
@@ -3432 +3435 @@
     /* label the ISO with its number */
 
-    asprintf(&cdno_fname, "%s/archives/THIS-CD-NUMBER",
+    mr_asprintf(&cdno_fname, "%s/archives/THIS-CD-NUMBER",
              bkpinfo->scratchdir);
     fout = fopen(cdno_fname, "w");
     fprintf(fout, "%d", g_current_media_number);
     paranoid_fclose(fout);
-    paranoid_free(cdno_fname);
-
-    asprintf(&tmp, "cp -f %s/autorun %s/", g_mondo_home,
+    mr_free(cdno_fname);
+
+    mr_asprintf(&tmp, "cp -f %s/autorun %s/", g_mondo_home,
              bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     /* last CD or not? Label accordingly */
-    asprintf(&lastcd_fname, "%s/archives/NOT-THE-LAST",
+    mr_asprintf(&lastcd_fname, "%s/archives/NOT-THE-LAST",
              bkpinfo->scratchdir);
     if (last_cd) {
@@ -3459 +3462 @@
         paranoid_fclose(fout);
     }
-    paranoid_free(lastcd_fname);
+    mr_free(lastcd_fname);
 
     if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 >
         bkpinfo->media_size[g_current_media_number]) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
                  (long) space_occupied_by_cd(bkpinfo->scratchdir),
                  (long) bkpinfo->media_size[g_current_media_number]);
         log_to_screen(tmp);
-        paranoid_free(tmp);
-    }
-    asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
+        mr_free(tmp);
+    }
+    mr_asprintf(&isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
              bkpinfo->nfs_remote_dir, bkpinfo->prefix,
              g_current_media_number);
@@ -3485 +3488 @@
             else {
                 log_msg(3, "Great. Found Mike's CD-ROM drive.");
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
         }
@@ -3500 +3503 @@
             that_one_was_ok = TRUE;
         } else {
-            asprintf(&tmp, "Failed to burn %s #%d. Retry?",
+            mr_asprintf(&tmp, "Failed to burn %s #%d. Retry?",
                      bkpinfo->backup_media_string,
                      g_current_media_number);
             res = ask_me_yes_or_no(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             if (!res) {
                 if (ask_me_yes_or_no("Abort the backup?")) {
@@ -3520 +3523 @@
   if (using_nfs)
     {
-      asprintf(&tmp,"mv -f %s %s/%s/", isofile, bkpinfo->isodir, bkpinfo->nfs_remote_dir);
+      mr_asprintf(&tmp,"mv -f %s %s/%s/", isofile, bkpinfo->isodir, bkpinfo->nfs_remote_dir);
       if (run_program_and_log_output(tmp, FALSE))
         { log_to_screen("Unable to move ISO to NFS dir"); }
     }
 */
-    paranoid_free(isofile);
+    mr_free(isofile);
 
     g_current_media_number++;
@@ -3532 +3535 @@
     }
     wipe_archives(bkpinfo->scratchdir);
-    asprintf(&tmp, "rm -Rf %s/images/*gz %s/images/*data*img",
+    mr_asprintf(&tmp, "rm -Rf %s/images/*gz %s/images/*data*img",
              bkpinfo->scratchdir, bkpinfo->scratchdir);
     if (system(tmp)) {
@@ -3538 +3541 @@
                 "Error occurred when I tried to delete the redundant IMGs and GZs");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (last_cd) {
@@ -3576 +3579 @@
                             "Verifying archives against live filesystem");
         if (bkpinfo->backup_media_type == cdstream) {
-            paranoid_alloc(bkpinfo->media_device,"/dev/cdrom");
+            mr_allocstr(bkpinfo->media_device,"/dev/cdrom");
         }
         verify_tape_backups(bkpinfo);
@@ -3606 +3609 @@
             retval += res;
             if (res) {
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "Warnings/errors were reported while checking %s #%d",
                          bkpinfo->backup_media_string,
                          g_current_media_number);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
-
-            }
-        }
-        asprintf(&tmp,
+                mr_free(tmp);
+
+            }
+        }
+        mr_asprintf(&tmp,
                  "grep 'afio: ' %s | sed 's/afio: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);
-        paranoid_free(tmp);
-
-        asprintf(&tmp,
+        mr_free(tmp);
+
+        mr_asprintf(&tmp,
                  "grep 'star: ' %s | sed 's/star: //' | grep -vx '/dev/.*' >> /tmp/changed.files",
                  MONDO_LOGFILE);
         system(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         run_program_and_log_output("umount " MNT_CDROM, FALSE);
@@ -3676 +3679 @@
         p++;
     }
-    asprintf(&title, "Writing %s to floppy", p);
+    mr_asprintf(&title, "Writing %s to floppy", p);
     open_evalcall_form(title);
-    paranoid_free(title);
+    mr_free(title);
 
     /* functional stuff */
@@ -3687 +3690 @@
         maxblocks = 1440;
     }
-    asprintf(&tmp, "maxblocks = %d; p=%s", maxblocks, p);
+    mr_asprintf(&tmp, "maxblocks = %d; p=%s", maxblocks, p);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     /* copy data from image to floppy */
@@ -3763 +3766 @@
     char *param = NULL;
 
-    mr_conf = (struct s_mr_conf *)malloc(sizeof(struct s_mr_conf));
-    if (mr_conf == NULL) {
-            fatal_error("Unable to malloc mr_conf");
-    }
-    /* Default for everything int : 0 char * : NULL */
+    mr_conf = (struct s_mr_conf *)mr_malloc(sizeof(struct s_mr_conf));
 
     /* mindi conf parameters also needed in mondo */
-    mr_conf->mindi_ia64_boot_size = 0;
-
-    asprintf(&command, "mindi -printvar IA64_BOOT_SIZE");
+    mr_asprintf(&command, "mindi -printvar IA64_BOOT_SIZE");
     fin = popen(command, "r");
-    getline(&param, &n, fin);
+    mr_getline(&param, &n, fin);
     pclose(fin);
-    paranoid_free(command);
+    mr_free(command);
+
     mr_conf->mindi_ia64_boot_size = atoi(param);
-    paranoid_free(param);
-
-    mr_conf->mondo_iso_creation_cmd = NULL;
+    mr_free(param);
 
     /* Finds mondo conf file */
@@ -3786 +3782 @@
 
     /* mondo conf parameters needed */
-    mr_conf->mondo_iso_creation_cmd = mr_conf_sread("mondo_iso_creation_cmd");
+    if ((mr_conf->mondo_iso_creation_cmd = mr_conf_sread("mondo_iso_creation_cmd")) == NULL) {;
+        mr_log_exit(-1,"Unable to get mondo_iso_creation_cmd parameter from conf file\nAborting...\n");
+    }
+
+    if ((mr_conf->mondo_logfile = mr_conf_sread("mondo_logfile")) == NULL) {
+        mr_log_exit(-1,"Unable to get mondo_logfile parameter from conf file\nAborting...\n");
+    }
 
     mr_conf_close();