Changeset 900 in MondoRescue for trunk

Timestamp:

Oct 24, 2006, 8:49:18 AM (17 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.

Location:

trunk

Files:

• mindi/get-modules.pl (added)
• mondo-doc/Makefile.man (modified) (1 diff)
• mondo/src/common/libmondo-archive.c (modified) (138 diffs)
• mondo/src/common/libmondo-devices.c (modified) (90 diffs)
• mondo/src/common/libmondo-fifo.c (modified) (8 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (57 diffs)
• mondo/src/common/libmondo-files-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (47 diffs)
• mondo/src/common/libmondo-fork.c (modified) (24 diffs)
• mondo/src/common/libmondo-mountlist.c (modified) (37 diffs)
• mondo/src/common/libmondo-raid.c (modified) (20 diffs)
• mondo/src/common/libmondo-stream.c (modified) (39 diffs)
• mondo/src/common/libmondo-string.c (modified) (33 diffs)
• mondo/src/common/libmondo-tools.c (modified) (43 diffs)
• mondo/src/common/libmondo-verify.c (modified) (44 diffs)
• mondo/src/common/mondostructures.h (modified) (1 diff)
• mondo/src/common/mr_string.c (modified) (2 diffs)
• mondo/src/common/mr_string.h (deleted)
• mondo/src/common/newt-specific.c (modified) (49 diffs)
• mondo/src/include/mr_err.h (added)
• mondo/src/include/mr_gettext.h (added)
• mondo/src/include/mr_mem.h (added)
• mondo/src/include/mr_msg.h (added)
• mondo/src/include/mr_str.h (moved) (moved from trunk/mondo/src/include/mr_string.h ) (2 diffs)
• mondo/src/include/my-stuff.h (modified) (1 diff)
• mondo/src/lib/Makefile.am (modified) (1 diff)
• mondo/src/lib/mr_conf.c (modified) (10 diffs)
• mondo/src/lib/mr_err.c (added)
• mondo/src/lib/mr_mem.c (added)
• mondo/src/lib/mr_msg.c (added)
• mondo/src/lib/mr_str.c (moved) (moved from trunk/mondo/src/lib/mr_string.c )
• mondo/src/mondoarchive/Makefile.am (modified) (1 diff)
• mondo/src/mondoarchive/main.c (modified) (10 diffs)
• mondo/src/mondoarchive/mondo-cli.c (modified) (31 diffs)
• mondo/src/mondorestore/Makefile.am (modified) (2 diffs)
• mondo/src/mondorestore/mondo-prep.c (modified) (88 diffs)
• mondo/src/mondorestore/mondo-restore.c (modified) (108 diffs)
• mondo/src/mondorestore/mondo-rstr-compare.c (modified) (28 diffs)
• mondo/src/mondorestore/mondo-rstr-newt.c (modified) (74 diffs)
• mondo/src/mondorestore/mondo-rstr-tools.c (modified) (93 diffs)
• mondo/src/test/mktest (modified) (1 diff)
• mondo/src/test/test-conf.c (modified) (2 diffs)
• mondo/src/test/test-string.c (modified) (2 diffs)
• tools/build2pkg (modified) (4 diffs)
• tools/build2qemu (modified) (5 diffs)
• tools/common-env (modified) (1 diff)
• tools/distro-env (modified) (6 diffs)
• tools/ftp-env (modified) (1 diff)
• tools/livwww (modified) (4 diffs)
• tools/mkannounce (modified) (4 diffs)
• tools/qemu-vm.txt (modified) (1 diff)
• tools/quality (modified) (1 diff)
• tools/svn-env (modified) (1 diff)
• tools/svn2build (modified) (6 diffs)

trunk/mondo-doc/Makefile.man

@@ -38 +38 @@
 
 %.8.ps: %.8
-    @man2dvi ./$< > $<.dvi
-    @dvips -q $<.dvi -o $@
-    @rm -f $<.dvi
+    @groff -Tps -mandoc ./$< > $@
 
 %.8.pdf: %.8.ps

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

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

@@ -17 +17 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
+#include "mr_mem.h"
 
 #include <sys/ioctl.h>
@@ -62 +63 @@
 {
     if (bkpinfo->media_device != NULL) {
-        paranoid_alloc(g_cdrom_drive_is_here, bkpinfo->media_device);   // just in case
-        paranoid_alloc(g_dvd_drive_is_here, bkpinfo->media_device); // just in case
+        mr_allocstr(g_cdrom_drive_is_here, bkpinfo->media_device);  // just in case
+        mr_allocstr(g_dvd_drive_is_here, bkpinfo->media_device);    // just in case
     }
 }
@@ -113 +114 @@
     make_hole_for_dir(mountpoint);
     if (isdigit(device[0])) {
-        paranoid_free(device);
+        mr_free(device);
         device = find_cdrom_device(FALSE);
     }
@@ -123 +124 @@
         dev = make_vn(device));
         if (!dev) {
-            asprintf(&command, "Unable to mount ISO (make_vn(%s) failed)",
+            mr_asprintf(&command, "Unable to mount ISO (make_vn(%s) failed)",
                     device);
             fatal_error(command);
         }
-        paranoid_free(device);
+        mr_free(device);
         device = dev;
 #endif
@@ -137 +138 @@
 
 #ifdef __FreeBSD__
-    asprintf(&command, "mount_cd9660 -r %s %s 2>> %s",
+    mr_asprintf(&command, "mount_cd9660 -r %s %s 2>> %s",
             device, mountpoint, MONDO_LOGFILE);
 #else
-    asprintf(&command, "mount %s -o ro,loop -t iso9660 %s 2>> %s",
+    mr_asprintf(&command, "mount %s -o ro,loop -t iso9660 %s 2>> %s",
             device, mountpoint, MONDO_LOGFILE);
 #endif
@@ -150 +151 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-    paranoid_free(command);
+    mr_free(command);
 
     if (retval == 0) {
@@ -171 +172 @@
     bool is_this_a_ramdisk = FALSE;
 
-    asprintf(&tmp, where_is_root_mounted());
-    asprintf(&comment, "root is mounted at %s\n", tmp);
+    mr_asprintf(&tmp, where_is_root_mounted());
+    mr_asprintf(&comment, "root is mounted at %s\n", tmp);
     log_msg(0, comment);
-    paranoid_free(comment);
+    mr_free(comment);
 
     log_msg(0,
@@ -194 +195 @@
     }
 #endif
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (is_this_a_ramdisk) {
@@ -222 +223 @@
     char *output = NULL;
 
-    paranoid_free(output);
+    mr_free(output);
 
     switch (bt) {
     case none:
-        asprintf(&output, _("none"));
+        mr_asprintf(&output, _("none"));
         break;
     case iso:
-        asprintf(&output, _("iso"));
+        mr_asprintf(&output, _("iso"));
         break;
     case cdr:
-        asprintf(&output, _("cdr"));
+        mr_asprintf(&output, _("cdr"));
         break;
     case cdrw:
-        asprintf(&output, _("cdrw"));
+        mr_asprintf(&output, _("cdrw"));
         break;
     case cdstream:
-        asprintf(&output, _("cdstream"));
+        mr_asprintf(&output, _("cdstream"));
         break;
     case nfs:
-        asprintf(&output, _("nfs"));
+        mr_asprintf(&output, _("nfs"));
         break;
     case tape:
-        asprintf(&output, _("tape"));
+        mr_asprintf(&output, _("tape"));
         break;
     case udev:
-        asprintf(&output, _("udev"));
+        mr_asprintf(&output, _("udev"));
         break;
     default:
-        asprintf(&output, _("default"));
+        mr_asprintf(&output, _("default"));
     }
     return (output);
@@ -272 +273 @@
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
-        asprintf(&command, "mt -f %s offline", dev);
+        mr_asprintf(&command, "mt -f %s offline", dev);
         res1 = run_program_and_log_output(command, 1);
-        paranoid_free(command);
+        mr_free(command);
     } else {
         res1 = 0;
@@ -281 +282 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        asprintf(&command, "cdcontrol -f %s eject", dev);
-    } else {
-        asprintf(&command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
+        mr_asprintf(&command, "cdcontrol -f %s eject", dev);
+    } else {
+        mr_asprintf(&command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
                 dev);
     }
 #else
-    asprintf(&command, "eject %s", dev);
+    mr_asprintf(&command, "eject %s", dev);
 #endif
 
     log_msg(3, "Ejecting %s", dev);
     res2 = run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
     if (res1 && res2) {
         return (1);
@@ -313 +314 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        asprintf(&command, "cdcontrol -f %s close", dev);
-    } else {
-        asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`",
+        mr_asprintf(&command, "cdcontrol -f %s close", dev);
+    } else {
+        mr_asprintf(&command, "camcontrol load `echo %s | sed 's|/dev/||'`",
                 dev);
     }
 #else
-    asprintf(&command, "eject -t %s", dev);
+    mr_asprintf(&command, "eject -t %s", dev);
 #endif
     i = run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
     return (i);
 }
@@ -341 +342 @@
     assert_string_is_neither_NULL_nor_zerolength(device);
 
-    asprintf(&tmp, "ls %s > /dev/null 2> /dev/null", device);
+    mr_asprintf(&tmp, "ls %s > /dev/null 2> /dev/null", device);
 
     if (system(tmp)) {
@@ -348 +349 @@
         ret = TRUE;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return(ret);
 }
@@ -398 +399 @@
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    asprintf(&program, "ls %s >/dev/null 2>&1", drive);
+    mr_asprintf(&program, "ls %s >/dev/null 2>&1", drive);
     res = system(program);
-    paranoid_free(program);
+    mr_free(program);
     return(res);
 #endif
 
-    asprintf(&program, "parted2fdisk -l %s 2> /dev/null", drive);
+    mr_asprintf(&program, "parted2fdisk -l %s 2> /dev/null", drive);
     fin = popen(program, "r");
     if (!fin) {
         log_it("program=%s", program);
         log_OS_error("Cannot popen-in program");
-        paranoid_free(program);
+        mr_free(program);
         return (0);
     }
-    paranoid_free(program);
+    mr_free(program);
 
     searchstr = build_partition_name(drive, partno);
-    asprintf(&tmp, "%s ", searchstr);
-    paranoid_free(searchstr);
-
-    for (res = 0; !res && getline(&incoming, &n, fin);) {
+    mr_asprintf(&tmp, "%s ", searchstr);
+    mr_free(searchstr);
+
+    for (res = 0; !res ;) {
+        mr_getline(&incoming, &n, fin);
         if (strstr(incoming, tmp)) {
             res = 1;
         }
     }
-    paranoid_free(incoming);
+    mr_free(incoming);
 
     if (pclose(fin)) {
         log_OS_error("Cannot pclose fin");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -450 +452 @@
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    asprintf(&command,
+    mr_asprintf(&command,
             "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
             dev, str);
     ret = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (ret) {
         return (FALSE);
@@ -477 +479 @@
     int ret;
 
-    asprintf(&command,
+    mr_asprintf(&command,
             "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
             dev, n, str);
     ret = system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (ret) {
@@ -514 +516 @@
     if (g_backup_media_type == dvd) {
         if (g_dvd_drive_is_here != NULL) {
-            asprintf(&dev, g_dvd_drive_is_here);
+            mr_asprintf(&dev, g_dvd_drive_is_here);
         } else {
             dev = find_dvd_device();
@@ -520 +522 @@
     } else {
         if (g_cdrom_drive_is_here != NULL) {
-            asprintf(&dev, g_cdrom_drive_is_here);
+            mr_asprintf(&dev, g_cdrom_drive_is_here);
         } else {
             // find_cdrom_device allocates the string
@@ -532 +534 @@
 
     if ((dev == NULL) || (! mount_CDROM_here(dev, mountpoint))) {
-        paranoid_free(dev);
+        mr_free(dev);
         if (!popup_and_get_string
             (_("CD-ROM device"), _("Please enter your CD-ROM's /dev device"), dev)) {
@@ -545 +547 @@
         log_msg(1, _("mount succeeded with %s"), dev);
     }
-    paranoid_free(dev);
+    mr_free(dev);
     return(res);
 }
@@ -565 +567 @@
 
     if (g_cdrw_drive_is_here != NULL) {
-        asprintf(&cdrw_device, g_cdrw_drive_is_here);
+        mr_asprintf(&cdrw_device, g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
         return(cdrw_device);
@@ -577 +579 @@
     tmp = find_home_of_exe("cdrecord");
     if (tmp) {
-        asprintf(&cdr_exe, "cdrecord");
-    } else {
-        asprintf(&cdr_exe, "dvdrecord");
-    }
-    paranoid_free(tmp);
+        mr_asprintf(&cdr_exe, "cdrecord");
+    } else {
+        mr_asprintf(&cdr_exe, "dvdrecord");
+    }
+    mr_free(tmp);
 
     tmp1 = find_home_of_exe(cdr_exe);
     if (tmp1) {
-        asprintf(&command,
+        mr_asprintf(&command,
                 "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep CD | cut -d' ' -f2 | head -n1",
                 cdr_exe);
-        asprintf(&tmp, call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
-    } else {
-        asprintf(&tmp, " ");
-    }
-    paranoid_free(tmp1);
-    paranoid_free(cdr_exe);
+        mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
+    } else {
+        mr_asprintf(&tmp, " ");
+    }
+    mr_free(tmp1);
+    mr_free(cdr_exe);
 
     if (strlen(tmp) < 2) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         return(NULL);
     } else {
         cdrw_device = tmp;
 
-        asprintf(&comment, "Found CDRW device - %s", cdrw_device);
+        mr_asprintf(&comment, "Found CDRW device - %s", cdrw_device);
         log_it(comment);
-        paranoid_free(comment);
-
-        paranoid_free(g_cdrw_drive_is_here);
-        asprintf(&g_cdrw_drive_is_here, cdrw_device);
+        mr_free(comment);
+
+        mr_free(g_cdrw_drive_is_here);
+        mr_asprintf(&g_cdrw_drive_is_here, cdrw_device);
         return(cdrw_device);
     }
@@ -649 +651 @@
 
     if ((g_cdrom_drive_is_here != NULL) && !isdigit(g_cdrom_drive_is_here[0])) {
-        asprintf(&output, g_cdrom_drive_is_here);
+        mr_asprintf(&output, g_cdrom_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
         return(output);
     }
     if ((the_last_place_i_found_it != NULL) && !try_to_mount) {
-        asprintf(&output, the_last_place_i_found_it);
+        mr_asprintf(&output, the_last_place_i_found_it);
         log_msg(3,
                 "find_cdrom_device() --- returning last found location - '%s'",
@@ -663 +665 @@
     tmp = find_home_of_exe("cdrecord");
     if (tmp) {
-        asprintf(&cdr_exe, "cdrecord");
-    } else {
-        asprintf(&cdr_exe, "dvdrecord");
-    }
-    paranoid_free(tmp);
+        mr_asprintf(&cdr_exe, "cdrecord");
+    } else {
+        mr_asprintf(&cdr_exe, "dvdrecord");
+    }
+    mr_free(tmp);
 
     tmp = find_home_of_exe(cdr_exe);
     if (!tmp) {
-        asprintf(&output, "/dev/cdrom");
+        mr_asprintf(&output, "/dev/cdrom");
         log_msg(4, "Can't find cdrecord; assuming %s", output);
         if (!does_device_exist(output)) {
             log_msg(4, "That didn't work. Sorry.");
-            paranoid_free(cdr_exe);
-            paranoid_free(output);
+            mr_free(cdr_exe);
+            mr_free(output);
             return(NULL);
         } else {
-            paranoid_free(cdr_exe);
+            mr_free(cdr_exe);
             return(output);
         }
     }
-    paranoid_free(tmp);
-
-    asprintf(&command, "%s -scanbus 2> /dev/null", cdr_exe);
+    mr_free(tmp);
+
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null", cdr_exe);
     fin = popen(command, "r");
     if (!fin) {
         log_msg(4, "command=%s", command);
         log_OS_error("Cannot popen command");
-        paranoid_free(cdr_exe);
-        paranoid_free(command);
+        mr_free(cdr_exe);
+        mr_free(command);
         return (NULL);
     }
-    paranoid_free(command);
-
-    for (getline(&tmp, &n, fin); !feof(fin);
-         getline(&tmp, &n, fin)) {
+    mr_free(command);
+
+    for (mr_getline(&tmp, &n, fin); !feof(fin);
+         mr_getline(&tmp, &n, fin)) {
         p = strchr(tmp, '\'');
         if (p) {
@@ -713 +715 @@
                         *q = '\0';
 #ifndef __FreeBSD__
-                        paranoid_free(phrase_two);
-                        asprintf(&phrase_two, p);
+                        mr_free(phrase_two);
+                        mr_asprintf(&phrase_two, p);
 #endif
                     }
@@ -722 +724 @@
     }
     paranoid_pclose(fin);
-    paranoid_free(tmp);
+    mr_free(tmp);
     tmp = NULL;
     n = 0;
@@ -730 +732 @@
         log_msg(4, "Not running phase two. String is empty.");
     } else {
-        asprintf(&command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
+        mr_asprintf(&command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
         fin = popen(command, "r");
         if (!fin) {
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
         } else {
-            for (getline(&tmp, &n, fin); !feof(fin);
-                 getline(&tmp, &n, fin)) {
+            for (mr_getline(&tmp, &n, fin); !feof(fin);
+                 mr_getline(&tmp, &n, fin)) {
                 log_msg(5, "--> '%s'", tmp);
                 if (tmp[0] != ' ' && tmp[1] != ' ') {
@@ -743 +745 @@
                         *p = '\0';
                         if (strstr(tmp, "DVD")) {
-                            paranoid_free(dvd_last_resort);
-                            asprintf(&dvd_last_resort, "/dev/%s", tmp);
+                            mr_free(dvd_last_resort);
+                            mr_asprintf(&dvd_last_resort, "/dev/%s", tmp);
                             log_msg(4,
                                     "Ignoring '%s' because it's a DVD drive",
                                     tmp);
                         } else {
-                            asprintf(&output, "/dev/%s", tmp);
+                            mr_asprintf(&output, "/dev/%s", tmp);
                             found_it = TRUE;
                         }
@@ -755 +757 @@
                 }
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
             paranoid_pclose(fin);
         }
-        paranoid_free(command);
-    }
-    paranoid_free(phrase_two);
+        mr_free(command);
+    }
+    mr_free(phrase_two);
 
 #endif
@@ -789 +791 @@
                                                               "/dev/cd1")))
                                 {
-                                    paranoid_free(cdr_exe);
+                                    mr_free(cdr_exe);
                                     return(NULL);
                                 }
@@ -804 +806 @@
             log_msg(4, "Well, I'll use the DVD - %s - as a last resort",
                     dvd_last_resort);
-            paranoid_free(output);
-            asprintf(&output, dvd_last_resort);
+            mr_free(output);
+            mr_asprintf(&output, dvd_last_resort);
             found_it = TRUE;
         }
     }
-    paranoid_free(dvd_last_resort);
+    mr_free(dvd_last_resort);
 
     if (found_it) {
-        asprintf(&tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null",
+        mr_asprintf(&tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null",
                 strrchr(output, '/') + 1);
         if (system(tmp) == 0) {
@@ -819 +821 @@
                     output);
             found_it = FALSE;
-            paranoid_free(output);
-        }
-        paranoid_free(tmp);
+            mr_free(output);
+        }
+        mr_free(tmp);
     }
 
@@ -829 +831 @@
             log_msg(4, "OK, I was wrong, I haven't found it... yet.");
             found_it = FALSE;
-            paranoid_free(output);
+            mr_free(output);
         }
     }
@@ -862 +864 @@
                                                                   g_cdrw_drive_is_here)))
                                     {
-                                        paranoid_free(cdr_exe);
+                                        mr_free(cdr_exe);
                                         return(NULL);
                                     }
@@ -875 +877 @@
 #endif
 
-    asprintf(&mountpoint, "/tmp/cd.%d", (int) (random() % 32767));
+    mr_asprintf(&mountpoint, "/tmp/cd.%d", (int) (random() % 32767));
     make_hole_for_dir(mountpoint);
 
@@ -882 +884 @@
             log_msg(4, "[Cardigans] I've changed my mind");
             found_it = FALSE;
-            paranoid_free(output);
+            mr_free(output);
         } else {
-            asprintf(&tmp, "%s/archives", mountpoint);
+            mr_asprintf(&tmp, "%s/archives", mountpoint);
             if (!does_file_exist(tmp)) {
                 log_msg(4, "[Cardigans] I'll take it back");
                 found_it = FALSE;
-                paranoid_free(output);
+                mr_free(output);
             } else {
-                asprintf(&command, "umount %s", output);
+                mr_asprintf(&command, "umount %s", output);
                 paranoid_system(command);
-                paranoid_free(command);
+                mr_free(command);
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
     }
     unlink(mountpoint);
-    paranoid_free(mountpoint);
+    mr_free(mountpoint);
 
     if (found_it) {
         if (!does_file_exist(output)) {
             log_msg(3, "I still haven't found it.");
-            paranoid_free(output);
+            mr_free(output);
             return(NULL);
         }
         log_msg(3, "(find_cdrom_device) --> '%s'", output);
-        asprintf(&the_last_place_i_found_it, output);
-        paranoid_free(g_cdrom_drive_is_here);
-        asprintf(&g_cdrom_drive_is_here, output);
+        mr_asprintf(&the_last_place_i_found_it, output);
+        mr_free(g_cdrom_drive_is_here);
+        mr_asprintf(&g_cdrom_drive_is_here, output);
         return(output);
     }
 
-    asprintf(&command,
+    mr_asprintf(&command,
             "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
             cdr_exe, g_cdrw_drive_is_here);
-    paranoid_free(cdr_exe);
+    mr_free(cdr_exe);
 
     log_msg(1, "command=%s", command);
-    asprintf(&tmp, call_program_and_get_last_line_of_output(command));
-    paranoid_free(command);
+    mr_asprintf(&tmp, call_program_and_get_last_line_of_output(command));
+    mr_free(command);
 
     if (tmp[0]) {
@@ -927 +929 @@
         log_msg(4, "Finally found it at %s", output);
     } else {
-        paranoid_free(tmp);
-        paranoid_free(output);
+        mr_free(tmp);
+        mr_free(output);
         log_msg(4, "Still couldn't find it.");
     }
@@ -942 +944 @@
 
     if (g_dvd_drive_is_here != NULL) {
-        asprintf(&output, g_dvd_drive_is_here);
+        mr_asprintf(&output, g_dvd_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", output);
         return (output);
     }
 
-    asprintf(&tmp, call_program_and_get_last_line_of_output
+    mr_asprintf(&tmp, call_program_and_get_last_line_of_output
             ("dvdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
         );
     log_msg(5, "tmp = '%s'", tmp);
     if (!tmp[0]) {
-        paranoid_free(tmp);
-        asprintf(&tmp, call_program_and_get_last_line_of_output
+        mr_free(tmp);
+        mr_asprintf(&tmp, call_program_and_get_last_line_of_output
                 ("cdrecord -scanbus 2> /dev/null | grep \") '\" | grep -n \"\" | grep DVD | cut -d':' -f1")
             );
@@ -960 +962 @@
         devno = atoi(tmp) - 1;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (devno >= 0) {
         retval = 0;
-        asprintf(&output, "/dev/scd%d", devno);
-        paranoid_free(g_dvd_drive_is_here);
-        asprintf(&g_dvd_drive_is_here, output);
+        mr_asprintf(&output, "/dev/scd%d", devno);
+        mr_free(g_dvd_drive_is_here);
+        mr_asprintf(&g_dvd_drive_is_here, output);
         log_msg(2, "I think DVD is at %s", output);
     } else {
@@ -1092 +1094 @@
     assert_string_is_neither_NULL_nor_zerolength(format);
 
-    asprintf(&format_sz, "%s ", format);
+    mr_asprintf(&format_sz, "%s ", format);
 
 #ifdef __FreeBSD__
-    asprintf(&command,
+    mr_asprintf(&command,
             "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    asprintf(&command,
+    mr_asprintf(&command,
             "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 
     pin = popen(command, "r");
-    paranoid_free(command);
+    mr_free(command);
 
     if (!pin) {
@@ -1109 +1111 @@
         retval = FALSE;
     } else {
-        getline(&good_formats, &n , pin);
+        mr_getline(&good_formats, &n , pin);
         if (pclose(pin)) {
             log_OS_error("Cannot pclose good formats");
@@ -1115 +1117 @@
         strip_spaces(good_formats);
         // " ntfs 7 " -- um, cheating much? :)
-        asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats);
-        paranoid_free(good_formats);
+        mr_asprintf(&tmp, " %s swap lvm raid ntfs 7 ",good_formats);
+        mr_free(good_formats);
         good_formats = tmp;
 
@@ -1124 +1126 @@
             retval = FALSE;
         }
-        paranoid_free(good_formats);
-    }
-    paranoid_free(format_sz);
+        mr_free(good_formats);
+    }
+    mr_free(format_sz);
     return (retval);
 }
@@ -1164 +1166 @@
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
                 device_raw);
-        asprintf(&tmp, "/%s", device_raw);
-    } else {
-        asprintf(&tmp, device_raw);
+        mr_asprintf(&tmp, "/%s", device_raw);
+    } else {
+        mr_asprintf(&tmp, device_raw);
     }
     log_msg(1, "Is %s mounted?", tmp);
@@ -1174 +1176 @@
         return (FALSE);
     }
-    asprintf(&device_with_tab, "%s\t", tmp);
-    asprintf(&device_with_space, "%s ", tmp);
-    paranoid_free(tmp);
+    mr_asprintf(&device_with_tab, "%s\t", tmp);
+    mr_asprintf(&device_with_space, "%s ", tmp);
+    mr_free(tmp);
 
     if (!(fin = popen("mount", "r"))) {
@@ -1182 +1184 @@
         return (FALSE);
     }
-    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 (strstr(incoming, device_with_space) //> incoming
             || strstr(incoming, device_with_tab))   // > incoming)
@@ -1191 +1193 @@
         }
     }
-    paranoid_free(incoming);
-    paranoid_free(device_with_tab);
+    mr_free(incoming);
+    mr_free(device_with_tab);
     paranoid_pclose(fin);
 
-    asprintf(&tmp, "%s | grep -w \"%s\" > /dev/null 2> /dev/null",
+    mr_asprintf(&tmp, "%s | grep -w \"%s\" > /dev/null 2> /dev/null",
             SWAPLIST_COMMAND, device_with_space);
-    paranoid_free(device_with_space);
+    mr_free(device_with_space);
 
     log_msg(4, "tmp (command) = '%s'", tmp);
     if (!system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         return(TRUE);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (FALSE);
 }
@@ -1228 +1230 @@
          ("/sbin/sysctl -n kern.osreldate")) < 500000) {
         do {
-            paranoid_free(mddevice);
-            asprintf(&mddevice, "vn%ic", vndev++);
-
-            paranoid_free(command);
-            asprintf(&command, "vnconfig %s %s", mddevice, fname);
+            mr_free(mddevice);
+            mr_asprintf(&mddevice, "vn%ic", vndev++);
+
+            mr_free(command);
+            mr_asprintf(&command, "vnconfig %s %s", mddevice, fname);
 
             if (vndev > 10) {
-                paranoid_free(command);
-                paranoid_free(mddevice);
+                mr_free(command);
+                mr_free(mddevice);
                 return NULL;
             }
         }
         while (system(command));
-        paranoid_free(command);
-    } else {
-        asprintf(&command, "mdconfig -a -t vnode -f %s", fname);
-        asprintf(&mddevice, call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+    } else {
+        mr_asprintf(&command, "mdconfig -a -t vnode -f %s", fname);
+        mr_asprintf(&mddevice, call_program_and_get_last_line_of_output(command));
+        mr_free(command);
 
         if (!strstr(mddevice, "md")) {
-            paranoid_free(mddevice);
+            mr_free(mddevice);
             return NULL;
         }
     }
-    asprintf(&device, "/dev/%s", mddevice);
-    paranoid_free(mddevice);
+    mr_asprintf(&device, "/dev/%s", mddevice);
+    mr_free(mddevice);
     return(device);
 }
@@ -1278 +1280 @@
         (call_program_and_get_last_line_of_output
          ("/sbin/sysctl -n kern.osreldate")) < 500000) {
-        asprintf(&command, "vnconfig -d %s", dname);
+        mr_asprintf(&command, "vnconfig -d %s", dname);
         ret = system(command);
-        paranoid_free(command);
+        mr_free(command);
         return(ret);
     } else {
-        asprintf(&command, "mdconfig -d -u %s", dname);
+        mr_asprintf(&command, "mdconfig -d -u %s", dname);
         ret = system(command);
-        paranoid_free(command);
+        mr_free(command);
         return(ret);
     }
@@ -1327 +1329 @@
     }
 
-    asprintf(&tmp, "mkdir -p " MNT_CDROM);
+    mr_asprintf(&tmp, "mkdir -p " MNT_CDROM);
     run_program_and_log_output(tmp, 5);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
@@ -1341 +1343 @@
         }
         system("mkdir -p /tmp/isodir &> /dev/null");
-        asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
+        mr_asprintf(&tmp, "%s/%s/%s-%d.iso", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir, bkpinfo->prefix,
                 cd_number_i_want);
         if (!does_file_exist(tmp)) {
-            paranoid_free(tmp);
-            asprintf(&tmp, "/tmp/isodir/%s/%s-%d.iso",
+            mr_free(tmp);
+            mr_asprintf(&tmp, "/tmp/isodir/%s/%s-%d.iso",
                     bkpinfo->nfs_remote_dir, bkpinfo->prefix,
                     cd_number_i_want);
@@ -1353 +1355 @@
                         "FIXME - hacking bkpinfo->isodir from '%s' to /tmp/isodir",
                         bkpinfo->isodir);
-                paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
+                mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
             }
         }
@@ -1360 +1362 @@
             fatal_error("Mommy!");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     if ((res = what_number_cd_is_this(bkpinfo)) != cd_number_i_want) {
         log_msg(3, "Currently, we hold %d but we want %d", res,
                 cd_number_i_want);
-        asprintf(&tmp, "Insisting on %s #%d",
+        mr_asprintf(&tmp, "Insisting on %s #%d",
                 bkpinfo->backup_media_string,
                 cd_number_i_want);
-        asprintf(&request, "Please insert %s #%d and press Enter.",
+        mr_asprintf(&request, "Please insert %s #%d and press Enter.",
                 bkpinfo->backup_media_string,
                 cd_number_i_want);
         log_msg(3, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         while (what_number_cd_is_this(bkpinfo) != cd_number_i_want) {
@@ -1399 +1401 @@
             sync();
         }
-        paranoid_free(request);
+        mr_free(request);
 
         log_msg(1, "Thankyou. Proceeding...");
@@ -1494 +1496 @@
                 finish(1);
             }
-            asprintf(&comment, _("What speed is your %s (re)writer?"),
+            mr_asprintf(&comment, _("What speed is your %s (re)writer?"),
                     bkpinfo->backup_media_string);
             if (bkpinfo->backup_media_type == dvd) {
-                paranoid_free(bkpinfo->media_device);
+                mr_free(bkpinfo->media_device);
                 bkpinfo->media_device = find_dvd_device();
-                asprintf(&tmp, "1");
-                asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+                mr_asprintf(&tmp, "1");
+                mr_asprintf(&sz_size, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
-                paranoid_alloc(bkpinfo->media_device,VANILLA_SCSI_CDROM );
-                asprintf(&tmp, "4");
-                asprintf(&sz_size, "650");
+                mr_allocstr(bkpinfo->media_device,VANILLA_SCSI_CDROM );
+                mr_asprintf(&tmp, "4");
+                mr_asprintf(&sz_size, "650");
                 log_msg(1, "Setting to CD defaults");
             }
@@ -1514 +1516 @@
                 }
             }
-            paranoid_free(comment);
+            mr_free(comment);
 
             bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
-            paranoid_free(tmp);
-
-            asprintf(&comment,
+            mr_free(tmp);
+
+            mr_asprintf(&comment,
                     _("How much data (in Megabytes) will each %s store?"),
                     bkpinfo->backup_media_string);
@@ -1527 +1529 @@
                 finish(1);
             }
-            paranoid_free(comment);
+            mr_free(comment);
 
             for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
                 bkpinfo->media_size[i] = atoi(sz_size);
             }
-            paranoid_free(sz_size);
+            mr_free(sz_size);
 
             if (bkpinfo->media_size[0] <= 0) {
@@ -1541 +1543 @@
     case cdstream:
         if (bkpinfo->disaster_recovery) {
-            paranoid_alloc(bkpinfo->media_device, "/dev/cdrom");
+            mr_allocstr(bkpinfo->media_device, "/dev/cdrom");
             log_msg(2, "CD-ROM device assumed to be at %s",
                     bkpinfo->media_device);
@@ -1547 +1549 @@
                    || bkpinfo->backup_media_type == dvd) {
             if (bkpinfo->media_device == NULL) {
-                asprintf(&bkpinfo->media_device, "/dev/cdrom");
+                mr_asprintf(&bkpinfo->media_device, "/dev/cdrom");
             }                   // just for the heck of it :)
             log_msg(1, "bkpinfo->media_device = %s",
@@ -1554 +1556 @@
             if ((bkpinfo->backup_media_type == dvd)
                 || (tmp != NULL)) {
-                paranoid_alloc(bkpinfo->media_device, tmp);
+                mr_allocstr(bkpinfo->media_device, tmp);
                 log_msg(1, "bkpinfo->media_device = %s",
                         bkpinfo->media_device);
-                asprintf(&comment,
+                mr_asprintf(&comment,
                         _("Please specify your %s drive's /dev entry"),
                         bkpinfo->backup_media_string);
@@ -1565 +1567 @@
                     finish(1);
                 }
-                paranoid_free(comment);
-            }
-            paranoid_free(tmp);
+                mr_free(comment);
+            }
+            mr_free(tmp);
 
             log_msg(2, "%s device found at %s",
@@ -1575 +1577 @@
             bkpinfo->media_device = find_cdrw_device();
             if (bkpinfo->media_device != NULL) {
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                         _("I think I've found your %s burner at SCSI node %s; am I right on the money? Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen."),
                         bkpinfo->backup_media_string,
                         bkpinfo->media_device);
                 if (!ask_me_yes_or_no(tmp)) {
-                    paranoid_free(bkpinfo->media_device);
+                    mr_free(bkpinfo->media_device);
                 }
-                paranoid_free(tmp);
+                mr_free(tmp);
             } else {
                 if (g_kernel_version < 2.6) {
@@ -1613 +1615 @@
     case tape:
 
-        paranoid_free(bkpinfo->media_device);
+        mr_free(bkpinfo->media_device);
         if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
             log_msg(3, _("Ok, using vanilla scsi tape."));
-            paranoid_alloc(bkpinfo->media_device,VANILLA_SCSI_TAPE"0" );
+            mr_allocstr(bkpinfo->media_device,VANILLA_SCSI_TAPE"0" );
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
                 paranoid_fclose(fin);
             } else {
-                paranoid_alloc(bkpinfo->media_device,"/dev/osst0");
+                mr_allocstr(bkpinfo->media_device,"/dev/osst0");
             }
         }
@@ -1628 +1630 @@
             } else {
                 if (does_file_exist("/tmp/mondo-restore.cfg")) {
-                    paranoid_free(bkpinfo->media_device);
+                    mr_free(bkpinfo->media_device);
                     read_cfg_var("/tmp/mondo-restore.cfg", "media-dev",
                                  bkpinfo->media_device);
                 }
             }
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                     _("I think I've found your tape streamer at %s; am I right on the money?"),
                     bkpinfo->media_device);
             if (!ask_me_yes_or_no(tmp)) {
-                paranoid_free(bkpinfo->media_device);
-            }
-            paranoid_free(tmp);
+                mr_free(bkpinfo->media_device);
+            }
+            mr_free(tmp);
         } else {
             if (!popup_and_get_string
@@ -1649 +1651 @@
             }
         }
-        asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
+        mr_asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
         if (run_program_and_log_output(tmp, FALSE)) {
             log_to_screen(_("User has not specified a valid /dev entry"));
             finish(1);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         log_msg(4, "sz_size = %s", sz_size);
-        paranoid_free(sz_size);
+        mr_free(sz_size);
         bkpinfo->media_size[0] = 0;
         log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
@@ -1708 +1710 @@
             if (bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] == '/')
                 bkpinfo->nfs_mount[strlen(bkpinfo->nfs_mount) - 1] = '\0';
-            asprintf(&command, "mount | grep \"%s \" | cut -d' ' -f3",
+            mr_asprintf(&command, "mount | grep \"%s \" | cut -d' ' -f3",
                     bkpinfo->nfs_mount);
-            paranoid_free(bkpinfo->isodir);
+            mr_free(bkpinfo->isodir);
             bkpinfo->isodir = call_program_and_get_last_line_of_output(command);
-            paranoid_free(command);
-
-            asprintf(&comment,
+            mr_free(command);
+
+            mr_asprintf(&comment,
                     _("How much data (in Megabytes) will each media store?"));
             if (!popup_and_get_string(_("Size"), comment, sz_size)) {
@@ -1727 +1729 @@
                 finish(1);
             }
-            paranoid_free(comment);
+            mr_free(comment);
         }
         if (bkpinfo->disaster_recovery) {
@@ -1739 +1741 @@
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
-            paranoid_free(bkpinfo->isodir);
-            asprintf(&bkpinfo->isodir, "/tmp/isodir.mondo.%d",
+            mr_free(bkpinfo->isodir);
+            mr_asprintf(&bkpinfo->isodir, "/tmp/isodir.mondo.%d",
                     (int) (random() % 32768));
-            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);
-
-            asprintf(&tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount,
+            mr_free(command);
+
+            mr_asprintf(&tmp, "mount -t nfs -o nolock %s %s", bkpinfo->nfs_mount,
                     bkpinfo->isodir);
             run_program_and_log_output(tmp, 5);
-            paranoid_free(tmp);
-            asprintf(&g_selfmounted_isodir, bkpinfo->isodir);
+            mr_free(tmp);
+            mr_asprintf(&g_selfmounted_isodir, bkpinfo->isodir);
         }
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
@@ -1763 +1765 @@
         }
 
-        asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
+        mr_asprintf(&command, "echo hi > '%s/%s/.dummy.txt'", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
         while (run_program_and_log_output(command, FALSE)) {
-            asprintf(&prompt,
+            mr_asprintf(&prompt,
                      _("Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup."),
                      bkpinfo->nfs_remote_dir, bkpinfo->isodir);
@@ -1774 +1776 @@
                 finish(1);
             }
-            paranoid_free(prompt);
-
-            paranoid_free(command);
-            asprintf(&command, "echo hi > %s/%s/.dummy.txt",
+            mr_free(prompt);
+
+            mr_free(command);
+            mr_asprintf(&command, "echo hi > %s/%s/.dummy.txt",
                      bkpinfo->isodir, bkpinfo->nfs_remote_dir);
         }
-        paranoid_free(command);
+        mr_free(command);
 
         if (!popup_and_get_string
@@ -1845 +1847 @@
 
         if (bkpinfo->boot_device) {
-            paranoid_free(bkpinfo->boot_device);
+            mr_free(bkpinfo->boot_device);
         }
 #ifdef __FreeBSD__
@@ -1903 +1905 @@
         }
         bkpinfo->boot_loader = i;
-        asprintf(&bkpinfo->include_paths, "/");
+        mr_asprintf(&bkpinfo->include_paths, "/");
         if (!popup_and_get_string
             (_("Backup paths"),
@@ -1916 +1918 @@
             if (bkpinfo->exclude_paths != NULL) {
                 tmp1 = bkpinfo->exclude_paths;
-                asprintf(&bkpinfo->exclude_paths, "%s %s", tmp1, tmp);
-                paranoid_free(tmp1);
+                mr_asprintf(&bkpinfo->exclude_paths, "%s %s", tmp1, tmp);
+                mr_free(tmp1);
             } else {
                 bkpinfo->exclude_paths = tmp;
             }
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 // NTFS 
         tmp = call_program_and_get_last_line_of_output
@@ -1936 +1938 @@
             if (bkpinfo->image_devs != NULL) {
                 tmp2 = bkpinfo->image_devs;
-                asprintf(&bkpinfo->image_devs, "%s %s", tmp2, tmp1);
-                paranoid_free(tmp2);
+                mr_asprintf(&bkpinfo->image_devs, "%s %s", tmp2, tmp1);
+                mr_free(tmp2);
             } else {
                 bkpinfo->image_devs = tmp1;
             }
-            paranoid_free(tmp1);
-        }
-        paranoid_free(tmp);
+            mr_free(tmp1);
+        }
+        mr_free(tmp);
 
         if (!popup_and_get_string
@@ -1961 +1963 @@
         if (!ask_me_yes_or_no
             (_("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))){
-            paranoid_alloc(bkpinfo->kernel_path, "FAILSAFE");
+            mr_allocstr(bkpinfo->kernel_path, "FAILSAFE");
         }
 #endif
@@ -1992 +1994 @@
     log_it("media size = %ld", bkpinfo->media_size[1]);
     log_it("media type = %s", bkpinfo->backup_media_string);
-    paranoid_free(tmp);
+    mr_free(tmp);
     log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
@@ -2024 +2026 @@
            ("mount -t coda,ncpfs,nfs,smbfs,cifs,afs,mvfs | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
     /* BERLIOS : Useless
-    asprintf(&exclude_these_devices,
+    mr_asprintf(&exclude_these_devices,
            call_program_and_get_last_line_of_output
            ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
@@ -2057 +2059 @@
 
     if (tmp[0] != '/') {
-        asprintf(&sz, "/%s", tmp);
-        paranoid_free(tmp);
+        mr_asprintf(&sz, "/%s", tmp);
+        mr_free(tmp);
         tmp = sz;
     }
@@ -2065 +2067 @@
     }
     i = (int) (random() % 32768);
-    paranoid_free(bkpinfo->tmpdir);
-    asprintf(&bkpinfo->tmpdir, "%s/mondo.tmp.%d", tmp, i);
+    mr_free(bkpinfo->tmpdir);
+    mr_asprintf(&bkpinfo->tmpdir, "%s/mondo.tmp.%d", tmp, i);
     log_it("bkpinfo->tmpdir is being set to %s", bkpinfo->tmpdir);
 
-    paranoid_free(bkpinfo->scratchdir);
-    asprintf(&bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp, i);
+    mr_free(bkpinfo->scratchdir);
+    mr_asprintf(&bkpinfo->scratchdir, "%s/mondo.scratch.%d", tmp, i);
     log_it("bkpinfo->scratchdir is being set to %s", bkpinfo->scratchdir);
 
-    asprintf(&g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
+    mr_asprintf(&g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
 
-    asprintf(&command, "rm -Rf %s/mondo.tmp.* %s/mondo.scratch.*", tmp, tmp);
-    paranoid_free(tmp);
+    mr_asprintf(&command, "rm -Rf %s/mondo.tmp.* %s/mondo.scratch.*", tmp, tmp);
+    mr_free(tmp);
 
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 }
 
@@ -2099 +2101 @@
     char *command;
 
-    paranoid_free(output);
+    mr_free(output);
     if (!dev || dev[0] == '\0') {
         return (FALSE);
@@ -2109 +2111 @@
         return (FALSE);
     }
-    asprintf(&command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null",
+    mr_asprintf(&command, "dd bs=%ld count=1 if=%s of=/dev/null &> /dev/null",
             512L, dev);
     if (!run_program_and_log_output(command, FALSE)
         && !run_program_and_log_output(command, FALSE)) {
-        asprintf(&output, dev);
+        mr_asprintf(&output, dev);
         log_msg(4, "Found it - %s", dev);
-        paranoid_free(command);
+        mr_free(command);
         return (TRUE);
     } else {
         log_msg(4, "It's not %s", dev);
-        paranoid_free(command);
+        mr_free(command);
         return (FALSE);
     }
@@ -2141 +2143 @@
     assert(bkpinfo != NULL);
     if (g_ISO_restore_mode) {
-        asprintf(&tmp, "mount | grep iso9660 | awk '{print $3;}'");
+        mr_asprintf(&tmp, "mount | grep iso9660 | awk '{print $3;}'");
 
         tmp1 = call_program_and_get_last_line_of_output(tmp);
-        paranoid_free(tmp);
-
-        asprintf(&mountdev, "%s/archives/THIS-CD-NUMBER", tmp1);
-        paranoid_free(tmp1);
+        mr_free(tmp);
+
+        mr_asprintf(&mountdev, "%s/archives/THIS-CD-NUMBER", tmp1);
+        mr_free(tmp1);
 
         tmp = last_line_of_file(mountdev);
         cd_number = atoi(tmp);
-        paranoid_free(mountdev);
-        paranoid_free(tmp);
+        mr_free(mountdev);
+        mr_free(tmp);
 
         return (cd_number);
@@ -2167 +2169 @@
     tmp = last_line_of_file(MNT_CDROM "/archives/THIS-CD-NUMBER");
     cd_number = atoi(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (cd_number);
 }
@@ -2190 +2192 @@
            ("mount | grep \" on / \" | cut -d' ' -f1 | sed s/[0-9]// | sed s/[0-9]//");
     if (strstr(tmp, "/dev/cciss/")) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         tmp = call_program_and_get_last_line_of_output
                ("mount | grep \" on / \" | cut -d' ' -f1 | cut -dp -f1");
     }
     if (strstr(tmp, "/dev/md")) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         tmp = call_program_and_get_last_line_of_output
                ("mount | grep \" on / \" | cut -d' ' -f1");
@@ -2278 +2280 @@
 #endif
     assert(which_device != NULL);
-    asprintf(&list_drives_cmd,
+    mr_asprintf(&list_drives_cmd,
             "parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s",
             where_is_root_mounted());
@@ -2285 +2287 @@
     if (!(pdrives = popen(list_drives_cmd, "r"))) {
         log_OS_error("Unable to open list of drives");
-        paranoid_free(list_drives_cmd);
+        mr_free(list_drives_cmd);
         return ('\0');
     }
-    paranoid_free(list_drives_cmd);
-
-    for (getline(&current_drive, &n, pdrives); !feof(pdrives);
-         getline(&current_drive, &n, pdrives)) {
+    mr_free(list_drives_cmd);
+
+    for (mr_getline(&current_drive, &n, pdrives); !feof(pdrives);
+         mr_getline(&current_drive, &n, pdrives)) {
         strip_spaces(current_drive);
         log_it("looking at drive %s's MBR", current_drive);
         if (does_string_exist_in_boot_block(current_drive, "GRUB")) {
             count_grubs++;
-            paranoid_alloc(which_device,current_drive);
+            mr_allocstr(which_device,current_drive);
             break;
         }
         if (does_string_exist_in_boot_block(current_drive, "LILO")) {
             count_lilos++;
-            paranoid_alloc(which_device,current_drive);
+            mr_allocstr(which_device,current_drive);
             break;
         }
@@ -2371 +2373 @@
         log_it
             ("resolve_softlinks_to_get_to_actual_device_file --- device not found");
-        asprintf(&output, incoming);
-    } else {
-        asprintf(&curr_fname, incoming);
+        mr_asprintf(&output, incoming);
+    } else {
+        mr_asprintf(&curr_fname, incoming);
         lstat(curr_fname, &statbuf);
         while (S_ISLNK(statbuf.st_mode)) {
             log_msg(1, "curr_fname = %s", curr_fname);
-            asprintf(&command, "file %s", curr_fname);
+            mr_asprintf(&command, "file %s", curr_fname);
             tmp = call_program_and_get_last_line_of_output(command);
-            paranoid_free(command);
+            mr_free(command);
 
             for (p = tmp + strlen(tmp); p != tmp && *p != '`' && *p != ' ';
                  p--);
             p++;
-            asprintf(&scratch, p);
+            mr_asprintf(&scratch, p);
             for (p = scratch; *p != '\0' && *p != '\''; p++);
             *p = '\0';
             log_msg(0, "curr_fname %s --> '%s' --> %s", curr_fname, tmp, scratch);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             if (scratch[0] == '/') {
-                paranoid_free(curr_fname);
-                asprintf(&curr_fname, scratch); // copy whole thing because it's an absolute softlink
+                mr_free(curr_fname);
+                mr_asprintf(&curr_fname, scratch);  // copy whole thing because it's an absolute softlink
             } else {            // copy over the basename cos it's a relative softlink
                 p = curr_fname + strlen(curr_fname);
@@ -2402 +2404 @@
                 }
                 *p = '\0';
-                asprintf(&tmp, "%s%s", curr_fname, scratch);
-                paranoid_free(curr_fname);
+                mr_asprintf(&tmp, "%s%s", curr_fname, scratch);
+                mr_free(curr_fname);
                 curr_fname = tmp;
             }
-            paranoid_free(scratch);
+            mr_free(scratch);
             lstat(curr_fname, &statbuf);
         }
-        asprintf(&output, curr_fname);
+        mr_asprintf(&output, curr_fname);
         log_it("resolved %s to %s", incoming, output);
-        paranoid_free(curr_fname);
+        mr_free(curr_fname);
     }
     return (output);
@@ -2431 +2433 @@
 
     log_msg(0, "Looking for partition table format type");
-    asprintf(&fdisk, "/sbin/parted2fdisk");
+    mr_asprintf(&fdisk, "/sbin/parted2fdisk");
     log_msg(1, "Using %s", fdisk);
-    asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
-    paranoid_free(fdisk);
+    mr_asprintf(&command, "%s -l %s | grep 'EFI GPT'", fdisk, drive);
+    mr_free(fdisk);
 
     tmp = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (strstr(tmp, "GPT") == NULL) {
-        asprintf(&output, "MBR");
-    } else {
-        asprintf(&output, "GPT");
-    }
-    paranoid_free(tmp);
+        mr_asprintf(&output, "MBR");
+    } else {
+        mr_asprintf(&output, "GPT");
+    }
+    mr_free(tmp);
     log_msg(0, "Found %s partition table format type", output);
     return (output);

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

@@ -28 +28 @@
 #include "mondostructures.h"
 #include "libmondo.h"
+#include "mr_mem.h"
 
 /**
@@ -82 +83 @@
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert(direction == 'w' || direction == 'r');
-    asprintf(&sz_dir, "%c", direction);
+    mr_asprintf(&sz_dir, "%c", direction);
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
@@ -88 +89 @@
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "dd if=/dev/zero bs=1024 count=16k 2> /dev/null | buffer -o /dev/null -s %ld -m %d%c",
                  internal_tape_block_size, bufsize, 'm');
         res = run_program_and_log_output(tmp, 2);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     if (!res) {
         bufsize++;
-        asprintf(&tmp, _("Negotiated max buffer of %d MB "), bufsize);
+        mr_asprintf(&tmp, _("Negotiated max buffer of %d MB "), bufsize);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         bufsize = 0;
@@ -111 +112 @@
     }
     if (bufsize) {
-        asprintf(&g_sz_call_to_buffer,
+        mr_asprintf(&g_sz_call_to_buffer,
                  "buffer -m %d%c -p%d -B -s%ld -%c %s 2>> %s", bufsize,
                  'm', (direction == 'r') ? 20 : 75,
                  internal_tape_block_size, keych, device, MONDO_LOGFILE);
     } else {
-        asprintf(&g_sz_call_to_buffer, "dd bs=%ld %cf=%s",
+        mr_asprintf(&g_sz_call_to_buffer, "dd bs=%ld %cf=%s",
                  internal_tape_block_size, keych, device);
     }
     log_msg(2, "Calling buffer --- command = '%s'", g_sz_call_to_buffer);
     fres = popen(g_sz_call_to_buffer, sz_dir);
-    paranoid_free(sz_dir);
+    mr_free(sz_dir);
     if (fres) {
         log_msg(2, "Successfully opened ('%c') tape device %s", direction,
@@ -130 +131 @@
     }
     sleep(2);
-    asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
+    mr_asprintf(&tmp, "ps %s | grep \"%s\"", ps_options, g_sz_call_to_buffer);
     if (run_program_and_log_output(tmp, 2)) {
         log_msg(2, "Warning - I think I failed to open tape, actually.");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     g_tape_buffer_size_MB = bufsize;
-    asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
+    mr_asprintf(&tmp, "ps %s | grep buffer | grep -v grep", ps_options);
     if (run_program_and_log_output(tmp, 1)) {
         fres = NULL;
@@ -143 +144 @@
         log_to_screen(_("Buffer successfully started."));
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (fres);
 }
@@ -157 +158 @@
 
     sync();
-    asprintf(&command,
+    mr_asprintf(&command,
             "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $1;}' | grep -v PID | tr -s '\n' ' ' | awk '{ print $1; }'", ps_options,
             g_sz_call_to_buffer);
-    paranoid_free(g_sz_call_to_buffer);
+    mr_free(g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);
 
     tmp = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
 
-    asprintf(&command, "kill %s", tmp);
+    mr_asprintf(&command, "kill %s", tmp);
     log_msg(2, "kill_buffer() --- command = %s", command);
 
@@ -172 +173 @@
         run_program_and_log_output(command, TRUE);
     }
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(tmp);
+    mr_free(command);
 }
 

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

@@ -17 +17 @@
 #include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "mr_string.h"
+#include "mr_str.h"
+#include "mr_mem.h"
 
 #include <time.h>
@@ -102 +103 @@
     { i=0; log_to_screen ("This will take more time. Please be patient."); }
 */
-    asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
+    mr_asprintf(&filelist, "%s/archives/filelist.full", bkpinfo->scratchdir);
     if (!does_file_exist(filelist)) {
         log_it("filelist %s not found", filelist);
@@ -111 +112 @@
         chop_filelist(filelist, bkpinfo->tmpdir,
                       bkpinfo->optimal_set_size);
-    paranoid_free(filelist);
+    mr_free(filelist);
 
     estimate_noof_media_required(bkpinfo, noof_sets);   // for cosmetic purposes
 
-    asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(&tempfile, "%s/biggielist.txt", bkpinfo->tmpdir);
     if (!(fout = fopen(tempfile, "a"))) {
         log_OS_error("Cannot append to biggielist");
         retval++;
     }
-    paranoid_free(tempfile);
+    mr_free(tempfile);
     log_it(bkpinfo->image_devs);
 
@@ -126 +127 @@
 
     while (ptr && *ptr) {
-        asprintf(&dev, ptr);
+        mr_asprintf(&dev, ptr);
         log_it("Examining imagedev %s", dev);
         for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
@@ -135 +136 @@
         fprintf(fout, "%s\n", dev);
         log_it("Adding '%s' to biggielist", dev);
-        paranoid_free(dev);
+        mr_free(dev);
 
         if ((ptr = strchr(ptr, ' '))) {
@@ -156 +157 @@
 
     log_msg(1, "Sorting file %s", orig_fname);
-    asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
+    mr_asprintf(&tmp_fname, "/tmp/sort.%d.%d.%d", (int) (random() % 32768),
              (int) (random() % 32768), (int) (random() % 32768));
 
@@ -163 +164 @@
     }                           // no sense in trying to sort an empty file
 
-    asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
+    mr_asprintf(&command, "sort %s > %s 2>> %s", orig_fname, tmp_fname,
              MONDO_LOGFILE);
     retval = system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (retval) {
@@ -173 +174 @@
         log_msg(2, "Sorted %s --> %s OK. Copying it back to %s now",
                 orig_fname, tmp_fname, orig_fname);
-        asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
+        mr_asprintf(&command, "mv -f %s %s", tmp_fname, orig_fname);
         retval += run_program_and_log_output(command, 2);
-        paranoid_free(command);
+        mr_free(command);
 
         if (retval) {
@@ -184 +185 @@
         }
     }
-    paranoid_free(tmp_fname);
+    mr_free(tmp_fname);
     log_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
@@ -248 +249 @@
     curr_set_no = 0;
     curr_set_size = 0;
-    asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
-    asprintf(&biggie_fname, "%s/biggielist.txt", outdir);
+    mr_asprintf(&outfname, "%s/filelist.%ld", outdir, curr_set_no);
+    mr_asprintf(&biggie_fname, "%s/biggielist.txt", outdir);
     log_it("outfname=%s; biggie_fname=%s", outfname, biggie_fname);
     if (!(fbig = fopen(biggie_fname, "w"))) {
@@ -259 +260 @@
         return (0);
     }
-    (void) getline(&incoming, &n, fin);
+    mr_getline(&incoming, &n, fin);
     while (!feof(fin)) {
         lino++;
@@ -286 +287 @@
                 paranoid_fclose(fout);
                 sort_file(outfname);
-                paranoid_free(outfname);
+                mr_free(outfname);
 
                 curr_set_no++;
                 curr_set_size = 0;
-                asprintf(&outfname, "%s/filelist.%ld", outdir,
+                mr_asprintf(&outfname, "%s/filelist.%ld", outdir,
                          curr_set_no);
                 if (!(fout = fopen(outfname, "w"))) {
@@ -299 +300 @@
             }
         }
-        (void) getline(&incoming, &n, fin);
+        mr_getline(&incoming, &n, fin);
     }
     paranoid_fclose(fin);
@@ -312 +313 @@
     sort_file(outfname);
     sort_file(biggie_fname);
-    paranoid_free(biggie_fname);
-    paranoid_free(outfname);
-
-    asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", outdir);
-    asprintf(&tmp, "%ld", curr_set_no);
+    mr_free(biggie_fname);
+    mr_free(outfname);
+
+    mr_asprintf(&outfname, "%s/LAST-FILELIST-NUMBER", outdir);
+    mr_asprintf(&tmp, "%ld", curr_set_no);
     if (write_one_liner_data_file(outfname, tmp)) {
         log_OS_error
@@ -322 +323 @@
         return (0);
     }
-    paranoid_free(outfname);
-    paranoid_free(tmp);
+    mr_free(outfname);
+    mr_free(tmp);
 
     if (curr_set_no == 0) {
-        asprintf(&tmp, "Only one fileset. Fine.");
+        mr_asprintf(&tmp, "Only one fileset. Fine.");
     } else {
-        asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
+        mr_asprintf(&tmp, "Filelist divided into %ld sets", curr_set_no + 1);
     }
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -391 +392 @@
     }
     filelist->ch = '\0';
-    paranoid_free(filelist);
+    mr_free((void *)filelist);
     depth--;
     if (depth == 0) {
@@ -416 +417 @@
         return (2);
     }
-    for (getline(&tmp, &n, pattr); !feof(pattr); getline(&tmp, &n, pattr)) {
+    for (mr_getline(&tmp, &n, pattr); !feof(pattr); mr_getline(&tmp, &n, pattr)) {
         fputs(tmp, pout);
     }
     paranoid_pclose(pattr);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }
@@ -432 +433 @@
     char *pout_command;
     char *syscall;
-    char *tmp;
     char *file_to_analyze = NULL;
     int i;
@@ -441 +441 @@
         return (1);
     }
-    asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
+    mr_asprintf(&pout_command, "gzip -c1 > %s", auxlist_fname);
     if (!(pout = popen(pout_command, "w"))) {
         log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
         fclose(fin);
-        paranoid_free(pout_command);
+        mr_free(pout_command);
         return (4);
     }
-    paranoid_free(pout_command);
-
-    for (getline(&file_to_analyze, &n, fin); !feof(fin);
-         getline(&file_to_analyze, &n, fin)) {
+    mr_free(pout_command);
+
+    for (mr_getline(&file_to_analyze, &n, fin); !feof(fin);
+         mr_getline(&file_to_analyze, &n, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -458 +458 @@
         log_msg(8, "Analyzing %s", file_to_analyze);
         /* BERLIOS : to be checked */
-        asprintf(&syscall, "%s %s 2>> /dev/null", syscall_sprintf,mr_stresc(file_to_analyze, "`$\\\"", '\\'));
+        mr_asprintf(&syscall, "%s %s 2>> /dev/null", syscall_sprintf,mr_stresc(file_to_analyze, "`$\\\"", '\\'));
         call_exe_and_pipe_output_to_fd(syscall, pout);
-        paranoid_free(syscall);
+        mr_free(syscall);
     }
     paranoid_fclose(fin);
     paranoid_pclose(pout);
-    paranoid_free(file_to_analyze);
+    mr_free(file_to_analyze);
     return (0);
 }
@@ -475 +475 @@
     int retval = 0;
 
-    asprintf(&command, "touch %s", facl_fname);
+    mr_asprintf(&command, "touch %s", facl_fname);
     run_program_and_log_output(command, 8);
-    paranoid_free(command);
+    mr_free(command);
 
     tmp = find_home_of_exe("getfacl");
     if (tmp) {
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
-        asprintf(&command,
+        mr_asprintf(&command,
                  "getfacl --all-effective -P %s 2>> %s | gzip -c1 > %s 2>> %s",
                  filelist, MONDO_LOGFILE, facl_fname, MONDO_LOGFILE);
         iamhere(command);
         retval = system(command);
-        paranoid_free(command);
-    }
-    paranoid_free(tmp);
+        mr_free(command);
+    }
+    mr_free(tmp);
     return (retval);
 }
@@ -500 +500 @@
     int retval = 0;
 
-    asprintf(&command, "touch %s", fattr_fname);
+    mr_asprintf(&command, "touch %s", fattr_fname);
     run_program_and_log_output(command, 8);
-    paranoid_free(command);
+    mr_free(command);
 
     tmp = find_home_of_exe("getfattr");
@@ -511 +511 @@
                          fattr_fname);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -531 +531 @@
       retval = system(command);
     }
-  paranoid_free(command);
+  mr_free(command);
   return(retval);
 }
@@ -557 +557 @@
         log_msg(1,
                 "No masklist provided. I shall therefore set ALL attributes.");
-        asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s",
+        mr_asprintf(&command, "gzip -dc %s | %s --restore - 2>> %s",
                  original_exat_fname, executable, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         retval = system(command);
-        paranoid_free(command);
+        mr_free(command);
         log_msg(1, "Returning w/ retval=%d", retval);
         return (retval);
@@ -571 +571 @@
         return (0);
     }
-    asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
+    mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
              (int) (random() % 32768));
-    asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
+    mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
 
     sort_file(masklist);
-    asprintf(&syscall_pin, "gzip -dc %s", original_exat_fname);
-    asprintf(&syscall_pout, "%s --restore - 2>> %s", executable,
+    mr_asprintf(&syscall_pin, "gzip -dc %s", original_exat_fname);
+    mr_asprintf(&syscall_pout, "%s --restore - 2>> %s", executable,
              MONDO_LOGFILE);
 
@@ -589 +589 @@
         return (1);
     }
-    paranoid_free(syscall_pout);
+    mr_free(syscall_pout);
 
     pin = popen(syscall_pin, "r");
@@ -597 +597 @@
         return (1);
     }
-    paranoid_free(syscall_pin);
+    mr_free(syscall_pin);
 
     faclin = fopen(masklist, "r");
@@ -608 +608 @@
 //  printf("Hi there. Starting the loop\n");
 
-    getline(&current_subset_file, &n, faclin);
-    getline(&incoming, &n, pin);
+    mr_getline(&current_subset_file, &n, faclin);
+    mr_getline(&incoming, &n, pin);
     while (!feof(pin) && !feof(faclin)) {
 //      printf("incoming = %s", incoming);
 
-        asprintf(&current_master_file, incoming + 8);
+        mr_asprintf(&current_master_file, incoming + 8);
 
         p = current_subset_file;
@@ -641 +641 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            getline(&current_subset_file, &n, faclin);
+            mr_getline(&current_subset_file, &n, faclin);
             continue;
         }
@@ -648 +648 @@
             fputs(incoming, pout);
         }
-        getline(&incoming, &n, pin);
+        mr_getline(&incoming, &n, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
@@ -661 +661 @@
                 fputs(incoming, pout);
             }
-            getline(&incoming, &n, pin);
+            mr_getline(&incoming, &n, pin);
         }
         if (!i) {
-            getline(&current_subset_file, &n, faclin);
-        }
-        paranoid_free(current_master_file);
-    }
-    paranoid_free(current_subset_file);
+            mr_getline(&current_subset_file, &n, faclin);
+        }
+        mr_free(current_master_file);
+    }
+    mr_free(current_subset_file);
 
     while (!feof(pin)) {
-        getline(&incoming, &n, pin);
-    }
-    paranoid_free(incoming);
+        mr_getline(&incoming, &n, pin);
+    }
+    mr_free(incoming);
     fclose(faclin);
     pclose(pin);
@@ -681 +681 @@
 
     unlink(masklist);
-    paranoid_free(masklist);
+    mr_free(masklist);
 
     return (retval);
@@ -719 +719 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
+    mr_asprintf(&cfg_fname, "%s/mondo-restore.cfg", bkpinfo->tmpdir);
     read_cfg_var(cfg_fname, "last-filelist-number", val_sz);
     val_i = atoi(val_sz);
-    paranoid_free(val_sz);
+    mr_free(val_sz);
 
     if (val_i <= 0) {
         val_i = 500;
     }
-    paranoid_free(cfg_fname);
+    mr_free(cfg_fname);
     return (val_i);
 }
@@ -866 +866 @@
     }
     log_to_screen(_("Loading filelist"));
-    asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
-    asprintf(&tmp, "zcat %s | wc -l", filelist_fname);
+    mr_asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
+    mr_asprintf(&tmp, "zcat %s | wc -l", filelist_fname);
     log_msg(6, "tmp = %s", tmp);
     tmp1 = call_program_and_get_last_line_of_output(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     lines_in_filelist = atol(tmp1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     if (lines_in_filelist < 3) {
@@ -893 +893 @@
         return (NULL);
     }
-    paranoid_free(command_to_open_fname);
+    mr_free(command_to_open_fname);
 
     open_evalcall_form(_("Loading filelist from disk"));
-    for (getline(&fname, &n, pin); !feof(pin); getline(&fname, &n, pin)) {
+    for (mr_getline(&fname, &n, pin); !feof(pin); mr_getline(&fname, &n, pin)) {
         if ((fname[strlen(fname) - 1] == 13
              || fname[strlen(fname) - 1] == 10) && strlen(fname) > 0) {
@@ -908 +908 @@
                 continue;
             }
-            asprintf(&tmp, fname);
+            mr_asprintf(&tmp, fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         add_string_at_node(filelist, fname);
@@ -921 +921 @@
         }
     }
-    paranoid_free(fname);
+    mr_free(fname);
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -1352 +1352 @@
     if (!depth) {
         malloc_string(find_skeleton_marker);
-        asprintf(&find_excludes, " ");
+        mr_asprintf(&find_excludes, " ");
         while((token = mr_strtok (sth, delims, &lastpos))) {
-          asprintf(&strtmp,"%s", find_excludes);
-          paranoid_free(find_excludes);
-          asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
-          paranoid_free(strtmp);
-          paranoid_free(token);
+          mr_asprintf(&strtmp,"%s", find_excludes);
+          mr_free(find_excludes);
+          mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          mr_free(strtmp);
+          mr_free(token);
         }
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o %s -type d -print > %s 2> /dev/null",
              dir, MAX_SKEL_DEPTH, find_excludes, skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        asprintf(&strtmp,
+        mr_asprintf(&strtmp,
              "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
                 dir, MAX_SKEL_DEPTH, find_excludes, skeleton_filelist);
 #endif
-        paranoid_free(find_excludes);
+        mr_free(find_excludes);
         log_msg(5, "find command = %s", strtmp);
         system(strtmp);
-        paranoid_free(strtmp);
-        paranoid_free(tmp);
-
-        asprintf(&tmp, "wc -l %s | awk '{print $1;}'", skeleton_filelist);
+        mr_free(strtmp);
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", skeleton_filelist);
         tmp1 = call_program_and_get_last_line_of_output(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         g_skeleton_entries = 1 + atol(tmp1);
-        paranoid_free(tmp1);
-
-        asprintf(&name_of_evalcall_form, "Making catalog of %s", dir);
+        mr_free(tmp1);
+
+        mr_asprintf(&name_of_evalcall_form, "Making catalog of %s", dir);
         open_evalcall_form(name_of_evalcall_form);
         find_skeleton_marker[0] = '\0';
@@ -1410 +1410 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    asprintf(&tmp, _("Reading %-68s"), dir);
+                    mr_asprintf(&tmp, _("Reading %-68s"), dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 }
 #endif
@@ -1424 +1424 @@
 //  log_msg(0, "Cataloguing %s", dir);
     if (sth[0] == ' ') {
-        asprintf(&skip_these, "%s", sth);
+        mr_asprintf(&skip_these, "%s", sth);
     } else {
-        asprintf(&skip_these, " %s ", sth);
-    }
-    asprintf(&new_with_spaces, " %s ", dir);
+        mr_asprintf(&skip_these, " %s ", sth);
+    }
+    mr_asprintf(&new_with_spaces, " %s ", dir);
     if ((dip = opendir(dir)) == NULL) {
         log_OS_error("opendir");
@@ -1438 +1438 @@
             i++;
             if (strcmp(dir, "/")) {
-                asprintf(&new, "%s/%s", dir, dit->d_name);
+                mr_asprintf(&new, "%s/%s", dir, dit->d_name);
             } else {
-                asprintf(&new, "%s%s", dir, dit->d_name);
+                mr_asprintf(&new, "%s%s", dir, dit->d_name);
             }
-            paranoid_free(new_with_spaces);
-            asprintf(&new_with_spaces, " %s ", new);
+            mr_free(new_with_spaces);
+            mr_asprintf(&new_with_spaces, " %s ", new);
             /* BERLIOS: Old code
                new_with_spaces[0] = ' ';
@@ -1466 +1466 @@
                                 counter = 0;
                                 uberctr++;
-                                asprintf(&tmp, " %c ",
+                                mr_asprintf(&tmp, " %c ",
                                          special_dot_char(uberctr));
 #ifndef _XWIN
@@ -1474 +1474 @@
                                     newtRefresh();
                                 }
-                                paranoid_free(tmp);
+                                mr_free(tmp);
 #endif
                             }
@@ -1481 +1481 @@
                 }
             }
-            paranoid_free(new);
-        }
-    }
-    paranoid_free(new_with_spaces);
-    paranoid_free(skip_these);
+            mr_free(new);
+        }
+    }
+    mr_free(new_with_spaces);
+    mr_free(skip_these);
 
     if (dip) {
@@ -1495 +1495 @@
     if (!depth) {
         close_evalcall_form();
-        paranoid_free(name_of_evalcall_form);
-        paranoid_free(find_skeleton_marker);
+        mr_free(name_of_evalcall_form);
+        mr_free(find_skeleton_marker);
         unlink(skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
@@ -1565 +1565 @@
 
     // The pathname to the skeleton filelist, used to give better progress reporting for mondo_makefilelist().
-    asprintf(&sz_datefile, sz_datefile_wildcard, 0);
+    mr_asprintf(&sz_datefile, sz_datefile_wildcard, 0);
     if (!include_paths && !userdef_filelist) {
         fatal_error
@@ -1571 +1571 @@
     }
 // make hole for filelist
-    asprintf(&command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    paranoid_free(command);
-
-    asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
+    mr_free(command);
+
+    mr_asprintf(&sz_filelist, "%s/tmpfs/filelist.full", tmpdir);
     make_hole_for_file(sz_filelist);
 
     if (differential == 0) {
         // restore last good datefile if it exists
-        asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
+        mr_asprintf(&command, "cp -f %s.aborted %s", sz_datefile,
                  sz_datefile);
         run_program_and_log_output(command, 3);
-        paranoid_free(command);
+        mr_free(command);
 
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
+            mr_asprintf(&command, "mv -f %s %s.aborted", sz_datefile,
                      sz_datefile);
             paranoid_system(command);
-            paranoid_free(command);
+            mr_free(command);
         }
         make_hole_for_file(sz_datefile);
         tmp = call_program_and_get_last_line_of_output("date +%s");
         write_one_liner_data_file(sz_datefile, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else if (lstat(sz_datefile, &statbuf)) {
         log_msg(2,
@@ -1605 +1605 @@
         log_msg(2, "Differential backup. Yay.");
     }
-    paranoid_free(sz_datefile);
+    mr_free(sz_datefile);
 
 // use user-specified filelist (if specified)
@@ -1612 +1612 @@
                 "Using the user-specified filelist - %s - instead of calculating one",
                 userdef_filelist);
-        asprintf(&command, "cp -f %s %s", userdef_filelist, sz_filelist);
+        mr_asprintf(&command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {
             fatal_error("Failed to copy user-specified filelist");
         }
-        paranoid_free(command);
+        mr_free(command);
     } else {
         log_msg(2, "include_paths = '%s'", include_paths);
@@ -1623 +1623 @@
         tmp1 = call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null");
         tmp2 = call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null");
-        asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
+        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media/cdrom /media/cdrecorder \
 /proc /sys /tmp /var/cache/mondo /var/cache/mindi", excp, tmp, tmp1, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
-        paranoid_free(tmp);
-        paranoid_free(tmp1);
-        paranoid_free(tmp2);
+        mr_free(tmp);
+        mr_free(tmp1);
+        mr_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
         log_msg(2,
                 "Generating skeleton filelist so that we can track our progress");
-        asprintf(&skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
+        mr_asprintf(&skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(skeleton_filelist);
 
@@ -1661 +1661 @@
         }
         paranoid_fclose(fout);
-        paranoid_free(skeleton_filelist);
-        paranoid_free(exclude_paths);
+        mr_free(skeleton_filelist);
+        mr_free(exclude_paths);
     }
     log_msg(2, "Copying new filelist to scratchdir");
-    asprintf(&command, "mkdir -p %s/archives", scratchdir);
+    mr_asprintf(&command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
-    paranoid_free(command);
-
-    asprintf(&command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "cp -f %s %s/archives/", sz_filelist, scratchdir);
     paranoid_system(command);
-    paranoid_free(command);
-
-    asprintf(&command, "mv -f %s %s", sz_filelist, tmpdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "mv -f %s %s", sz_filelist, tmpdir);
     paranoid_system(command);
-    paranoid_free(command);
-    paranoid_free(sz_filelist);
+    mr_free(command);
+    mr_free(sz_filelist);
 
     log_msg(2, "Exiting");
@@ -1777 +1777 @@
     }
     while (!feof(fin)) {
-        getline(&fname, &len, fin);
+        mr_getline(&fname, &len, fin);
         if (!use_star) {
             if (fname[0] == '/') {
-                asprintf(&tmp, fname);
+                mr_asprintf(&tmp, fname);
             } else {
-                asprintf(&tmp, "/%s", fname);
+                mr_asprintf(&tmp, "/%s", fname);
             }
-            paranoid_free(fname);
+            mr_free(fname);
             fname = tmp;
         }
@@ -1796 +1796 @@
             if (found_node->selected) {
                 if (fname[0] == '/') {
-                    asprintf(&tmp, fname + 1);
-                    paranoid_free(fname);
+                    mr_asprintf(&tmp, fname + 1);
+                    mr_free(fname);
                     fname = tmp;
                 }
@@ -1803 +1803 @@
                 turn_wildcard_chars_into_literal_chars(tmp, fname);
                 fprintf(fout, "%s\n", tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 retval++;
             }
         }
-        paranoid_free(fname);
+        mr_free(fname);
     }
     paranoid_fclose(fout);
@@ -1836 +1836 @@
         return (1);
     }
-    for (getline(&tmp, &n, fin); !feof(fin); getline(&tmp, &n, fin)) {
+    for (mr_getline(&tmp, &n, fin); !feof(fin); mr_getline(&tmp, &n, fin)) {
         if (!tmp[0]) {
             continue;
@@ -1861 +1861 @@
     }
     paranoid_fclose(fin);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }

trunk/mondo/src/common/libmondo-files-EXT.h

@@ -48 +48 @@
 extern int read_one_liner_data_file(char *fname, char *contents);
 extern int mode_of_file(char *fname);
-extern void paranoid_alloc(char *alloc, char *orig);

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

@@ -18 +18 @@
 #include "libmondo-fork-EXT.h"
 #include "libmondo-string-EXT.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -59 +60 @@
 
     if (does_file_exist(filename)) {
-        asprintf(&command, "md5sum \"%s\"", filename);
+        mr_asprintf(&command, "md5sum \"%s\"", filename);
         fin = popen(command, "r");
-        paranoid_free(command);
+        mr_free(command);
 
         if (fin) {
-            (void) getline(&output, &n, fin);
+            mr_getline(&output, &n, fin);
             p = strchr(output, ' ');
             paranoid_pclose(fin);
         }
     } else {
-        asprintf(&tmp, "File '%s' not found; cannot calc checksum",
+        mr_asprintf(&tmp, "File '%s' not found; cannot calc checksum",
                 filename);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     if (p) {
@@ -106 +107 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (!does_file_exist(filename)) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 "%s does not exist, so I cannot found the number of lines in it",
                 filename);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
-    asprintf(&command, "cat %s | wc -l", filename);
+    mr_asprintf(&command, "cat %s | wc -l", filename);
     if (!does_file_exist(filename)) {
         return (-1);
     }
     fin = popen(command, "r");
-    paranoid_free(command);
+    mr_free(command);
 
     if (fin) {
@@ -124 +125 @@
             noof_lines = 0;
         } else {
-            (void) getline(&incoming, &n, fin);
+            mr_getline(&incoming, &n, fin);
             while (strlen(incoming) > 0
                    && incoming[strlen(incoming) - 1] < 32) {
@@ -130 +131 @@
             }
             noof_lines = atol(incoming);
-            paranoid_free(incoming);
+            mr_free(incoming);
         }
         paranoid_pclose(fin);
@@ -189 +190 @@
     assert_string_is_neither_NULL_nor_zerolength(inout);
 
-    asprintf(&infname, "%s.in", inout);
-
-    asprintf(&tmp, "cp -f %s %s", inout, infname);
+    mr_asprintf(&infname, "%s.in", inout);
+
+    mr_asprintf(&tmp, "cp -f %s %s", inout, infname);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!(fin = fopen(infname, "r"))) {
         log_OS_error("Unable to openin infname");
-        paranoid_free(infname);
+        mr_free(infname);
         return;
     }
 
-    asprintf(&outfname, "%s", inout);
+    mr_asprintf(&outfname, "%s", inout);
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
-        paranoid_free(outfname);
+        mr_free(outfname);
         return;
     }
-    paranoid_free(outfname);
-
-    for (getline(&incoming, &n, fin); !feof(fin);
-         getline(&incoming, &n, fin)) {
+    mr_free(outfname);
+
+    for (mr_getline(&incoming, &n, fin); !feof(fin);
+         mr_getline(&incoming, &n, fin)) {
         i = strlen(incoming) - 1;
         if (i >= 0 && incoming[i] < 32) {
@@ -218 +219 @@
             fprintf(fout, "%s\n", incoming);
         } else {
-            asprintf(&tmp, "Excluding '%s'-nonexistent\n", incoming);
+            mr_asprintf(&tmp, "Excluding '%s'-nonexistent\n", incoming);
             log_it(tmp);
-            paranoid_free(tmp);
-        }
-    }
-    paranoid_free(incoming);
+            mr_free(tmp);
+        }
+    }
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
     unlink(infname);
-    paranoid_free(infname);
+    mr_free(infname);
 }
 
@@ -249 +250 @@
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (kernel == NULL) {
-        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);
         if (strlen(tmp) > 1) {
@@ -255 +256 @@
             fatal_error("Mindi gave a fatal error. Please check '/var/log/mindi.log'.");
         }
-        paranoid_free(command);
-        paranoid_free(tmp);
+        mr_free(command);
+        mr_free(tmp);
     }
 
@@ -303 +304 @@
     assert_string_is_neither_NULL_nor_zerolength(fname);
 
-    asprintf(&command, "which %s 2> /dev/null", fname);
+    mr_asprintf(&command, "which %s 2> /dev/null", fname);
     incoming = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (incoming == NULL) {
@@ -311 +312 @@
             return (NULL);      // forget it :)
         }
-        asprintf(&command,
+        mr_asprintf(&command,
                 "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null",
                 incoming);
-        paranoid_free(incoming);
+        mr_free(incoming);
 
         incoming = call_program_and_get_last_line_of_output(command);
-        paranoid_free(command);
+        mr_free(command);
     }
     if (incoming == NULL)   // yes, it is == '\0' twice, not once :)
     {
-        asprintf(&command, "dirname %s 2> /dev/null", incoming);
-        paranoid_free(incoming);
+        mr_asprintf(&command, "dirname %s 2> /dev/null", incoming);
+        mr_free(incoming);
 
         incoming = call_program_and_get_last_line_of_output(command);
-        paranoid_free(command);
+        mr_free(command);
     }
     output = incoming;
@@ -332 +333 @@
         log_msg(4, "find_home_of_exe () --- Found %s at %s", fname, output);
     } else {
-        paranoid_free(output);
+        mr_free(output);
         log_msg(4, "find_home_of_exe() --- Could not find %s", fname);
     }
@@ -395 +396 @@
          && !strstr(err_log_lines[i], "% done"); i--);
     if (i < 0) {
-        asprintf(&command,
+        mr_asprintf(&command,
                 "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'",
                 filename, '%');
         lastline = call_program_and_get_last_line_of_output(command);
-        paranoid_free(command);
+        mr_free(command);
         if (!lastline) {
             return (0);
         }
     } else {
-        asprintf(&lastline, err_log_lines[i]);
+        mr_asprintf(&lastline, err_log_lines[i]);
     }
 
@@ -412 +413 @@
     }
     if (!p) {
-        paranoid_free(lastline);
+        mr_free(lastline);
         return (0);
     }
@@ -421 +422 @@
     }
     i = atoi(p);
-    paranoid_free(lastline);
+    mr_free(lastline);
 
     return (i);
@@ -447 +448 @@
 
     if (!does_file_exist(filename)) {
-        asprintf(&tmp, _("Tring to get last line of nonexistent file (%s)"),
+        mr_asprintf(&tmp, _("Tring to get last line of nonexistent file (%s)"),
                 filename);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (NULL);
     }
-    asprintf(&command, "tail -n1 %s", filename);
+    mr_asprintf(&command, "tail -n1 %s", filename);
     fin = popen(command, "r");
-    paranoid_free(command);
-
-    getline(&output, &n, fin);
+    mr_free(command);
+
+    mr_getline(&output, &n, fin);
     paranoid_pclose(fin);
     while (strlen(output) > 0 && output[strlen(output) - 1] < 32) {
@@ -504 +505 @@
 
     assert_string_is_neither_NULL_nor_zerolength(outdir_fname);
-    asprintf(&tmp, "mkdir -p %s", outdir_fname);
+    mr_asprintf(&tmp, "mkdir -p %s", outdir_fname);
     res = system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -532 +533 @@
     assert(!strstr(outfile_fname, "/dev/cdrom"));
 
-    asprintf(&command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
+    mr_asprintf(&command, "mkdir -p \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    paranoid_free(command);
-
-    asprintf(&command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
+    mr_free(command);
+
+    mr_asprintf(&command, "rmdir \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    paranoid_free(command);
-
-    asprintf(&command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
+    mr_free(command);
+
+    mr_asprintf(&command, "rm -f \"%s\" 2> /dev/null", outfile_fname);
     res += system(command);
-    paranoid_free(command);
+    mr_free(command);
     unlink(outfile_fname);
     return (0);
@@ -575 +576 @@
         return (0);
     }
-    (void) getline(&incoming, &n, fin);
+    mr_getline(&incoming, &n, fin);
     while (!feof(fin)) {
         if (strstr(incoming, wildcard)) {
             matches++;
         }
-        (void) getline(&incoming, &n, fin);
+        mr_getline(&incoming, &n, fin);
     }
     paranoid_fclose(fin);
-    paranoid_free(incoming);
+    mr_free(incoming);
     return (matches);
 }
@@ -603 +604 @@
     FILE *fin;
 
-    asprintf(&lockfile_fname, "/var/run/monitas-%s.pid", name_str);
+    mr_asprintf(&lockfile_fname, "/var/run/monitas-%s.pid", name_str);
     if (!pid) {
         log_it("Unregistering PID");
@@ -609 +610 @@
             log_it("Error unregistering PID");
         }
-        paranoid_free(lockfile_fname);
+        mr_free(lockfile_fname);
         return;
     }
     if (does_file_exist(lockfile_fname)) {
         if ((fin = fopen(lockfile_fname, "r"))) {
-            (void) getline(&tmp, &n, fin);
+            mr_getline(&tmp, &n, fin);
             paranoid_fclose(fin);
         } else {
@@ -620 +621 @@
         }
         pid = (pid_t) atol(tmp);
-        paranoid_free(tmp);
-
-        asprintf(&tmp, "ps %ld > /dev/null 2> /dev/null", (long int) pid);
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "ps %ld > /dev/null 2> /dev/null", (long int) pid);
         res = system(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         if (!res) {
             log_it
@@ -631 +632 @@
         }
     }
-    asprintf(&tmp, "echo %ld > %s 2> /dev/null", (long int) getpid(),
+    mr_asprintf(&tmp, "echo %ld > %s 2> /dev/null", (long int) getpid(),
             lockfile_fname);
-    paranoid_free(lockfile_fname);
+    mr_free(lockfile_fname);
 
     if (system(tmp)) {
         fatal_error("Cannot register PID");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return;
 }
@@ -655 +656 @@
     long file_len_K = 0L;
 
-    asprintf(&command,
+    mr_asprintf(&command,
             "grep '%s ' %s/mountlist.txt | head -n1 | awk '{print $4;}'",
             dev, tmpdir);
@@ -662 +663 @@
     file_len_K = atol(sz_res);
     log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
-    paranoid_free(command);
-    paranoid_free(sz_res);
+    mr_free(command);
+    mr_free(sz_res);
     return (file_len_K);
 }
@@ -692 +693 @@
 
     log_it("Calculating size of all biggiefiles (in total)");
-    asprintf(&biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
+    mr_asprintf(&biggielist, "%s/biggielist.txt", bkpinfo->tmpdir);
     log_it("biggielist = %s", biggielist);
     if (!(fin = fopen(biggielist, "r"))) {
@@ -699 +700 @@
     } else {
         log_msg(4, "Reading it...");
-        for (getline(&fname, &n, fin); !feof(fin);
-             getline(&fname, &n, fin)) {
+        for (mr_getline(&fname, &n, fin); !feof(fin);
+             mr_getline(&fname, &n, fin)) {
             if (fname[strlen(fname) - 1] <= 32) {
                 fname[strlen(fname) - 1] = '\0';
@@ -710 +711 @@
                         fatal_error("ntfsresize not found");
                     }
-                    paranoid_free(tmp);
-
-                    asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
+                    mr_free(tmp);
+
+                    mr_asprintf(&command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
                     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);
                     file_len_K = atoll(tmp) / 1024L;
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 } else {
                     file_len_K = get_phys_size_of_drive(fname) * 1024L;
@@ -731 +732 @@
                 log_msg(4, "%s --> %ld K", fname, file_len_K);
             }
-            asprintf(&comment,
+            mr_asprintf(&comment,
                     "After adding %s, scratchL+%ld now equals %ld", fname,
                     file_len_K, scratchL);
             log_msg(4, comment);
-            paranoid_free(comment);
+            mr_free(comment);
 
             if (feof(fin)) {
@@ -741 +742 @@
             }
         }
-        paranoid_free(fname);
-    }
-    paranoid_free(biggielist);
+        mr_free(fname);
+    }
+    mr_free(biggielist);
 
     log_it("Closing...");
@@ -771 +772 @@
     /*@ end vars *************************************************** */
 
-    asprintf(&command, "du -sk %s", mountpt);
+    mr_asprintf(&command, "du -sk %s", mountpt);
     errno = 0;
     fin = popen(command, "r");
@@ -778 +779 @@
       llres = 0;
     } else {
-        (void) getline(&tmp, &n, fin);
+        mr_getline(&tmp, &n, fin);
         paranoid_pclose(fin);
         p = strchr(tmp, '\t');
@@ -790 +791 @@
     }
 
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(tmp);
     return (llres);
 }
@@ -842 +843 @@
 
 
-    asprintf(&command, "which %s > /dev/null 2> /dev/null", fname);
+    mr_asprintf(&command, "which %s > /dev/null 2> /dev/null", fname);
     res = system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (res) {
-        asprintf(&errorstr,
+        mr_asprintf(&errorstr,
             _("Please install '%s'. I cannot find it on your system."),
             fname);
         log_to_screen(errorstr);
-        paranoid_free(errorstr);
+        mr_free(errorstr);
         log_to_screen
             (_("There may be an hyperlink at http://www.mondorescue.org which"));
@@ -949 +950 @@
     log_msg(4, "g_mondo_home='%s'", g_mondo_home);
     if ((g_mondo_home == NULL) || strlen(g_mondo_home) < 2) {
-        paranoid_free(g_mondo_home);
+        mr_free(g_mondo_home);
         g_mondo_home = find_and_store_mondoarchives_home();
     }
-    asprintf(&command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
+    mr_asprintf(&command, CP_BIN " --parents -pRdf %s %s", g_mondo_home,
             bkpinfo->scratchdir);
 
@@ -959 +960 @@
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
     }
-    paranoid_free(command);
-
-    asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
+    mr_free(command);
+
+    mr_asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
 
     /* i18n */
-    asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
+    mr_asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
     log_msg(4, "command = %s", command);
     run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
 
     if (does_file_exist(tmp)) {
@@ -974 +975 @@
         (void) getcwd(old_pwd, MAX_STR_LEN - 1);
         chdir(bkpinfo->scratchdir);
-        asprintf(&command, "tar -zxvf %s", tmp);
+        mr_asprintf(&command, "tar -zxvf %s", tmp);
         if (run_program_and_log_output(command, FALSE)) {
             fatal_error("Failed to untar payload");
         }
-        paranoid_free(command);
+        mr_free(command);
         chdir(old_pwd);
     }
-    paranoid_free(tmp);
-
-    asprintf(&command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
+    mr_free(tmp);
+
+    mr_asprintf(&command, "cp -f %s/LAST-FILELIST-NUMBER %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
     if (run_program_and_log_output(command, FALSE)) {
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
-    paranoid_free(command);
+    mr_free(command);
 
     tmp = call_program_and_get_last_line_of_output("which mondorestore");
@@ -995 +996 @@
             ("'which mondorestore' returned null. Where's your mondorestore? `which` can't find it. That's odd. Did you install mondorestore?");
     }
-    asprintf(&command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
-    paranoid_free(tmp);
+    mr_asprintf(&command, "cp -f %s %s", tmp, bkpinfo->tmpdir);
+    mr_free(tmp);
 
     if (run_program_and_log_output(command, FALSE)) {
         fatal_error("Failed to copy mondorestore to tmpdir");
     }
-    paranoid_free(command);
-
-    asprintf(&command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
+    mr_free(command);
+
+    mr_asprintf(&command, "hostname > %s/HOSTNAME", bkpinfo->scratchdir);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (bkpinfo->postnuke_tarball) {
-        asprintf(&command, "cp -f %s %s/post-nuke.tgz",
+        mr_asprintf(&command, "cp -f %s %s/post-nuke.tgz",
                 bkpinfo->postnuke_tarball, bkpinfo->tmpdir);
         if (run_program_and_log_output(command, FALSE)) {
             fatal_error("Unable to copy post-nuke tarball to tmpdir");
         }
-        paranoid_free(command);
+        mr_free(command);
     }
 
@@ -1047 +1048 @@
 
     log_it("Storing NFS configuration");
-    asprintf(&tmp, bkpinfo->nfs_mount);
+    mr_asprintf(&tmp, bkpinfo->nfs_mount);
     p = strchr(tmp, ':');
     if (!p) {
@@ -1054 +1055 @@
     }
     *(p++) = '\0';
-    asprintf(&nfs_server_ipaddr, tmp);
-    paranoid_free(tmp);
-
-    asprintf(&nfs_mount, p);
+    mr_asprintf(&nfs_server_ipaddr, tmp);
+    mr_free(tmp);
+
+    mr_asprintf(&nfs_mount, p);
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
-    asprintf(&command,
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
     nfs_dev = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
-
-    asprintf(&command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
     nfs_client_ipaddr = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
-
-    asprintf(&command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
     nfs_client_netmask = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
-
-    asprintf(&command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
     nfs_client_broadcast = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
-
-    asprintf(&command,
+    mr_free(command);
+
+    mr_asprintf(&command,
             "route -n | grep '^0.0.0.0' | awk '{print $2}'");
     nfs_client_defgw = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
-
-    asprintf(&tmp,
+    mr_free(command);
+
+    mr_asprintf(&tmp,
             "nfs_client_ipaddr=%s; nfs_client_netmask=%s; nfs_server_ipaddr=%s; nfs_mount=%s; nfs_client_defgw=%s;  ",
             nfs_client_ipaddr, nfs_client_netmask, nfs_server_ipaddr, nfs_mount, nfs_client_defgw);
-    paranoid_free(nfs_mount);
+    mr_free(nfs_mount);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (strlen(nfs_dev) < 2) {
@@ -1107 +1108 @@
     if (!strncmp(nfs_dev, "bond", 4)) {
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", nfs_dev);
-        asprintf(&command,
+        mr_asprintf(&command,
                 "ifconfig %s | awk '{print $5}'", nfs_dev);
         mac_addr = call_program_and_get_last_line_of_output(command);
-        asprintf(&command,
+        mr_asprintf(&command,
                 "ifconfig | grep -E '%s' | head -n1  | cut -d' ' -f1", mac_addr);
-        paranoid_free(nfs_dev);
+        mr_free(nfs_dev);
         nfs_dev = call_program_and_get_last_line_of_output(command);
-        paranoid_free(command);
-        paranoid_free(mac_addr);
+        mr_free(command);
+        mr_free(mac_addr);
 
         log_to_screen("Replacing it with %s\n", nfs_dev);
     }
 
-    asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "%s/NFS-DEV", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_dev);
-    paranoid_free(nfs_dev);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
+    mr_free(nfs_dev);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_ipaddr);
-    paranoid_free(nfs_client_ipaddr);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
+    mr_free(nfs_client_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_netmask);
-    paranoid_free(nfs_client_netmask);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
+    mr_free(nfs_client_netmask);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_defgw);
-    paranoid_free(nfs_client_defgw);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
+    mr_free(nfs_client_defgw);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/NFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_client_broadcast);
-    paranoid_free(nfs_client_broadcast);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
+    mr_free(nfs_client_broadcast);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/NFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, nfs_server_ipaddr);
-    paranoid_free(nfs_server_ipaddr);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
+    mr_free(nfs_server_ipaddr);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/NFS-SERVER-MOUNT", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_mount);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/NFS-SERVER-PATH", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->nfs_remote_dir);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, bkpinfo->prefix);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_it("Finished storing NFS configuration");
@@ -1211 +1212 @@
     }
     if (scratchLL <= 1) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 _("Your backup will probably occupy a single %s. Maybe two."),
                 bkpinfo->backup_media_string);
     } else {
-        asprintf(&tmp, _("Your backup will occupy approximately %s media."),
+        mr_asprintf(&tmp, _("Your backup will occupy approximately %s media."),
                 number_to_text((int) (scratchLL + 1)));
     }
@@ -1221 +1222 @@
         log_to_screen(tmp);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return;
 }
@@ -1238 +1239 @@
     char *p = NULL;
 
-    asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
+    mr_asprintf(&tmp, "%s/do-not-compress-these", g_mondo_home);
     if (!does_file_exist(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (FALSE);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     do_not_compress_these = last_line_of_file(tmp);
     for (p = do_not_compress_these; p != NULL; p++) {
-        asprintf(&tmp, p);
+        mr_asprintf(&tmp, p);
         if (strchr(tmp, ' ')) {
             *(strchr(tmp, ' ')) = '\0';
         }
         if (!strcmp(strrchr(filename, '.'), tmp)) {
-            paranoid_free(do_not_compress_these);
-            paranoid_free(tmp);
+            mr_free(do_not_compress_these);
+            mr_free(tmp);
             return (TRUE);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (!(p = strchr(p, ' '))) {
@@ -1262 +1263 @@
         }
     }
-    paranoid_free(do_not_compress_these);
+    mr_free(do_not_compress_these);
     return (FALSE);
 }
@@ -1296 +1297 @@
         paranoid_fclose(fout);
         log_msg(2, "Created %s", outfile);
-        asprintf(&tmp, "chmod +x %s", outfile);
+        mr_asprintf(&tmp, "chmod +x %s", outfile);
         paranoid_system(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         retval = 0;
@@ -1308 +1309 @@
 
 /* @} - end fileGroup */
-
-void paranoid_alloc(char *alloc, char *orig) 
-{
-        paranoid_free(alloc); 
-        asprintf(&alloc, orig);
-}
-

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

@@ -10 +10 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include "mr_mem.h"
 
 extern bool g_text_mode;
@@ -30 +31 @@
 
     if ((fin = popen(call, "r"))) {
-        for (getline(&result, &n, fin); !feof(fin); getline(&result, &n, fin));
+        for (mr_getline(&result, &n, fin); !feof(fin); mr_getline(&result, &n, fin));
         paranoid_pclose(fin);
     } else {
@@ -89 +90 @@
     }
 
-    asprintf(&cd_number_str, "%d", cd_no);
+    mr_asprintf(&cd_number_str, "%d", cd_no);
     resolve_naff_tokens(midway_call, basic_call, isofile, "_ISO_");
     resolve_naff_tokens(tmp, midway_call, cd_number_str, "_CD#_");
-    paranoid_free(cd_number_str);
+    mr_free(cd_number_str);
 
     resolve_naff_tokens(ultimate_call, tmp, MONDO_LOGFILE, "_ERR_");
@@ -99 +100 @@
     log_msg(4, "tmp = '%s'", tmp);
     log_msg(4, "ultimate call = '%s'", ultimate_call);
-    asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
+    mr_asprintf(&command, "%s >> %s", ultimate_call, MONDO_LOGFILE);
 
     log_to_screen
@@ -138 +139 @@
             (what_i_am_doing, command);
     }
-    paranoid_free(command);
-
-    paranoid_free(midway_call);
-    paranoid_free(ultimate_call);
-    paranoid_free(tmp);
+    mr_free(command);
+
+    mr_free(midway_call);
+    mr_free(ultimate_call);
+    mr_free(tmp);
     return (retval);
 }
@@ -181 +182 @@
         log_if_failure = TRUE;
     }
-    asprintf(&callstr,
+    mr_asprintf(&callstr,
             "%s > /tmp/mondo-run-prog-thing.tmp 2> /tmp/mondo-run-prog-thing.err",
             program);
@@ -198 +199 @@
                 "--------------------------------start of output-----------------------------");
     }
-    paranoid_free(callstr);
+    mr_free(callstr);
 
     if (log_if_failure
@@ -210 +211 @@
     fin = fopen("/tmp/mondo-run-prog-thing.tmp", "r");
     if (fin) {
-        for (getline(&incoming, &n, fin); !feof(fin);
-             getline(&incoming, &n, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin);
+             mr_getline(&incoming, &n, fin)) {
             /* patch by Heiko Schlittermann */
             p = incoming;
@@ -227 +228 @@
             }
         }
-        paranoid_free(incoming);
+        mr_free(incoming);
         paranoid_fclose(fin);
     }
@@ -273 +274 @@
     assert_string_is_neither_NULL_nor_zerolength(basic_call);
 
-    asprintf(&lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
+    mr_asprintf(&lockfile, "/tmp/mojo-jojo.blah.XXXXXX");
     mkstemp(lockfile);
-    asprintf(&command,
+    mr_asprintf(&command,
             "echo hi > %s ; %s >> %s 2>> %s; res=$?; sleep 1; rm -f %s; exit $res",
             lockfile, basic_call, MONDO_LOGFILE, MONDO_LOGFILE, lockfile);
     open_evalcall_form(what_i_am_doing);
-    asprintf(&tmp, "Executing %s", basic_call);
+    mr_asprintf(&tmp, "Executing %s", basic_call);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        asprintf(&tmp, _("Failed utterly to call '%s'"), command);
+        mr_asprintf(&tmp, _("Failed utterly to call '%s'"), command);
         log_to_screen(tmp);
-        paranoid_free(tmp);
-        paranoid_free(lockfile);
-        paranoid_free(command);
+        mr_free(tmp);
+        mr_free(lockfile);
+        mr_free(command);
         return (1);
     }
-    paranoid_free(command);
+    mr_free(command);
 
     if (!does_file_exist(lockfile)) {
@@ -320 +321 @@
     close_evalcall_form();
     unlink(lockfile);
-    paranoid_free(lockfile);
+    mr_free(lockfile);
 
     return (retval);
@@ -357 +358 @@
         fin = f_orig;
         fout = f_archived;
-        asprintf(&tmp, "%-64s", PIMP_START_SZ);
+        mr_asprintf(&tmp, "%-64s", PIMP_START_SZ);
         if (fwrite(tmp, 1, 64, fout) != 64) {
             fatal_error("Can't write the introductory block");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         while (1) {
@@ -368 +369 @@
                 break;
             }
-            asprintf(&tmp, "%-64ld", bytes_read_in);
+            mr_asprintf(&tmp, "%-64ld", bytes_read_in);
             if (fwrite(tmp, 1, 64, fout) != 64) {
                 fatal_error("Cannot write introductory block");
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             log_msg(7,
@@ -378 +379 @@
                     subsliceno, bytes_read_in, bytes_to_be_read);
             bytes_written_out += fwrite(buf, 1, bytes_read_in, fout);
-            asprintf(&tmp, "%-64ld", subsliceno);
+            mr_asprintf(&tmp, "%-64ld", subsliceno);
             if (fwrite(tmp, 1, 64, fout) != 64) {
                 fatal_error("Cannot write post-thingy block");
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             log_msg(7, "Subslice #%d written OK", subsliceno);
             subsliceno++;
         }
-        asprintf(&tmp, "%-64ld", 0L);
+        mr_asprintf(&tmp, "%-64ld", 0L);
         if (fwrite(tmp, 1, 64L, fout) != 64L) {
             fatal_error("Cannot write final introductory block");
@@ -436 +437 @@
 
     if (direction == 'w') {
-        paranoid_free(tmp);
-        asprintf(&tmp, "%-64s", PIMP_END_SZ);
+        mr_free(tmp);
+        mr_asprintf(&tmp, "%-64s", PIMP_END_SZ);
         if (fwrite(tmp, 1, 64L, fout) != 64L) {
             fatal_error("Can't write the final block");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         log_msg(1, "tmpA is %s", tmp);
@@ -456 +457 @@
                 fwrite(tmp, 1, bytes_read_in, ftmp);
                 
-                paranoid_free(tmp);
+                mr_free(tmp);
                 if (!(tmp = malloc(512))) {
                     fatal_error("Failed to malloc() tmp");
@@ -471 +472 @@
             }
         }
-        paranoid_free(tmp);
-    }
-
-    paranoid_free(buf);
+        mr_free(tmp);
+    }
+
+    mr_free(buf);
     log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
@@ -499 +500 @@
         fatal_error("ntfsclone not found");
     }
-    paranoid_free(tmp);
-
-    asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
+    mr_free(tmp);
+
+    mr_asprintf(&command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
 
     unlink(output_fname);
@@ -526 +527 @@
 
     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, tempfile,
+    mr_asprintf(&command, "%s >> %s 2>> %s; rm -f %s", cmd, tempfile, tempfile,
             tempfile);
     log_msg(3, command);
@@ -533 +534 @@
     if (!(pin = popen(command, "r"))) {
         log_OS_error("fmt err");
-        paranoid_free(command);
-        paranoid_free(tempfile);
+        mr_free(command);
+        mr_free(tempfile);
         return (1);
     }
-    paranoid_free(command);
+    mr_free(command);
 
     maxpc = 100;
@@ -562 +563 @@
     }
     unlink(tempfile);
-    paranoid_free(tempfile);
+    mr_free(tempfile);
     return (res);
 }
@@ -608 +609 @@
     *pchild_result = 999;
 
-    asprintf(&command, "%s 2>> %s", cmd, MONDO_LOGFILE);
+    mr_asprintf(&command, "%s 2>> %s", cmd, MONDO_LOGFILE);
     log_msg(3, "command = '%s'", command);
     if ((res =
@@ -636 +637 @@
         update_evalcall_form(percentage);
     }
-    paranoid_free(command);
+    mr_free(command);
 
     log_file_end_to_screen(MONDO_LOGFILE, "");
@@ -668 +669 @@
         fatal_error("ntfsclone not found");
     }
-    paranoid_free(tmp);
-
-    asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
+    mr_free(tmp);
+
+    mr_asprintf(&command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }

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

@@ -16 +16 @@
 #include "libmondo-string-EXT.h"
 #include "newt-specific-EXT.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -81 +82 @@
 
     if (physical_drive_size < 0) {
-        asprintf(&tmp, " %s does not exist.", drive);
+        mr_asprintf(&tmp, " %s does not exist.", drive);
         flaws_str = tmp;
     } else {
-        asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
+        mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
         flaws_str = NULL;
     }
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
 
     /* check DD */
     for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-        asprintf(&device, "%s%c", drive, cur_sp_no);
+        mr_asprintf(&device, "%s%c", drive, cur_sp_no);
         if (find_device_in_mountlist(mountlist, device) >= 0)
             foundsome = TRUE;
-        paranoid_free(device);
+        mr_free(device);
     }
     if (foundsome) {
         for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-            asprintf(&device, "%s%c", drive, cur_sp_no);
+            mr_asprintf(&device, "%s%c", drive, cur_sp_no);
             pos = find_device_in_mountlist(mountlist, device);
             if (pos < 0) {
                 continue;
             }
-            // BERLIOS : useless ? asprintf(&mountpoint, mountlist->el[pos].mountpoint);
+            // BERLIOS : useless ? mr_asprintf(&mountpoint, mountlist->el[pos].mountpoint);
             /* is it too big? */
             if (curr_part_no > 'h') {
-                asprintf(&tmp, " Can only have up to 'h' in disklabel.");
+                mr_asprintf(&tmp, " Can only have up to 'h' in disklabel.");
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
@@ -128 +129 @@
             }
             if (device_copies > 1) {
-                asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
+                mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
                          device);
                 if (!strstr(flaws_str, tmp)) {
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
                     res++;
                 }
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
             /* silly partition size? */
             if (mountlist->el[pos].size < 8192
                 && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-                asprintf(&tmp, " %s is tiny!", device);
+                mr_asprintf(&tmp, " %s is tiny!", device);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
@@ -165 +166 @@
                 && strcmp(mountlist->el[pos].mountpoint, "none")
                 && mountlist->el[pos].mountpoint[0] != '/') {
-                asprintf(&tmp, " %s has a weird mountpoint.", device);
+                mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
             /* is format sensible? */
             if (!is_this_a_valid_disk_format(mountlist->el[pos].format)) {
-                asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+                mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
@@ -194 +195 @@
             prev_sp_no = cur_sp_no;
 
-            paranoid_free(device);
+            mr_free(device);
         }
     }
@@ -200 +201 @@
     npos = pos = 0;
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        asprintf(&device, "%ss%d", drive, curr_part_no);
+        mr_asprintf(&device, "%ss%d", drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         npos = 0;
         for (cur_sp_no = 'a'; cur_sp_no <= 'h'; cur_sp_no++) {
-            asprintf(&ndevice, "%ss%d%c", device, curr_part_no, cur_sp_no);
+            mr_asprintf(&ndevice, "%ss%d%c", device, curr_part_no, cur_sp_no);
             if (find_device_in_mountlist(mountlist, ndevice) >= 0)
                 npos++;
-            paranoid_free(ndevice);
-        }
-        paranoid_free(device);
+            mr_free(ndevice);
+        }
+        mr_free(device);
 
         if (((pos >= 0) || npos) && foundsome) {
-            asprintf(&tmp, " %s has both DD and PC-style partitions.", drive);
+            mr_asprintf(&tmp, " %s has both DD and PC-style partitions.", drive);
             if (flaws_str) {
-                asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
             } else {
-                asprintf(&tmp1, "%s", tmp);
-            }
-            paranoid_free(flaws_str);
+                mr_asprintf(&tmp1, "%s", tmp);
+            }
+            mr_free(flaws_str);
             flaws_str = tmp1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             return ++res;       // fatal error
         }
-        // BERLIOS : useless ? asprintf(&mountpoint, mountlist->el[pos].mountpoint);
+        // BERLIOS : useless ? mr_asprintf(&mountpoint, mountlist->el[pos].mountpoint);
         if (pos > 0 && !npos) {
-            asprintf(&device, "%ss%d", drive, curr_part_no);
+            mr_asprintf(&device, "%ss%d", drive, curr_part_no);
             /* gap in the partition list? */
             if (curr_part_no - prev_part_no > 1) {
                 if (prev_part_no == 0) {
-                    asprintf(&tmp, " Gap prior to %s.", device);
+                    mr_asprintf(&tmp, " Gap prior to %s.", device);
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     res++;
                 } else if (curr_part_no > 5
                            || (curr_part_no <= 4 && prev_part_no > 0)) {
-                    asprintf(&tmp, " Gap between %ss%d and %d.", drive,
+                    mr_asprintf(&tmp, " Gap between %ss%d and %d.", drive,
                              prev_part_no, curr_part_no);
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     res++;
                 }
@@ -261 +262 @@
             if ((curr_part_no >= 5 && prev_part_no == 4)
                 && (strcmp(part_table_fmt, "MBR") == 0)) {
-                asprintf(&tmp, " Partition %ss4 is occupied.", drive);
+                mr_asprintf(&tmp, " Partition %ss4 is occupied.", drive);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
@@ -281 +282 @@
             }
             if (device_copies > 1) {
-                asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
+                mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
                          device);
                 if (!strstr(flaws_str, tmp)) {
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
                     res++;
                 }
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
             /* silly partition size? */
             if (mountlist->el[pos].size < 8192
                 && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-                asprintf(&tmp, " %s is tiny!", device);
+                mr_asprintf(&tmp, " %s is tiny!", device);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
@@ -318 +319 @@
                 && strcmp(mountlist->el[pos].mountpoint, "none")
                 && mountlist->el[pos].mountpoint[0] != '/') {
-                asprintf(&tmp, " %s has a weird mountpoint.", device);
+                mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
             /* is format sensible? */
             if (!is_this_a_valid_disk_format(mountlist->el[pos].format)) {
-                asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+                mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
-            paranoid_free(device);
+            mr_free(device);
         } else {
             /* Check subpartitions */
             for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-                asprintf(&device, "%ss%d%c", drive, curr_part_no,
+                mr_asprintf(&device, "%ss%d%c", drive, curr_part_no,
                          cur_sp_no);
                 pos = find_device_in_mountlist(mountlist, device);
@@ -354 +355 @@
                     continue;
                 }
-                // BERLIOS : useless ? asprintf(&mountpoint, mountlist->el[pos].mountpoint);
+                // BERLIOS : useless ? mr_asprintf(&mountpoint, mountlist->el[pos].mountpoint);
                 /* is it too big? */
                 if (curr_part_no > 'h') {
-                    asprintf(&tmp,
+                    mr_asprintf(&tmp,
                              " Can only have up to 'h' in disklabel.");
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     res++;
                 }
@@ -378 +379 @@
                 }
                 if (device_copies > 1) {
-                    asprintf(&tmp, " %s %s's.",
+                    mr_asprintf(&tmp, " %s %s's.",
                              number_to_text(device_copies), device);
                     if (!strstr(flaws_str, tmp)) {
                         log_it(tmp);
                         if (flaws_str) {
-                            asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                            mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                         } else {
-                            asprintf(&tmp1, "%s", tmp);
+                            mr_asprintf(&tmp1, "%s", tmp);
                         }
-                        paranoid_free(flaws_str);
+                        mr_free(flaws_str);
                         flaws_str = tmp1;
                         res++;
                     }
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 }
                 /* silly partition size? */
                 if (mountlist->el[pos].size < 8192
                     && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-                    asprintf(&tmp, " %s is tiny!", device);
+                    mr_asprintf(&tmp, " %s is tiny!", device);
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     res++;
                 }
@@ -415 +416 @@
                     && strcmp(mountlist->el[pos].mountpoint, "none")
                     && mountlist->el[pos].mountpoint[0] != '/') {
-                    asprintf(&tmp, " %s has a weird mountpoint.", device);
+                    mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     res++;
                 }
@@ -430 +431 @@
                 if (!is_this_a_valid_disk_format
                     (mountlist->el[pos].format)) {
-                    asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+                    mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                     log_it(tmp);
                     if (flaws_str) {
-                        asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                        mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                     } else {
-                        asprintf(&tmp1, "%s", tmp);
+                        mr_asprintf(&tmp1, "%s", tmp);
                     }
-                    paranoid_free(flaws_str);
+                    mr_free(flaws_str);
                     flaws_str = tmp1;
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     res++;
                 }
                 amount_allocated += mountlist->el[pos].size / 1024;
                 prev_sp_no = cur_sp_no;
-                paranoid_free(device);
+                mr_free(device);
             }
         }
@@ -456 +457 @@
     if (amount_allocated > physical_drive_size) // Used to be +1, but what if you're 1 MB too high?
     {
-        asprintf(&tmp, " %ld MB over-allocated on %s.",
+        mr_asprintf(&tmp, " %ld MB over-allocated on %s.",
                  amount_allocated - physical_drive_size, drive);
         log_it(tmp);
         if (flaws_str) {
-            asprintf(&tmp1, "%s%s",flaws_str, tmp);
+            mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
         } else {
-            asprintf(&tmp1, "%s", tmp);
-        }
-        paranoid_free(flaws_str);
+            mr_asprintf(&tmp1, "%s", tmp);
+        }
+        mr_free(flaws_str);
         flaws_str = tmp1;
-        paranoid_free(tmp);
+        mr_free(tmp);
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        asprintf(&tmp, " %ld MB unallocated on %s.",
+        mr_asprintf(&tmp, " %ld MB unallocated on %s.",
                  physical_drive_size - amount_allocated, drive);
         log_it(tmp);
         if (flaws_str) {
-            asprintf(&tmp1, "%s%s",flaws_str, tmp);
+            mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
         } else {
-            asprintf(&tmp1, "%s", tmp);
-        }
-        paranoid_free(flaws_str);
+            mr_asprintf(&tmp1, "%s", tmp);
+        }
+        mr_free(flaws_str);
         flaws_str = tmp1;
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     if (res) {
@@ -525 +526 @@
 
     if (physical_drive_size < 0) {
-        asprintf(&tmp, " %s does not exist.", drive);
+        mr_asprintf(&tmp, " %s does not exist.", drive);
         if (flaws_str) {
-            asprintf(&tmp1, "%s%s",flaws_str, tmp);
+            mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
         } else {
-            asprintf(&tmp1, "%s", tmp);
-        }
-        paranoid_free(flaws_str);
+            mr_asprintf(&tmp1, "%s", tmp);
+        }
+        mr_free(flaws_str);
         flaws_str = tmp1;
         res++;
         log_msg(1, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (FALSE);
     } else {
-        asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
+        mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        asprintf(&device, "%s%d", drive, curr_part_no);
+        mr_asprintf(&device, "%s%d", drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         if (pos < 0) {
@@ -550 +551 @@
         }
         if (physical_drive_size < 0) {
-            asprintf(&tmp, " %s refers to non-existent hardware.", device);
+            mr_asprintf(&tmp, " %s refers to non-existent hardware.", device);
             if (flaws_str) {
-                asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
             } else {
-                asprintf(&tmp1, "%s", tmp);
-            }
-            paranoid_free(flaws_str);
+                mr_asprintf(&tmp1, "%s", tmp);
+            }
+            mr_free(flaws_str);
             flaws_str = tmp1;
             res++;
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         }
@@ -566 +567 @@
         if (curr_part_no - prev_part_no > 1) {
             if (prev_part_no == 0) {
-                asprintf(&tmp, " Gap prior to %s.", device);
+                mr_asprintf(&tmp, " Gap prior to %s.", device);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             } else if (curr_part_no > 5
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
-                asprintf(&tmp, " Gap between %s%d and %d.", drive,
+                mr_asprintf(&tmp, " Gap between %s%d and %d.", drive,
                          prev_part_no, curr_part_no);
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
-                paranoid_free(tmp);
+                mr_free(tmp);
                 res++;
             }
@@ -598 +599 @@
         if ((curr_part_no >= 5 && prev_part_no == 4)
             && (strcmp(part_table_fmt, "MBR") == 0)) {
-            asprintf(&tmp, " Partition %s4 is occupied.", drive);
+            mr_asprintf(&tmp, " Partition %s4 is occupied.", drive);
             log_it(tmp);
             if (flaws_str) {
-                asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
             } else {
-                asprintf(&tmp1, "%s", tmp);
-            }
-            paranoid_free(flaws_str);
+                mr_asprintf(&tmp1, "%s", tmp);
+            }
+            mr_free(flaws_str);
             flaws_str = tmp1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             res++;
         }
-        paranoid_free(part_table_fmt);
+        mr_free(part_table_fmt);
 
         /* does partition /dev/hdNX exist more than once in the mountlist? */
@@ -620 +621 @@
         }
         if (device_copies > 1) {
-            asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
+            mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
                      device);
             if (!strstr(flaws_str, tmp)) {
                 log_it(tmp);
                 if (flaws_str) {
-                    asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                    mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
                 } else {
-                    asprintf(&tmp1, "%s", tmp);
-                }
-                paranoid_free(flaws_str);
+                    mr_asprintf(&tmp1, "%s", tmp);
+                }
+                mr_free(flaws_str);
                 flaws_str = tmp1;
                 res++;
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         /* silly partition size? */
         if (mountlist->el[pos].size < 8192
             && strcmp(mountlist->el[pos].mountpoint, "lvm")) {
-            asprintf(&tmp, " %s is tiny!", device);
+            mr_asprintf(&tmp, " %s is tiny!", device);
             log_it(tmp);
             if (flaws_str) {
-                asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
             } else {
-                asprintf(&tmp1, "%s", tmp);
-            }
-            paranoid_free(flaws_str);
+                mr_asprintf(&tmp1, "%s", tmp);
+            }
+            mr_free(flaws_str);
             flaws_str = tmp1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             res++;
         }
@@ -656 +657 @@
             && strcmp(mountlist->el[pos].mountpoint, "image")
             && mountlist->el[pos].mountpoint[0] != '/') {
-            asprintf(&tmp, " %s has a weird mountpoint.", device);
+            mr_asprintf(&tmp, " %s has a weird mountpoint.", device);
             log_it(tmp);
             if (flaws_str) {
-                asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
             } else {
-                asprintf(&tmp1, "%s", tmp);
-            }
-            paranoid_free(flaws_str);
+                mr_asprintf(&tmp1, "%s", tmp);
+            }
+            mr_free(flaws_str);
             flaws_str = tmp1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             res++;
         }
         /* is format sensible? */
         if (!is_this_a_valid_disk_format(mountlist->el[pos].format)) {
-            asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
+            mr_asprintf(&tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
             log_it(tmp);
             if (flaws_str) {
-                asprintf(&tmp1, "%s%s",flaws_str, tmp);
+                mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
             } else {
-                asprintf(&tmp1, "%s", tmp);
-            }
-            paranoid_free(flaws_str);
+                mr_asprintf(&tmp1, "%s", tmp);
+            }
+            mr_free(flaws_str);
             flaws_str = tmp1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             res++;
         }
@@ -685 +686 @@
         amount_allocated += mountlist->el[pos].size / 1024;
         prev_part_no = curr_part_no;
-        paranoid_free(device);
+        mr_free(device);
     }
 
     /* Over-allocated the disk? Unallocated space on disk? */
     if (amount_allocated > physical_drive_size + 1) {
-        asprintf(&tmp, " %ld MB over-allocated on %s.",
+        mr_asprintf(&tmp, " %ld MB over-allocated on %s.",
                  amount_allocated - physical_drive_size, drive);
         log_it(tmp);
         if (flaws_str) {
-            asprintf(&tmp1, "%s%s",flaws_str, tmp);
+            mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
         } else {
-            asprintf(&tmp1, "%s", tmp);
-        }
-        paranoid_free(flaws_str);
+            mr_asprintf(&tmp1, "%s", tmp);
+        }
+        mr_free(flaws_str);
         flaws_str = tmp1;
-        paranoid_free(tmp);
+        mr_free(tmp);
         res++;
     } else if (amount_allocated < physical_drive_size - 1) {    /* NOT AN ERROR, JUST A WARNING :-) */
-        asprintf(&tmp, " %ld MB unallocated on %s.",
+        mr_asprintf(&tmp, " %ld MB unallocated on %s.",
                  physical_drive_size - amount_allocated, drive);
         log_it(tmp);
         if (flaws_str) {
-            asprintf(&tmp1, "%s%s",flaws_str, tmp);
+            mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
         } else {
-            asprintf(&tmp1, "%s", tmp);
-        }
-        paranoid_free(flaws_str);
+            mr_asprintf(&tmp1, "%s", tmp);
+        }
+        mr_free(flaws_str);
         flaws_str = tmp1;
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
@@ -755 +756 @@
     assert(mountlist != NULL);
 
-    asprintf(&flaws_str, " ");
+    mr_asprintf(&flaws_str, " ");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -765 +766 @@
             (drivelist->el[i].device,
              DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
-            asprintf(&tmp, " Not evaluating %s (I don't know how yet)",
+            mr_asprintf(&tmp, " Not evaluating %s (I don't know how yet)",
                      drivelist->el[i].device);
             log_it(tmp);
@@ -775 +776 @@
             }
         }
-        asprintf(&tmp1, "%s%s", flaws_str, tmp);
-        paranoid_free(tmp);
-        paranoid_free(flaws_str);
+        mr_asprintf(&tmp1, "%s%s", flaws_str, tmp);
+        mr_free(tmp);
+        mr_free(flaws_str);
         flaws_str = tmp1;
     }
@@ -841 +842 @@
 
     for (currline = 0; currline < mountlist->entries; currline++) {
-        asprintf(&curr_mountpoint, mountlist->el[currline].mountpoint);
+        mr_asprintf(&curr_mountpoint, mountlist->el[currline].mountpoint);
         for (i = 0, copies = 0, last_copy = -1; i < mountlist->entries;
              i++) {
@@ -853 +854 @@
         if (copies > 1 && last_copy == currline
             && strcmp(curr_mountpoint, "raid")) {
-            asprintf(&tmp, " %s %s's.", number_to_text(copies),
+            mr_asprintf(&tmp, " %s %s's.", number_to_text(copies),
                      curr_mountpoint);
             log_it(tmp);
-            asprintf(&tmp1, "%s%s",flaws_str, tmp);
-            paranoid_free(flaws_str);
+            mr_asprintf(&tmp1, "%s%s",flaws_str, tmp);
+            mr_free(flaws_str);
             flaws_str = tmp1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             res++;
         }
-        paranoid_free(curr_mountpoint);
+        mr_free(curr_mountpoint);
     }
     return (res);
@@ -895 +896 @@
     for (lino = 0, noof_drives = 0; lino < mountlist->entries; lino++) {
 
-        asprintf(&drive, mountlist->el[lino].device);
+        mr_asprintf(&drive, mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                      "Not putting %s in list of drives: it's a virtual drive",
                      drive);
             log_msg(8, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         }
@@ -907 +908 @@
         size = mountlist->el[lino].size;
         if (size == 0) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                      "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
                      drive);
             log_msg(8, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         }
@@ -926 +927 @@
 */
 
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "Putting %s with size %lli in list of drives",
                  drive, size);
         log_msg(8, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         (void) truncate_to_drive_name(drive);
@@ -940 +941 @@
             strcpy(drivelist->el[noof_drives++].device, drive);
         }
-        paranoid_free(drive);
+        mr_free(drive);
 
     }
@@ -988 +989 @@
                        (void *) &mountlist->el[i],
                        sizeof(struct mountlist_line));
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "%s is available; user may choose to add it to raid device",
                          output_list->el[items - 1].device);
                 log_it(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
         }
@@ -1058 +1059 @@
         log_it("Unable to open mountlist - '%s'", fname);
         log_to_screen(_("Cannot open mountlist"));
-        paranoid_free(siz);
+        mr_free(siz);
         return (1);
     }
     items = 0;
-    (void) getline(&incoming, &n, fin);
+    mr_getline(&incoming, &n, fin);
     log_it("Loading mountlist...");
     while (!feof(fin)) {
@@ -1091 +1092 @@
                     "Ignoring %s in mountlist - not loading that line :) ",
                     mountlist->el[items].device);
-            (void) getline(&incoming, &n, fin);
+            mr_getline(&incoming, &n, fin);
             continue;
         }
@@ -1107 +1108 @@
             if (j < items) {
                 strcat(mountlist->el[items].device, "_dup");
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "Duplicate entry in mountlist - renaming to %s",
                          mountlist->el[items].device);
                 log_it(tmp);
-                paranoid_free(tmp);
-            }
-            asprintf(&tmp, mountlist->el[items].device);
+                mr_free(tmp);
+            }
+            mr_asprintf(&tmp, mountlist->el[items].device);
             if (strstr(tmp, "/dev/md/")) {
                 log_it("format_device() --- Contracting %s", tmp);
@@ -1126 +1127 @@
                 strcpy(mountlist->el[items].device, tmp);
             }
-            paranoid_free(tmp);
-
-            asprintf(&tmp,
+            mr_free(tmp);
+
+            mr_asprintf(&tmp,
                      "%s %s %s %lld %s",
                      mountlist->el[items].device,
@@ -1137 +1138 @@
 
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             items++;
         }
-        (void) getline(&incoming, &n, fin);
+        mr_getline(&incoming, &n, fin);
     }
     paranoid_fclose(fin);
-    paranoid_free(incoming);
+    mr_free(incoming);
     mountlist->entries = items;
 
     log_it("Mountlist loaded successfully.");
-    asprintf(&tmp, "%d entries in mountlist", items);
+    mr_asprintf(&tmp, "%d entries in mountlist", items);
     log_it(tmp);
-    paranoid_free(tmp);
-
-    paranoid_free(siz);
+    mr_free(tmp);
+
+    mr_free(siz);
     return (0);
 }
@@ -1264 +1265 @@
     assert(b >= 0);
 
-    asprintf(&device, mountlist->el[a].device);
-    asprintf(&mountpoint, mountlist->el[a].mountpoint);
-    asprintf(&format, mountlist->el[a].format);
+    mr_asprintf(&device, mountlist->el[a].device);
+    mr_asprintf(&mountpoint, mountlist->el[a].mountpoint);
+    mr_asprintf(&format, mountlist->el[a].format);
 
     size = mountlist->el[a].size;

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

@@ -9 +9 @@
 
 #include "my-stuff.h"
-#include "mr_string.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "newt-specific-EXT.h"
@@ -16 +16 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-raid.h"
-#include "mr_string.h"
+#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -49 +49 @@
 
     if (raidno == -1) {
-        asprintf(&command,
+        mr_asprintf(&command,
                  "grep \"linear\" /proc/mdstat > /dev/null 2> /dev/null");
     } else {
-        asprintf(&command,
+        mr_asprintf(&command,
                  "grep \"raid%d\" /proc/mdstat > /dev/null 2> /dev/null",
                  raidno);
@@ -58 +58 @@
     log_it("Is raid %d registered? Command = '%s'", raidno, command);
     res = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         return (FALSE);
@@ -185 +185 @@
     assert(label != NULL);
 
-    asprintf(&sz_value, "%d", value);
-    asprintf(&sz_label,label);
+    mr_asprintf(&sz_value, "%d", value);
+    mr_asprintf(&sz_label,label);
     raidrec->additional_vars.el[lino].value = sz_value;
     raidrec->additional_vars.el[lino].label = sz_label;
@@ -320 +320 @@
         switch (raidrec->plex[i].raidlevel) {
         case -1:
-            asprintf(&org, "%s", "concat");
+            mr_asprintf(&org, "%s", "concat");
             break;
         case 0:
-            asprintf(&org, "%s", "striped");
+            mr_asprintf(&org, "%s", "striped");
             break;
         case 5:
-            asprintf(&org, "%s", "raid5");
+            mr_asprintf(&org, "%s", "raid5");
             break;
         }
         fprintf(fout, "  plex org %s", org);
-        paranoid_free(org);
+        mr_free(org);
 
         if (raidrec->plex[i].raidlevel != -1) {
@@ -418 +418 @@
     }
 
-    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);
         p = strchr(incoming, ' ');
@@ -433 +433 @@
         return (0);
     }
-    paranoid_free(incoming);
+    mr_free(incoming);
     return (1);
 }
@@ -563 +563 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    asprintf(&tmp1, "%d RAID devices in raidtab", raidlist->entries);
+    mr_asprintf(&tmp1, "%d RAID devices in raidtab", raidlist->entries);
     log_it(tmp1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
     return (0);
 }
@@ -700 +700 @@
         }
         if (!disklist) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                      "Ignoring '%s %s' pair of disk %s", labelB, valueB,
                      label);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else {
             index = atoi(valueB);
             add_disk_to_raid_device(disklist, value, index);
         }
-        paranoid_free(labelB);
-        paranoid_free(valueB);
+        mr_free(labelB);
+        mr_free(valueB);
     } else {
         v = raidrec->additional_vars.entries;
@@ -773 +773 @@
     int lastpos = 0;
 
-    getline(&line, &n, f);
+    mr_getline(&line, &n, f);
     if (feof(f)) {
         log_it("[GNVCL] Uh... I reached the EOF.");
@@ -933 +933 @@
 
   FILE   *fin;
-  int    res = 0, row, i, index_min;
+  int    row, i, index_min;
   int lastpos = 0;
   size_t len = 0;
@@ -952 +952 @@
   row = 1;
   // skip first output row - contains registered RAID levels
-  res = getline(&string, &len, fin);
+  mr_getline(&string, &len, fin);
   // parse the rest
   while ( !feof_unlocked(fin) ) {
-    res = getline(&string, &len, fin);
-    if (res <= 0) break;
+    mr_getline(&string, &len, fin);
     // trim leading spaces
     pos = string;
     while (*pos == ' ') pos++;
-    asprintf(&strtmp, pos);
-    paranoid_alloc(string,strtmp);
-    paranoid_free(strtmp);
+    mr_asprintf(&strtmp, pos);
+    mr_allocstr(string,strtmp);
+    mr_free(strtmp);
     // if we have newline after only spaces, this is a blank line, update
     // counters, otherwise do normal parsing
@@ -981 +980 @@
     token = mr_strtok (string, delims, &lastpos);
     // get RAID device name
-    asprintf(&strtmp,"%s%s", device_prefix, token);
+    mr_asprintf(&strtmp,"%s%s", device_prefix, token);
     raidlist->el[raidlist->entries].raid_device = strtmp;
-    paranoid_free(token);
+    mr_free(token);
     // skip ':' and status
     token = mr_strtok (string, delims, &lastpos);
-    paranoid_free(token);
+    mr_free(token);
     token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
       log_msg(1, "RAID device '%s' inactive.\n",
          raidlist->el[raidlist->entries].raid_device);
-      paranoid_free(string);
-      paranoid_free(token);
+      mr_free(string);
+      mr_free(token);
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID level
@@ -1017 +1016 @@
     } else {
       log_msg(1, "Unknown RAID level '%s'.\n", token);
-      paranoid_free(string);
-      paranoid_free(token);
+      mr_free(string);
+      mr_free(token);
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID devices (type, index, device)
@@ -1039 +1038 @@
       case ' ': // normal data disks
         raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].data_disks.entries++;
         break;
       case 'S': // spare disks
         raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].spare_disks.entries++;
         break;
       case 'F': // failed disks
         raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].index = atoi(pos + 1);
-        asprintf(&strtmp,"%s%s", device_prefix, token);
+        mr_asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].failed_disks.entries++;
         log_it("At least one failed disk found in RAID array.\n");
@@ -1061 +1060 @@
       default: // error
         log_msg(1, "Unknown device type '%c'\n", type);
-        paranoid_free(string);
-        paranoid_free(token);
+        mr_free(string);
+        mr_free(token);
         return 1;
         break;
       }
-      paranoid_free(token);
+      mr_free(token);
     }
 
@@ -1119 +1118 @@
         if (pos < string) {
           log_it("String underflow!\n");
-          paranoid_free(string);
+          mr_free(string);
           return 1;
         }
@@ -1144 +1143 @@
         if (pos < string) {
           printf("ERROR: String underflow!\n");
-          paranoid_free(string);
+          mr_free(string);
           return 1;
         }
@@ -1161 +1160 @@
   fclose(fin);
   // free string
-  paranoid_free(string);
+  mr_free(string);
   // return success
   return 0;

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

@@ -22 +22 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-fifo-EXT.h"
+#include "mr_mem.h"
 
 #define EXTRA_TAPE_CHECKSUMS
@@ -126 +127 @@
         eject_device(bkpinfo->media_device);
     }
-    paranoid_free(blk);
-    paranoid_free(g_tapecatalog);
+    mr_free(blk);
+    mr_free((void *)g_tapecatalog);
     return (retval);
 }
@@ -180 +181 @@
                g_tapecatalog->el[i].tape_posK);
     }
-    paranoid_free(blk);
-    paranoid_free(g_tapecatalog);
+    mr_free(blk);
+    mr_free((void *)g_tapecatalog);
     return (retval);
 }
@@ -192 +193 @@
     int res;
 
-    asprintf(&command, "mt -f %s status", dev);
+    mr_asprintf(&command, "mt -f %s status", dev);
     res = run_program_and_log_output(command, 1);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         return (FALSE);
@@ -224 +225 @@
     tmp = find_home_of_exe("cdrecord");
     if (tmp) {
-        asprintf(&cdr_exe, "cdrecord");
-    } else {
-        asprintf(&cdr_exe, "dvdrecord");
-    }
-    paranoid_free(tmp);
-
-    asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
+        mr_asprintf(&cdr_exe, "cdrecord");
+    } else {
+        mr_asprintf(&cdr_exe, "dvdrecord");
+    }
+    mr_free(tmp);
+
+    mr_asprintf(&command, "%s -scanbus 2> /dev/null | grep -i tape | wc -l",
              cdr_exe);
     tmp = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (atoi(tmp) != 1) {
         log_it
             ("Either too few or too many tape streamers for me to detect...");
-        asprintf(&dev, VANILLA_SCSI_TAPE"0");
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
+        mr_asprintf(&dev, VANILLA_SCSI_TAPE"0");
+        mr_free(tmp);
+        mr_free(cdr_exe);
         return 1;
     }
-    paranoid_free(tmp);
-
-    asprintf(&command,
+    mr_free(tmp);
+
+    mr_asprintf(&command,
              "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f2 | head -n1",
              cdr_exe);
     tmp = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
     if (strlen(tmp) < 2) {
         log_it("Could not find tape device");
-        paranoid_free(tmp);
-        paranoid_free(cdr_exe);
+        mr_free(tmp);
+        mr_free(cdr_exe);
         return 1;
     }
-    paranoid_free(tmp);
-
-    asprintf(&command,
+    mr_free(tmp);
+
+    mr_asprintf(&command,
              "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -i TAPE | cut -d' ' -f3 | cut -d')' -f1 | head -n1",
              cdr_exe);
-    paranoid_free(cdr_exe);
+    mr_free(cdr_exe);
 
     tmp = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
-
-    asprintf(&dev, VANILLA_SCSI_TAPE"%s", tmp);
-    paranoid_free(tmp);
+    mr_free(command);
+
+    mr_asprintf(&dev, VANILLA_SCSI_TAPE"%s", tmp);
+    mr_free(tmp);
 
     if (!mt_says_tape_exists(dev)) {
-        paranoid_free(dev); 
-
-        asprintf(&dev, ALT_TAPE"%s", tmp);
+        mr_free(dev); 
+
+        mr_asprintf(&dev, ALT_TAPE"%s", tmp);
         if (!mt_says_tape_exists(dev)) {
             log_it("Cannot openin %s", dev);
-            paranoid_free(dev); 
-
-            asprintf(&dev, VANILLA_SCSI_TAPE"0");
+            mr_free(dev); 
+
+            mr_asprintf(&dev, VANILLA_SCSI_TAPE"0");
             if (!mt_says_tape_exists(dev)) {
                 log_it("Cannot openin %s", dev);
-                paranoid_free(dev); 
-
-                asprintf(&dev, "/dev/osst0");
+                mr_free(dev); 
+
+                mr_asprintf(&dev, "/dev/osst0");
                 if (!mt_says_tape_exists(dev)) {
                     res++;
@@ -303 +304 @@
     } else {
         log_it("Turning %s", dev);
-        paranoid_free(tmp);
-        asprintf(&tmp1,
+        mr_free(tmp);
+        mr_asprintf(&tmp1,
                  (strrchr(dev, '/') != NULL) ? strrchr(dev, '/') : dev);
-        paranoid_free(dev);
-        asprintf(&dev, "/dev/os%s", tmp1);
-        paranoid_free(tmp1);
+        mr_free(dev);
+        mr_asprintf(&dev, "/dev/os%s", tmp1);
+        mr_free(tmp1);
 
         log_it("...into %s", dev);
@@ -321 +322 @@
 
     if (res) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (res);
     }
@@ -327 +328 @@
     if (strlen(tmp) < 2) {
         log_it("Warning - size of tape unknown");
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     } else {
@@ -352 +353 @@
         fatal_error("Wrong order, sunshine.");
     }
-    paranoid_free(fname);
+    mr_free(fname);
     fname = (char *)&res;
     read_file_from_stream_to_file(bkpinfo, xattr_fname, *ptmp_size);
@@ -364 +365 @@
         fatal_error("Wrong order, sunshine.");
     }
-    paranoid_free(fname);
+    mr_free(fname);
     fname = (char *)&res;
     if (*pctrl_chr != BLK_START_EXAT_FILE) {
@@ -425 +426 @@
     if (g_current_media_number != tapeno) {
         //      log_it("g_current_media_number = %d", g_current_media_number);
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  _("When the tape drive goes quiet, please insert volume %d in this series."),
                  tapeno);
         popup_and_OK(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         open_evalcall_form(_("Waiting while the tape drive settles"));
     } else {
@@ -482 +483 @@
 
     bufsize_K = (long long) (1024LL * (1 + g_tape_buffer_size_MB));
-    asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
+    mr_asprintf(&tmpdir, "%s/tmpfs/backcatalog", td);
     if (strstr(latest_fname, ".afio.") || strstr(latest_fname, ".star.")) {
         type = fileset;
@@ -493 +494 @@
     }
     mkdir(tmpdir, 0x700);
-    asprintf(&command, "cp -f %s %s", latest_fname, tmpdir);
+    mr_asprintf(&command, "cp -f %s %s", latest_fname, tmpdir);
     if (run_program_and_log_output(command, 6)) {
         log_it("Warning - failed to copy %s to backcatalog at %s",
                latest_fname, tmpdir);
     }
-    paranoid_free(command);
+    mr_free(command);
 
     last = g_tapecatalog->entries - 1;
@@ -522 +523 @@
 
     for (i = curr - 1; i >= 0 && curr - i < 10; i--) {
-        asprintf(&old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
+        mr_asprintf(&old_fname, "%s/%s", tmpdir, g_tapecatalog->el[i].fname);
         unlink(old_fname);
-        paranoid_free(old_fname);
-    }
-    paranoid_free(tmpdir);
+        mr_free(old_fname);
+    }
+    mr_free(tmpdir);
     return (0);
 }
@@ -554 +555 @@
         return (0);
     }
-    asprintf(&tmp, "mt -f %s setblk %ld", tapedev,
+    mr_asprintf(&tmp, "mt -f %s setblk %ld", tapedev,
              internal_tape_block_size);
     res = run_program_and_log_output(tmp, 3);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (res);
 }
@@ -605 +606 @@
     }
     insist_on_this_tape_number(1);
-    asprintf(&outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
+    mr_asprintf(&outfname, "%s/tmp/all.tar.gz", bkpinfo->tmpdir);
     make_hole_for_file(outfname);
 
@@ -649 +650 @@
     }
     paranoid_fclose(fout);
-    paranoid_free(datablock);
+    mr_free(datablock);
     /* find initial blocks */
     res = read_header_block_from_stream(&size, NULL, &ctrl_chr);
@@ -665 +666 @@
     (void) getcwd(old_cwd, MAX_STR_LEN);
     chdir(bkpinfo->tmpdir);
-    asprintf(&tmp, "tar -zxf %s tmp/mondo-restore.cfg 2> /dev/null",
+    mr_asprintf(&tmp, "tar -zxf %s tmp/mondo-restore.cfg 2> /dev/null",
              outfname);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     paranoid_system("cp -f tmp/mondo-restore.cfg . 2> /dev/null");
     chdir(old_cwd);
     unlink(outfname);
-    paranoid_free(outfname);
+    mr_free(outfname);
     return (retval);
 }
@@ -692 +693 @@
 
     /*  add 'dummy' if testing */
-    asprintf(&command,
+    mr_asprintf(&command,
              "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
              cddev, speed, MONDO_LOGFILE, MONDO_LOGFILE);
@@ -706 +707 @@
     /*  log_it("Let's see what happens, shall we?"); */
     g_tape_stream = popen(command, "w");
-    paranoid_free(command);
+    mr_free(command);
     if (g_tape_stream) {
         return (0);
@@ -852 +853 @@
     res = read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
     if (orig_size != temp_size && orig_size != -1) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "output file's size should be %ld K but is apparently %ld K",
                  (long) size >> 10, (long) temp_size >> 10);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     if (ctrl_chr != BLK_START_FILE) {
@@ -862 +863 @@
         return (1);
     }
-    asprintf(&tmp, "Reading file from tape; writing to '%s'; %ld KB",
+    mr_asprintf(&tmp, "Reading file from tape; writing to '%s'; %ld KB",
              outfname, (long) size >> 10);
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (foutstream) {
@@ -921 +922 @@
     log_msg(6, ".......................... Should be %lld", orig_size);
     g_tape_posK += total_read_from_tape_for_this_file / 1024;
-    asprintf(&actual_cksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(&actual_cksum, "%04x%04x", crc16, crctt);
     if (foutstream) {           /*log_it("Finished writing to foutstream"); */
     } else {
@@ -932 +933 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        asprintf(&tmp, _("actual cksum=%s; recorded cksum=%s"), actual_cksum,
+        mr_asprintf(&tmp, _("actual cksum=%s; recorded cksum=%s"), actual_cksum,
                  temp_cksum);
         log_to_screen(tmp);
-        paranoid_free(tmp);
-
-        asprintf(&tmp, _("%s (%ld K) is corrupt on tape"), temp_fname,
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, _("%s (%ld K) is corrupt on tape"), temp_fname,
                  (long) orig_size >> 10);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         retval++;
     }
-    paranoid_free(actual_cksum);
-    paranoid_free(datablock);
-    paranoid_free(temp_fname);
-    paranoid_free(temp_cksum);
+    mr_free(actual_cksum);
+    mr_free(datablock);
+    mr_free(temp_fname);
+    mr_free(temp_cksum);
     return (retval);
 }
@@ -992 +993 @@
      * something (allocate) */
     if (filename != NULL) {
-        asprintf(&filename, tempblock + 1000);
+        mr_asprintf(&filename, tempblock + 1000);
     }
     if (*pcontrol_char == BLK_ABORTED_BACKUP) {
@@ -1009 +1010 @@
             marker_to_string(*pcontrol_char), tempblock + 1000,
             (long) (*plen) >> 10);
-    paranoid_free(tempblock);
+    mr_free(tempblock);
     return (retval);
 }
@@ -1133 +1134 @@
         wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         log_msg(3, "Still trying to re-sync w/ tape");
-        paranoid_free(temp_fname);
+        mr_free(temp_fname);
         temp_fname = (char *)&res;
     }
@@ -1148 +1149 @@
         /* Do not desallocate when the while condition is met */
         if (ctrl_chr != BLK_START_FILE) {
-            paranoid_free(temp_fname);
+            mr_free(temp_fname);
             temp_fname = (char *)&res;
         }
@@ -1174 +1175 @@
         }
 
-        paranoid_free(temp_fname);
+        mr_free(temp_fname);
         temp_fname = (char *)&res;
         res = read_header_block_from_stream(&temp_size, NULL, &ctrl_chr);
@@ -1211 +1212 @@
     log_msg(2, "Reading %s (it matches %s)", temp_fname,
             the_file_I_was_reading);
-    paranoid_free(temp_fname);
-    paranoid_free(datablock);
+    mr_free(temp_fname);
+    mr_free(datablock);
     return (0);
 }
@@ -1281 +1282 @@
     }
     if (bkpinfo->backup_media_type == cdstream) {
-        asprintf(&command,
+        mr_asprintf(&command,
                  "cdrecord -eject dev=%s speed=%d fs=24m -waiti - >> %s 2>> %s",
                  bkpinfo->media_device, bkpinfo->cdrw_speed, MONDO_LOGFILE,
@@ -1289 +1290 @@
         log_it("Let's see what happens, shall we?");
         g_tape_stream = popen(command, "w");
-        paranoid_free(command);
+        mr_free(command);
         if (!g_tape_stream) {
             log_to_screen(_("Failed to openout to cdstream (fifo)"));
@@ -1332 +1333 @@
     last = g_tapecatalog->entries - 1;
     for (i = 0; i <= last; i++) {
-        asprintf(&fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir,
+        mr_asprintf(&fname, "%s/tmpfs/backcatalog/%s", bkpinfo->tmpdir,
                  g_tapecatalog->el[i].fname);
         if (!does_file_exist(fname)) {
@@ -1351 +1352 @@
             }
         }
-        paranoid_free(fname);
+        mr_free(fname);
     }
     log_msg(2, "Finished writing back catalog to tape");
@@ -1385 +1386 @@
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        asprintf(&tmp, _("Cannot find %s"), fname);
+        mr_asprintf(&tmp, _("Cannot find %s"), fname);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -1479 +1480 @@
         p++;
     }
-    asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
+    mr_asprintf(&tmp, "Writing file '%s' to tape (%ld KB)", p,
              (long) filesize >> 10);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     write_header_block_to_stream(filesize, infile_basename,
@@ -1522 +1523 @@
     }
     paranoid_fclose(fin);
-    asprintf(&checksum, "%04x%04x", crc16, crctt);
+    mr_asprintf(&checksum, "%04x%04x", crc16, crctt);
     /* BERLIOS: what does it do ??? */
     write_header_block_to_stream((off_t)g_current_media_number, checksum,
                                  BLK_STOP_FILE);
-    paranoid_free(checksum);
+    mr_free(checksum);
 //  log_it("File '%s' written to tape.", infile);
     return (retval);
@@ -1582 +1583 @@
         fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE,
                g_tape_stream) / 1024;
-    asprintf(&tmp, "%s (fname=%s, size=%ld K)",
+    mr_asprintf(&tmp, "%s (fname=%s, size=%ld K)",
              marker_to_string(control_char), p,
              (long) length_of_incoming_file >> 10);
     log_msg(6, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }
@@ -1603 +1604 @@
 
     /*@ end vars *************************************************** */
-    asprintf(&tmp, _("Wrong marker! (Should be %s, is actually %s)"),
+    mr_asprintf(&tmp, _("Wrong marker! (Should be %s, is actually %s)"),
              marker_to_string(should_be), marker_to_string(it_is));
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 

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

@@ -15 +15 @@
 #include "libmondo-tools-EXT.h"
 #include <math.h>
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -42 +43 @@
     assert(partno >= 0);
 
-    asprintf(&partition, "%s", drive);
+    mr_asprintf(&partition, "%s", drive);
     p = partition;
     /* is this a devfs device path? */
@@ -55 +56 @@
             p = partition;
 #ifdef BSD
-            asprintf(&partition, "%ss", p);
+            mr_asprintf(&partition, "%ss", p);
 #else
             /* format /dev/cciss/c0d0 */
-            asprintf(&partition, "%sp", p);
+            mr_asprintf(&partition, "%sp", p);
 #endif
-            paranoid_free(p);
+            mr_free(p);
         }
     }
     p = partition;
-    asprintf(&partition, "%s%d", p, partno);
-    paranoid_free(p);
+    mr_asprintf(&partition, "%s%d", p, partno);
+    mr_free(p);
     return (partition);
 }
@@ -92 +93 @@
     }
     for (p = in_out; *p == ' '; p++);
-    asprintf(&scratch, p);
+    mr_asprintf(&scratch, p);
     strip_spaces (scratch);
     len = (int) strlen(scratch);
@@ -101 +102 @@
     }
     in_out[i] = '\0';
-    asprintf(&out, "%s%s", in_out, scratch);
-    paranoid_free(scratch);
+    mr_asprintf(&out, "%s%s", in_out, scratch);
+    mr_free(scratch);
     in_out = out;
     for (i = x + len ; i < width - 1; i++) {
@@ -120 +121 @@
     bool end = FALSE;
 
-    asprintf(&sav, sin);
+    mr_asprintf(&sav, sin);
     p = sav;
     while ((*p != '\0') && (! end)) {
@@ -129 +130 @@
                                     // build the new string by recursion
             turn_wildcard_chars_into_literal_chars(q,p);
-            asprintf(&sout, "%s\\%c%s", sav, r, q);
-            paranoid_free(q);
-            paranoid_free(sav);
+            mr_asprintf(&sout, "%s\\%c%s", sav, r, q);
+            mr_free(q);
+            mr_free(sav);
             end = TRUE;
         }
@@ -160 +161 @@
     assert(disklist != NULL);
 
-    asprintf(&output, "%-24s %8d", disklist->el[lino].device,
+    mr_asprintf(&output, "%-24s %8d", disklist->el[lino].device,
              disklist->el[lino].index);
     return (output);
@@ -188 +189 @@
         fatal_error("Please use integers only. No decimal points.");
     }
-    asprintf(&tmp, "%s", incoming);
+    mr_asprintf(&tmp, "%s", incoming);
     i = (int) strlen(tmp);
     if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
@@ -197 +198 @@
     tmp[i] = '\0';
     outval = atol(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (ch == 'g' || ch == 'G') {
@@ -214 +215 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        asprintf(&tmp, "Re: parameter '%s' - bad multiplier ('%c')",
+        mr_asprintf(&tmp, "Re: parameter '%s' - bad multiplier ('%c')",
                  incoming, ch);
         fatal_error(tmp);
@@ -240 +241 @@
     assert(width > 2);
 
-    asprintf(&output, "%s", incoming);
+    mr_asprintf(&output, "%s", incoming);
     for (i = (int) strlen(output); i < width; i++) {
         output[i] = ' ';
@@ -268 +269 @@
     switch (marker) {
     case BLK_START_OF_BACKUP:
-        asprintf(&outstr, "%s", "BLK_START_OF_BACKUP");
+        mr_asprintf(&outstr, "%s", "BLK_START_OF_BACKUP");
         break;
     case BLK_START_OF_TAPE:
-        asprintf(&outstr, "%s", "BLK_START_OF_TAPE");
+        mr_asprintf(&outstr, "%s", "BLK_START_OF_TAPE");
         break;
     case BLK_START_AN_AFIO_OR_SLICE:
-        asprintf(&outstr, "%s", "BLK_START_AN_AFIO_OR_SLICE");
+        mr_asprintf(&outstr, "%s", "BLK_START_AN_AFIO_OR_SLICE");
         break;
     case BLK_STOP_AN_AFIO_OR_SLICE:
-        asprintf(&outstr, "%s", "BLK_STOP_AN_AFIO_OR_SLICE");
+        mr_asprintf(&outstr, "%s", "BLK_STOP_AN_AFIO_OR_SLICE");
         break;
     case BLK_START_AFIOBALLS:
-        asprintf(&outstr, "%s", "BLK_START_AFIOBALLS");
+        mr_asprintf(&outstr, "%s", "BLK_START_AFIOBALLS");
         break;
     case BLK_STOP_AFIOBALLS:
-        asprintf(&outstr, "%s", "BLK_STOP_AFIOBALLS");
+        mr_asprintf(&outstr, "%s", "BLK_STOP_AFIOBALLS");
         break;
     case BLK_STOP_BIGGIEFILES:
-        asprintf(&outstr, "%s", "BLK_STOP_BIGGIEFILES");
+        mr_asprintf(&outstr, "%s", "BLK_STOP_BIGGIEFILES");
         break;
     case BLK_START_A_NORMBIGGIE:
-        asprintf(&outstr, "%s", "BLK_START_A_NORMBIGGIE");
+        mr_asprintf(&outstr, "%s", "BLK_START_A_NORMBIGGIE");
         break;
     case BLK_START_A_PIHBIGGIE:
-        asprintf(&outstr, "%s", "BLK_START_A_PIHBIGGIE");
+        mr_asprintf(&outstr, "%s", "BLK_START_A_PIHBIGGIE");
         break;
     case BLK_START_EXTENDED_ATTRIBUTES:
-        asprintf(&outstr, "%s", "BLK_START_EXTENDED_ATTRIBUTES");
+        mr_asprintf(&outstr, "%s", "BLK_START_EXTENDED_ATTRIBUTES");
         break;
     case BLK_STOP_EXTENDED_ATTRIBUTES:
-        asprintf(&outstr, "%s", "BLK_STOP_EXTENDED_ATTRIBUTES");
+        mr_asprintf(&outstr, "%s", "BLK_STOP_EXTENDED_ATTRIBUTES");
         break;
     case BLK_START_EXAT_FILE:
-        asprintf(&outstr, "%s", "BLK_START_EXAT_FILE");
+        mr_asprintf(&outstr, "%s", "BLK_START_EXAT_FILE");
         break;
     case BLK_STOP_EXAT_FILE:
-        asprintf(&outstr, "%s", "BLK_STOP_EXAT_FILE");
+        mr_asprintf(&outstr, "%s", "BLK_STOP_EXAT_FILE");
         break;
     case BLK_START_BIGGIEFILES:
-        asprintf(&outstr, "%s", "BLK_START_BIGGIEFILES");
+        mr_asprintf(&outstr, "%s", "BLK_START_BIGGIEFILES");
         break;
     case BLK_STOP_A_BIGGIE:
-        asprintf(&outstr, "%s", "BLK_STOP_A_BIGGIE");
+        mr_asprintf(&outstr, "%s", "BLK_STOP_A_BIGGIE");
         break;
     case BLK_END_OF_TAPE:
-        asprintf(&outstr, "%s", "BLK_END_OF_TAPE");
+        mr_asprintf(&outstr, "%s", "BLK_END_OF_TAPE");
         break;
     case BLK_END_OF_BACKUP:
-        asprintf(&outstr, "%s", "BLK_END_OF_BACKUP");
+        mr_asprintf(&outstr, "%s", "BLK_END_OF_BACKUP");
         break;
     case BLK_ABORTED_BACKUP:
-        asprintf(&outstr, "%s", "BLK_ABORTED_BACKUP");
+        mr_asprintf(&outstr, "%s", "BLK_ABORTED_BACKUP");
         break;
     case BLK_START_FILE:
-        asprintf(&outstr, "%s", "BLK_START_FILE");
+        mr_asprintf(&outstr, "%s", "BLK_START_FILE");
         break;
     case BLK_STOP_FILE:
-        asprintf(&outstr, "%s", "BLK_STOP_FILE");
+        mr_asprintf(&outstr, "%s", "BLK_STOP_FILE");
         break;
     default:
-        asprintf(&outstr, "%s (%d)", "BLK_UNKNOWN", marker);
+        mr_asprintf(&outstr, "%s (%d)", "BLK_UNKNOWN", marker);
         break;
     }
@@ -355 +356 @@
     assert(mountlist != NULL);
 
-    asprintf(&output, "%-24s %-24s %-10s %8lld",
+    mr_asprintf(&output, "%-24s %-24s %-10s %8lld",
              mountlist->el[lino].device, mountlist->el[lino].mountpoint,
              mountlist->el[lino].format, mountlist->el[lino].size / 1024);
@@ -386 +387 @@
         p = ' ';
     }
-    asprintf(&output, "%d %s disk%c    ", noof_disks, label, p);
+    mr_asprintf(&output, "%d %s disk%c    ", noof_disks, label, p);
     /* BERLIOS: replaced with space^^^^ here ! 
        while (strlen(output) < 14) {
@@ -413 +414 @@
     switch (i) {
     case 0:
-        asprintf(&output, "%s", "zero");
+        mr_asprintf(&output, "%s", "zero");
         break;
     case 1:
-        asprintf(&output, "%s", "one");
+        mr_asprintf(&output, "%s", "one");
         break;
     case 2:
-        asprintf(&output, "%s", "two");
+        mr_asprintf(&output, "%s", "two");
         break;
     case 3:
-        asprintf(&output, "%s", "three");
+        mr_asprintf(&output, "%s", "three");
         break;
     case 4:
-        asprintf(&output, "%s", "four");
+        mr_asprintf(&output, "%s", "four");
         break;
     case 5:
-        asprintf(&output, "%s", "five");
+        mr_asprintf(&output, "%s", "five");
         break;
     case 6:
-        asprintf(&output, "%s", "six");
+        mr_asprintf(&output, "%s", "six");
         break;
     case 7:
-        asprintf(&output, "%s", "seven");
+        mr_asprintf(&output, "%s", "seven");
         break;
     case 8:
-        asprintf(&output, "%s", "eight");
+        mr_asprintf(&output, "%s", "eight");
         break;
     case 9:
-        asprintf(&output, "%s", "nine");
+        mr_asprintf(&output, "%s", "nine");
     case 10:
-        asprintf(&output, "%s", "ten");
+        mr_asprintf(&output, "%s", "ten");
     default:
-        asprintf(&output, "%d", i);
+        mr_asprintf(&output, "%d", i);
     }
     return (output);
@@ -470 +471 @@
 
     strcpy(output, ip);         /* just in case the token doesn't appear in string at all */
-    asprintf(&input, "%s", ip);
+    mr_asprintf(&input, "%s", ip);
     while (strstr(input, token)) {
         strcpy(output, input);
@@ -478 +479 @@
         p = strstr(input, token) + strlen(token);
         strcat(output, p);
-        paranoid_free(input);
-        asprintf(&input, "%s", output);
-    }
-    paranoid_free(input);
+        mr_free(input);
+        mr_asprintf(&input, "%s", output);
+    }
+    mr_free(input);
 }
 
@@ -512 +513 @@
 
     if (s != NULL) {
-        asprintf(&suffix, ".%s", s);
+        mr_asprintf(&suffix, ".%s", s);
     } else {
-        asprintf(&suffix, "%s", "");
-    }
-    asprintf(&output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno,
+        mr_asprintf(&suffix, "%s", "");
+    }
+    mr_asprintf(&output, "%s/slice-%07ld.%05ld.dat%s", path, bigfileno,
              sliceno, suffix);
-    paranoid_free(suffix);
+    mr_free(suffix);
     return (output);
 }
@@ -578 +579 @@
     }
     if (strlen(flaws_str) > 0) {
-        asprintf(&flaws_str_A, "%s", flaws_str + 1);
+        mr_asprintf(&flaws_str_A, "%s", flaws_str + 1);
     }
     if (strlen(flaws_str_A) >= 74) {
         for (i = 74; flaws_str_A[i] != ' '; i--);
-        asprintf(&flaws_str_B, "%s", flaws_str_A + i + 1);
+        mr_asprintf(&flaws_str_B, "%s", flaws_str_A + i + 1);
         flaws_str_A[i] = '\0';
     }
     if (strlen(flaws_str_B) >= 74) {
         for (i = 74; flaws_str_B[i] != ' '; i--);
-        asprintf(&flaws_str_C, "%s", flaws_str_B + i + 1);
+        mr_asprintf(&flaws_str_C, "%s", flaws_str_B + i + 1);
         flaws_str_B[i] = '\0';
     }
@@ -669 +670 @@
 
     assert(input != NULL);
-    asprintf(&output, "%s", input);
+    mr_asprintf(&output, "%s", input);
     p = strchr(input, '\"');
     if (p) {
         q = strchr(++p, '\"');
         if (q) {
-            paranoid_free(output);
-            asprintf(&output, "%s", p);
+            mr_free(output);
+            mr_asprintf(&output, "%s", p);
             *(strchr(output, '\"')) = '\0';
         }
@@ -706 +707 @@
     original_incoming_length = (int) strlen(in_out);
     for (i = 0; in_out[i] <= ' ' && i < (int) strlen(in_out); i++);
-    asprintf(&tmp, "%s", in_out + i);
+    mr_asprintf(&tmp, "%s", in_out + i);
     for (i = (int) strlen(tmp); i > 0 && tmp[i - 1] <= 32; i--);
     tmp[i] = '\0';
@@ -724 +725 @@
                 in_out[i++] = ' ';
             } else if (in_out[i] == '\r') {
-                asprintf(&tmp1, "%s", in_out + i);
+                mr_asprintf(&tmp1, "%s", in_out + i);
                 strcpy(in_out, tmp1);
-                paranoid_free(tmp1);
+                mr_free(tmp1);
                 i = -1;
                 continue;
@@ -741 +742 @@
     }
     in_out[i] = '\0';
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -760 +761 @@
 
     if (incoming[0] == '\"' && incoming[strlen(incoming) - 1] == '\"') {
-        asprintf(&outgoing, "%s", incoming + 1);
+        mr_asprintf(&outgoing, "%s", incoming + 1);
         outgoing[strlen(outgoing) - 1] = '\0';
     } else {
-        asprintf(&outgoing, incoming);
+        mr_asprintf(&outgoing, incoming);
     }
     return (outgoing);
@@ -831 +832 @@
 
     if (raid_level >= 0) {
-        asprintf(&output, " RAID %-2d ", raid_level);
+        mr_asprintf(&output, " RAID %-2d ", raid_level);
     } else {
-        asprintf(&output, "Linear RAID");
+        mr_asprintf(&output, "Linear RAID");
     }
     return (output);
@@ -855 +856 @@
     assert_string_is_neither_NULL_nor_zerolength(fn);
     if (!strncmp(fn, MNT_RESTORING, strlen(MNT_RESTORING))) {
-        asprintf(&filename, "%s", fn + strlen(MNT_RESTORING));
+        mr_asprintf(&filename, "%s", fn + strlen(MNT_RESTORING));
     } else if (fn[0] != '/') {
-        asprintf(&filename, "/%s", fn);
+        mr_asprintf(&filename, "/%s", fn);
     } else {
-        asprintf(&filename, "%s", fn);
+        mr_asprintf(&filename, "%s", fn);
     }
 
     if (!strncmp(filename, "/var/", 5)) {
         sev = 2;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("/var's contents will change regularly, inevitably."));
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("It's in your /home partiton. Therefore, it is important."));
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("You may have installed/removed software during the backup."));
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("Do not edit config files while backing up your PC."));
     }
@@ -885 +886 @@
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        asprintf(&reason, _("This file changes all the time. It's OK."));
+        mr_asprintf(&reason, _("This file changes all the time. It's OK."));
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("Were you compiling/editing something in /root?"));
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        asprintf(&reason, _("Temp or 'dot' files changed in /root."));
+        mr_asprintf(&reason, _("Temp or 'dot' files changed in /root."));
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        asprintf(&reason, _("Did you add/remove software during backing?"));
+        mr_asprintf(&reason, _("Did you add/remove software during backing?"));
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        asprintf(&reason, _("Did you add/remove software during backing?"));
+        mr_asprintf(&reason, _("Did you add/remove software during backing?"));
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("The 'update' daemon ran during backup. This does not affect the integrity of your backup."));
     }
@@ -913 +914 @@
         || !strcmp(filename + strlen(filename) - 4, ".log")) {
         sev = 1;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("Log files change frequently as the computer runs. Fret not."));
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("Background processes or printers were active. This does not affect the integrity of your backup."));
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
-        asprintf(&reason, _("Mail was sent/received during backup."));
+        mr_asprintf(&reason, _("Mail was sent/received during backup."));
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("Backup copy of another file which was modified recently."));
     }
     if (strstr(filename, "cache")) {
         sev = 1;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("Part of a cache of data. Caches change from time to time. Don't worry."));
     }
@@ -940 +941 @@
         || strstr(filename, "/.Xauthority")) {
         sev = 1;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  "Temporary file (a lockfile, perhaps) used by software such as X or KDE to register its presence.");
     }
-    paranoid_free(filename);
+    mr_free(filename);
 
     if (sev == 0) {
         sev = 3;
-        asprintf(&reason,
+        mr_asprintf(&reason,
                  _("Changed since backup. Consider running a differential backup in a day or two."));
     }
@@ -1005 +1006 @@
 
     if (bkpinfo->media_size[g_current_media_number] <= 0) {
-        asprintf(&outstr, _("Volume %d: %'lld kilobytes archived so far"),
+        mr_asprintf(&outstr, _("Volume %d: %'lld kilobytes archived so far"),
                  g_current_media_number, g_tape_posK);
 
@@ -1016 +1017 @@
             (int) (g_tape_posK / 10 /
                    bkpinfo->media_size[g_current_media_number]);
-        asprintf(&prepstr, _("Volume %d: ["), g_current_media_number);
+        mr_asprintf(&prepstr, _("Volume %d: ["), g_current_media_number);
     } else {
         percentage =
             (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 /
                    bkpinfo->media_size[g_current_media_number]);
-        asprintf(&prepstr, "%s %d: [",
+        mr_asprintf(&prepstr, "%s %d: [",
                  bkpinfo->backup_media_string,
                  g_current_media_number);
@@ -1046 +1047 @@
     /*
        log_it("percentage: %d", percentage);
-       asprintf(&outstr, "%s%s%s] %3d%% used", prepstr, tmp1, tmp2, percentage);
+       mr_asprintf(&outstr, "%s%s%s] %3d%% used", prepstr, tmp1, tmp2, percentage);
      */
-    asprintf(&outstr, _("%s%s%s] %3d percent used"), prepstr, tmp1, tmp2,
+    mr_asprintf(&outstr, _("%s%s%s] %3d percent used"), prepstr, tmp1, tmp2,
              percentage);
-    paranoid_free(prepstr);
-    paranoid_free(tmp1);
-    paranoid_free(tmp2);
+    mr_free(prepstr);
+    mr_free(tmp1);
+    mr_free(tmp2);
     return (outstr);
 }

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

@@ -21 +21 @@
 #include <arpa/inet.h>
 #endif
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -169 +170 @@
     char *tmp;
 
-    asprintf(&tmp,
+    mr_asprintf(&tmp,
              "for i in `find /root /home -type d -name Desktop -maxdepth 2`; do \
 file=$i/.directory; if [ -f \"$file\" ] ; then mv -f $file $file.old ; \
@@ -175 +176 @@
 else { print $0;};}' $file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -190 +191 @@
     char *home_sz = NULL;
 
-    asprintf(&home_sz, MONDO_SHARE);
+    mr_asprintf(&home_sz, MONDO_SHARE);
     return (home_sz);
 }
@@ -369 +370 @@
     if (bkpinfo->backup_media_type == tape) {
         log_msg(1, "Bar");
-        asprintf(&tmp, "mt -f %s status", bkpinfo->media_device);
+        mr_asprintf(&tmp, "mt -f %s status", bkpinfo->media_device);
         log_msg(1, "tmp = '%s'", tmp);
         if (run_program_and_log_output(tmp, 3)) {
@@ -375 +376 @@
                 ("Unable to open tape device. If you haven't specified it with -d, do so. If you already have, check your parameter. I think it's wrong.");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     make_hole_for_dir(bkpinfo->scratchdir);
@@ -385 +386 @@
     run_program_and_log_output("cat /etc/*-release", 5);
     run_program_and_log_output("cat /etc/*issue*", 5);
-    asprintf(&g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
-    asprintf(&command, "mkdir -p %s", g_tmpfs_mountpt);
+    mr_asprintf(&g_tmpfs_mountpt, "%s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(&command, "mkdir -p %s", g_tmpfs_mountpt);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
     rdsiz_MB = PPCFG_RAMDISK_SIZE + g_tape_buffer_size_MB;
 #ifdef __FreeBSD__
@@ -394 +395 @@
              ("vmstat | tail -1 | tr -s ' ' | cut -d' ' -f6");
     avm += atol(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     tmp = call_program_and_get_last_line_of_output
              ("swapinfo | grep -v Device | tr -s ' ' | cut -d' ' -f4 | tr '\n' '+' | sed 's/+$//' | bc");
     avm += atol(tmp);
-    paranoid_free(tmp);
-    asprintf(&command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
+    mr_free(tmp);
+    mr_asprintf(&command, "mdmfs -s %d%c md9 %s", rdsiz_MB, 'm',
              g_tmpfs_mountpt);
 #else
@@ -405 +406 @@
              ("free | grep \":\" | tr -s ' ' '\t' | cut -f2 | head -n1");
     avm += atol(tmp);
-    paranoid_free(tmp);
-    asprintf(&command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
+    mr_free(tmp);
+    mr_asprintf(&command, "mount /dev/shm -t tmpfs %s -o size=%d%c",
              g_tmpfs_mountpt, rdsiz_MB, 'm');
     run_program_and_log_output("cat /proc/cpuinfo", 5);
@@ -416 +417 @@
     if (avm / 1024 > rdsiz_MB * 3) {
         if (run_program_and_log_output(command, 5)) {
-            paranoid_free(g_tmpfs_mountpt);
+            mr_free(g_tmpfs_mountpt);
             log_it("Failed to mount tmpfs");
         } else {
@@ -422 +423 @@
         }
     } else {
-        paranoid_free(g_tmpfs_mountpt);
+        mr_free(g_tmpfs_mountpt);
         log_it("It doesn't seem you have enough swap to use tmpfs. Fine.");
     }
-    paranoid_free(command);
+    mr_free(command);
 
     if (bkpinfo->use_lzo) {
-        paranoid_alloc(bkpinfo->zip_exe, "lzop");
-        paranoid_alloc(bkpinfo->zip_suffix, "lzo");
+        mr_allocstr(bkpinfo->zip_exe, "lzop");
+        mr_allocstr(bkpinfo->zip_suffix, "lzo");
     } else if (bkpinfo->compression_level != 0) {
-        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 {
         bkpinfo->zip_exe = NULL;
@@ -445 +446 @@
             fatal_error("Please install growisofs.");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (bkpinfo->nonbootable_backup) {
-            asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_NONBOOT);
         } else if
 #ifdef __FreeBSD__
@@ -457 +458 @@
 #ifdef __IA64__
     {
-        asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_ELILO);
     }
 #else
     {
-        asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_GROWISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
@@ -472 +473 @@
             // -m isn't supported by growisofs, BTW...
         } else {
-            asprintf(&bkpinfo->call_make_iso,
+            mr_asprintf(&bkpinfo->call_make_iso,
                     "%s %s -Z %s . 2>> _ERR_",
                     mondo_mkisofs_sz, "", bkpinfo->media_device);
         }
-        paranoid_free(mondo_mkisofs_sz);
+        mr_free(mondo_mkisofs_sz);
 
         if (getenv ("SUDO_COMMAND")) {
-            asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
+            mr_asprintf(&command, "strings `which growisofs` | grep -c SUDO_COMMAND");
             tmp = call_program_and_get_last_line_of_output(command);
             if (!strcmp(tmp, "1")) {
@@ -485 +486 @@
                 fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
             }       
-            paranoid_free(tmp);
-            paranoid_free(command);
+            mr_free(tmp);
+            mr_free(command);
         }
         log_msg(2, "call_make_iso (DVD res) is ... %s",
@@ -496 +497 @@
         || bkpinfo->backup_media_type == cdr) {
         if (!bkpinfo->manual_cd_tray) {
-            asprintf(&extra_cdrom_params, "-waiti ");
+            mr_asprintf(&extra_cdrom_params, "-waiti ");
         }
         if (bkpinfo->backup_media_type == cdrw) {
             if (extra_cdrom_params != NULL) {
-                asprintf(&tmp, extra_cdrom_params);
-                paranoid_free(extra_cdrom_params);
-                asprintf(&extra_cdrom_params, "%s blank=fast ", tmp);
+                mr_asprintf(&tmp, extra_cdrom_params);
+                mr_free(extra_cdrom_params);
+                mr_asprintf(&extra_cdrom_params, "%s blank=fast ", tmp);
             } else {
-                asprintf(&extra_cdrom_params, "blank=fast ");
+                mr_asprintf(&extra_cdrom_params, "blank=fast ");
             }
         }
@@ -510 +511 @@
         tmp1 = find_home_of_exe("dvdrecord");
         if (tmp) {
-            asprintf(&cdr_exe, "cdrecord");
+            mr_asprintf(&cdr_exe, "cdrecord");
         } else if (tmp1) {
-            asprintf(&cdr_exe, "dvdrecord");
+            mr_asprintf(&cdr_exe, "dvdrecord");
         } else {
             fatal_error("Please install either cdrecord or dvdrecord.");
         }
-        paranoid_free(tmp);
-        paranoid_free(tmp1);
+        mr_free(tmp);
+        mr_free(tmp1);
 
         if (bkpinfo->nonbootable_backup) {
-            asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", bkpinfo->mr_conf->mondo_iso_creation_cmd);
+            mr_asprintf(&mondo_mkisofs_sz, "%s -r -p MondoRescue -publisher www.mondorescue.org -A Mondo_Rescue_GPL_Version -V _CD#_", bkpinfo->mr_conf->mondo_iso_creation_cmd);
         } else if
 #ifdef __FreeBSD__
@@ -529 +530 @@
 #ifdef __IA64__
     {
-        asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_ELILO);
     }
 #else
     {
-        asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
+        mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_LILO);
     }
 #endif
         else
         {
-            asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
+            mr_asprintf(&mondo_mkisofs_sz, MONDO_MKISOFS_REGULAR_SYSLINUX);
         }
         if (bkpinfo->manual_cd_tray) {
             if (bkpinfo->call_before_iso == NULL) {
-                asprintf(&bkpinfo->call_before_iso,
+                mr_asprintf(&bkpinfo->call_before_iso,
                         "%s -o %s/temporary.iso . 2>> _ERR_",
                         mondo_mkisofs_sz, bkpinfo->tmpdir);
             } else {
-                asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
-                asprintf(&bkpinfo->call_before_iso,
+                mr_asprintf(&call_before_iso_user, bkpinfo->call_before_iso);
+                mr_asprintf(&bkpinfo->call_before_iso,
                                     "( %s -o %s/temporary.iso . 2>> _ERR_ ; %s )",
                         mondo_mkisofs_sz, bkpinfo->tmpdir, call_before_iso_user);
-                paranoid_free(call_before_iso_user);
+                mr_free(call_before_iso_user);
             }
             log_it("bkpinfo->call_before_iso = %s", bkpinfo->call_before_iso);
-            asprintf(&bkpinfo->call_make_iso,
+            mr_asprintf(&bkpinfo->call_make_iso,
                     "%s %s -v %s fs=4m dev=%s speed=%d %s/temporary.iso",
                     cdr_exe, (bkpinfo->please_dont_eject) ? " " : "-eject",
@@ -559 +560 @@
                     bkpinfo->cdrw_speed, bkpinfo->tmpdir);
         } else {
-            asprintf(&bkpinfo->call_make_iso,
+            mr_asprintf(&bkpinfo->call_make_iso,
                     "%s . 2>> _ERR_ | %s %s %s fs=4m dev=%s speed=%d -",
                     mondo_mkisofs_sz, cdr_exe,
@@ -566 +567 @@
                     bkpinfo->cdrw_speed);
         }
-        paranoid_free(mondo_mkisofs_sz);
-        paranoid_free(cdr_exe);
-        paranoid_free(extra_cdrom_params);
+        mr_free(mondo_mkisofs_sz);
+        mr_free(cdr_exe);
+        mr_free(extra_cdrom_params);
     }                           // end of CD code
 
@@ -581 +582 @@
 
         log_it("isodir = %s", bkpinfo->isodir);
-        asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1",
+        mr_asprintf(&command, "df -P %s | tail -n1 | cut -d' ' -f1",
                  bkpinfo->isodir);
         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);
-        asprintf(&tmp1, "%s/ISO-DEV", bkpinfo->tmpdir);
+        mr_asprintf(&tmp1, "%s/ISO-DEV", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp1, tmp);
-        paranoid_free(tmp1);
-
-        asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
+        mr_free(tmp1);
+
+        mr_asprintf(&command, "mount | grep -w %s | tail -n1 | cut -d' ' -f3",
                  tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         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);
 
-        asprintf(&tmp1, "%s/ISO-MNT", bkpinfo->tmpdir);
+        mr_asprintf(&tmp1, "%s/ISO-MNT", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp1, tmp);
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         log_it("isomnt: %s, %d", tmp, strlen(tmp));
         if (strlen(bkpinfo->isodir) < strlen(tmp)) {
-            asprintf(&iso_path, " ");
+            mr_asprintf(&iso_path, " ");
         } else {
-            asprintf(&iso_path, "%s", bkpinfo->isodir + strlen(tmp));
-        }
-        paranoid_free(tmp);
-
-        asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir);
+            mr_asprintf(&iso_path, "%s", bkpinfo->isodir + strlen(tmp));
+        }
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "%s/ISODIR", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, iso_path);
-        paranoid_free(tmp);
+        mr_free(tmp);
         log_it("isodir: %s", iso_path);
-        paranoid_free(iso_path);
-        asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
+        mr_free(iso_path);
+        mr_asprintf(&tmp, "%s/ISO-PREFIX", bkpinfo->tmpdir);
         write_one_liner_data_file(tmp, bkpinfo->prefix);
         log_it("iso-prefix: %s",  bkpinfo->prefix);
-        paranoid_free(tmp);
+        mr_free(tmp);
 /* End patch */
     }                           // end of iso code
 
     if (bkpinfo->backup_media_type == nfs) {
-        asprintf(&hostname, bkpinfo->nfs_mount);
+        mr_asprintf(&hostname, bkpinfo->nfs_mount);
         colon = strchr(hostname, ':');
         if (!colon) {
@@ -639 +640 @@
                 retval++;
             } else {
-                asprintf(&ip_address, "%s%s", inet_ntoa((struct in_addr)
+                mr_asprintf(&ip_address, "%s%s", inet_ntoa((struct in_addr)
                                                         *((struct in_addr
                                                            *) hent->
                                                           h_addr)),
                          strchr(bkpinfo->nfs_mount, ':'));
-                paranoid_alloc(bkpinfo->nfs_mount, ip_address);
-                paranoid_free(ip_address);
+                mr_allocstr(bkpinfo->nfs_mount, ip_address);
+                mr_free(ip_address);
             }
         }
         store_nfs_config(bkpinfo);
-        paranoid_free(hostname);
+        mr_free(hostname);
     }
 
@@ -656 +657 @@
         fprintf(stderr, "Type 'man mondoarchive' for help.\n");
     }
-    asprintf(&tmp, "%s", MONDO_TMPISOS);
+    mr_asprintf(&tmp, "%s", MONDO_TMPISOS);
     if (does_file_exist(tmp)) {
         unlink(tmp);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (strlen(bkpinfo->tmpdir) < 2 || strlen(bkpinfo->scratchdir) < 2) {
@@ -668 +669 @@
     if (bkpinfo->include_paths == NULL) {
         //      fatal_error ("Why no backup path?");
-        asprintf(&bkpinfo->include_paths, "/");
+        mr_asprintf(&bkpinfo->include_paths, "/");
     }
     chmod(bkpinfo->scratchdir, 0700);
     chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_alloc(g_backup_media_string,bkpinfo->backup_media_string);
+    mr_allocstr(g_backup_media_string,bkpinfo->backup_media_string);
     return (retval);
 }
@@ -716 +717 @@
     g_current_media_number = 1;
     bkpinfo->postnuke_tarball = NULL;
-    paranoid_free(bkpinfo->nfs_mount);
+    mr_free(bkpinfo->nfs_mount);
     return (res);
 }
@@ -746 +747 @@
     }
 
-    paranoid_free(bkpinfo->media_device);
-    paranoid_free(bkpinfo->boot_device);
-    paranoid_free(bkpinfo->zip_exe);
-    paranoid_free(bkpinfo->zip_suffix);
-    paranoid_free(bkpinfo->restore_path);
+    mr_free(bkpinfo->media_device);
+    mr_free(bkpinfo->boot_device);
+    mr_free(bkpinfo->zip_exe);
+    mr_free(bkpinfo->zip_suffix);
+    mr_free(bkpinfo->restore_path);
     bkpinfo->use_lzo = FALSE;
     bkpinfo->verify_data = FALSE;
@@ -758 +759 @@
         (am_I_in_disaster_recovery_mode()? TRUE : FALSE);
     if (bkpinfo->disaster_recovery) {
-        paranoid_alloc(bkpinfo->isodir, "/");
+        mr_allocstr(bkpinfo->isodir, "/");
     } else {
-        paranoid_alloc(bkpinfo->isodir, "/var/cache/mondo/iso");
-    }
-    paranoid_alloc(bkpinfo->prefix, STD_PREFIX);
-
-    paranoid_free(bkpinfo->scratchdir);
+        mr_allocstr(bkpinfo->isodir, "/var/cache/mondo/iso");
+    }
+    mr_allocstr(bkpinfo->prefix, STD_PREFIX);
+
+    mr_free(bkpinfo->scratchdir);
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
-    paranoid_free(bkpinfo->tmpdir);
-    asprintf(&bkpinfo->tmpdir, "/tmp/tmpfs/mondo.tmp.%d", (int) (random() % 32768));    // for mondorestore
+    mr_free(bkpinfo->tmpdir);
+    mr_asprintf(&bkpinfo->tmpdir, "/tmp/tmpfs/mondo.tmp.%d", (int) (random() % 32768)); // for mondorestore
     bkpinfo->optimal_set_size = 0;
     bkpinfo->backup_media_type = none;
-    paranoid_free(bkpinfo->backup_media_string);
-    paranoid_alloc(bkpinfo->include_paths, "/");
-    paranoid_free(bkpinfo->exclude_paths);
-    paranoid_free(bkpinfo->call_before_iso);
-    paranoid_free(bkpinfo->call_make_iso);
-    paranoid_free(bkpinfo->call_burn_iso);
-    paranoid_free(bkpinfo->call_after_iso);
-    paranoid_free(bkpinfo->image_devs);
-    paranoid_free(bkpinfo->postnuke_tarball);
-    paranoid_free(bkpinfo->kernel_path);
-    paranoid_free(bkpinfo->nfs_mount);
-    paranoid_free(bkpinfo->nfs_remote_dir);
+    mr_free(bkpinfo->backup_media_string);
+    mr_allocstr(bkpinfo->include_paths, "/");
+    mr_free(bkpinfo->exclude_paths);
+    mr_free(bkpinfo->call_before_iso);
+    mr_free(bkpinfo->call_make_iso);
+    mr_free(bkpinfo->call_burn_iso);
+    mr_free(bkpinfo->call_after_iso);
+    mr_free(bkpinfo->image_devs);
+    mr_free(bkpinfo->postnuke_tarball);
+    mr_free(bkpinfo->kernel_path);
+    mr_free(bkpinfo->nfs_mount);
+    mr_free(bkpinfo->nfs_remote_dir);
     bkpinfo->wipe_media_first = FALSE;
     bkpinfo->differential = FALSE;
@@ -805 +806 @@
     assert_string_is_neither_NULL_nor_zerolength(partition);
 
-    asprintf(&command, "df -m -P %s &> /dev/null", partition);
+    mr_asprintf(&command, "df -m -P %s &> /dev/null", partition);
     if (system(command)) {
         return (-1);
     }                           // partition does not exist
-    paranoid_free(command);
-
-    asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
+    mr_free(command);
+
+    mr_asprintf(&command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4",
              partition);
     out_sz = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
     if (strlen(out_sz) == 0) {
         return (-1);
     }                           // error within df, probably
     res = atol(out_sz);
-    paranoid_free(out_sz);
+    mr_free(out_sz);
     return (res);
 }
@@ -868 +869 @@
             (_("WARNING! You have very little RAM. Please upgrade to 64MB or more."));
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 #endif
 
@@ -929 +930 @@
             log_to_screen(_("Please install ms-sys just in case."));
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 #endif
     }
@@ -937 +938 @@
         whine_if_not_found("cmp");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     run_program_and_log_output
@@ -958 +959 @@
         }
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 #ifndef __FreeBSD__
     if (!does_file_exist("/etc/modules.conf")) {
@@ -1041 +1042 @@
 
     if (!does_file_exist(config_file)) {
-        asprintf(&tmp, "(read_cfg_var) Cannot find %s config file",
+        mr_asprintf(&tmp, "(read_cfg_var) Cannot find %s config file",
                  config_file);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         value = NULL;
         return (1);
@@ -1054 +1055 @@
         return (0);
     */ } else {
-        asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
+        mr_asprintf(&command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5",
                 label, config_file);
         value = call_program_and_get_last_line_of_output(command);
-        paranoid_free(command);
+        mr_free(command);
         if (strlen(value) == 0) {
             return (1);
@@ -1108 +1109 @@
     log_msg(1, "Started sub");
     log_msg(4, "Setting command to something");
-    asprintf(&command,
+    mr_asprintf(&command,
              "grep -v \":\" /etc/fstab | grep -vx \"#.*\" | grep -w \"/boot\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. Command = '%s'", command);
     tmp = call_program_and_get_last_line_of_output(command);
-    paranoid_free(command);
+    mr_free(command);
 
     log_msg(4, "tmp = '%s'", tmp);
@@ -1119 +1120 @@
         if (strstr(tmp, "LABEL=")) {
             if (!run_program_and_log_output("mount /boot", 5)) {
-                paranoid_free(g_boot_mountpt);
-                asprintf(&g_boot_mountpt, "/boot");
+                mr_free(g_boot_mountpt);
+                mr_asprintf(&g_boot_mountpt, "/boot");
                 log_msg(1, "Mounted /boot");
             } else {
@@ -1126 +1127 @@
             }
         } else {
-            asprintf(&command, "mount | grep -w \"%s\"", tmp);
+            mr_asprintf(&command, "mount | grep -w \"%s\"", tmp);
             log_msg(3, "command = %s", command);
             if (run_program_and_log_output(command, 5)) {
-                paranoid_free(g_boot_mountpt);
-                asprintf(&g_boot_mountpt, tmp);
-                asprintf(&tmp1,
+                mr_free(g_boot_mountpt);
+                mr_asprintf(&g_boot_mountpt, tmp);
+                mr_asprintf(&tmp1,
                          "%s (your /boot partition) is not mounted. I'll mount it before backing up",
                          g_boot_mountpt);
                 log_it(tmp1);
-                paranoid_free(tmp1);
-
-                asprintf(&tmp1, "mount %s", g_boot_mountpt);
+                mr_free(tmp1);
+
+                mr_asprintf(&tmp1, "mount %s", g_boot_mountpt);
                 if (run_program_and_log_output(tmp1, 5)) {
                     /* BERLIOS: Useless ???
-                    paranoid_free(g_boot_mountpt);
-                    asprintf(&g_boot_mountpt, " ");
+                    mr_free(g_boot_mountpt);
+                    mr_asprintf(&g_boot_mountpt, " ");
                     */
                     log_msg(1, "Plan B");
                     if (!run_program_and_log_output("mount /boot", 5)) {
-                        paranoid_free(g_boot_mountpt);
-                        asprintf(&g_boot_mountpt, "/boot");
+                        mr_free(g_boot_mountpt);
+                        mr_asprintf(&g_boot_mountpt, "/boot");
                         log_msg(1, "Plan B worked");
                     } else {
@@ -1153 +1154 @@
                     }
                 }
-                paranoid_free(tmp1);
+                mr_free(tmp1);
             }
-            paranoid_free(command);
-        }
-    }
-    paranoid_free(tmp);
+            mr_free(command);
+        }
+    }
+    mr_free(tmp);
     log_msg(1, "Ended sub");
 }
@@ -1172 +1173 @@
     log_msg(3, "starting");
     if (g_boot_mountpt != NULL) {
-        asprintf(&tmp, "umount %s", g_boot_mountpt);
+        mr_asprintf(&tmp, "umount %s", g_boot_mountpt);
         if (run_program_and_log_output(tmp, 5)) {
             log_it("WARNING - unable to unmount /boot");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     log_msg(3, "leaving");
@@ -1205 +1206 @@
 
     if (!does_file_exist(config_file)) {
-        asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
+        mr_asprintf(&tmp, "(write_cfg_file) Cannot find %s config file",
                  config_file);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -1214 +1215 @@
              ("mktemp -q /tmp/mojo-jojo.blah.XXXXXX");
     if (does_file_exist(config_file)) {
-        asprintf(&command, "grep -vx '%s .*' %s > %s",
+        mr_asprintf(&command, "grep -vx '%s .*' %s > %s",
                 label, config_file, tempfile);
         paranoid_system(command);
-        paranoid_free(command);
-    }
-    asprintf(&command, "echo \"%s %s\" >> %s", label, value, tempfile);
+        mr_free(command);
+    }
+    mr_asprintf(&command, "echo \"%s %s\" >> %s", label, value, tempfile);
     paranoid_system(command);
-    paranoid_free(command);
-
-    asprintf(&command, "mv -f %s %s", tempfile, config_file);
+    mr_free(command);
+
+    mr_asprintf(&command, "mv -f %s %s", tempfile, config_file);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
     unlink(tempfile);
-    paranoid_free(tempfile);
+    mr_free(tempfile);
     return (0);
 }
@@ -1243 +1244 @@
     } else {
         iamhere("Freeing globals");
-        paranoid_free(g_boot_mountpt);
-        paranoid_free(g_mondo_home);
-        paranoid_free(g_tmpfs_mountpt);
-        paranoid_free(g_erase_tmpdir_and_scratchdir);
-        paranoid_free(g_serial_string);
-        paranoid_free(g_magicdev_command);
+        mr_free(g_boot_mountpt);
+        mr_free(g_mondo_home);
+        mr_free(g_tmpfs_mountpt);
+        mr_free(g_erase_tmpdir_and_scratchdir);
+        mr_free(g_serial_string);
+        mr_free(g_magicdev_command);
     }
 }
@@ -1295 +1296 @@
 
     if (!g_magicdev_command) {
-        asprintf(&tmp, "%s &", g_magicdev_command);
+        mr_asprintf(&tmp, "%s &", g_magicdev_command);
         paranoid_system(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 }

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

@@ -18 +18 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -60 +61 @@
     assert_string_is_neither_NULL_nor_zerolength(stderr_fname);
 
-    asprintf(&afio_found_changes, "%s.afio", ignorefiles_fname);
+    mr_asprintf(&afio_found_changes, "%s.afio", ignorefiles_fname);
     sync();
 
@@ -69 +70 @@
 
     log_msg(1, "Now scanning log file for 'afio: ' stuff");
-    asprintf(&command,
+    mr_asprintf(&command,
              "grep \"afio: \" %s | sed 's/afio: //' | grep -vx \"/dev/.*\" >> %s",
              stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         log_msg(2, "Warning - failed to think");
@@ -80 +81 @@
 
     log_msg(1, "Now scanning log file for 'star: ' stuff");
-    asprintf(&command,
+    mr_asprintf(&command,
              "grep \"star: \" %s | sed 's/star: //' | grep -vx \"/dev/.*\" >> %s",
              stderr_fname, afio_found_changes);
     log_msg(2, command);
     res = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         log_msg(2, "Warning - failed to think");
@@ -91 +92 @@
 //  exclude_nonexistent_files (afio_found_changes);
     afio_diffs = count_lines_in_file(afio_found_changes);
-    asprintf(&command,
+    mr_asprintf(&command,
              "sort %s %s %s | uniq -c | awk '{ if ($1==\"2\") {print $2;};}' | grep -v \"incheckentry xwait()\" > %s",
              ignorefiles_fname, afio_found_changes, afio_found_changes,
@@ -97 +98 @@
     log_msg(2, command);
     paranoid_system(command);
-    paranoid_free(command);
-    paranoid_free(afio_found_changes);
+    mr_free(command);
+    mr_free(afio_found_changes);
     return (afio_diffs);
 }
@@ -145 +146 @@
         } else {
             retval++;
-            asprintf(&tmp, "Warning - missing set(s) between %d and %d\n",
+            mr_asprintf(&tmp, "Warning - missing set(s) between %d and %d\n",
                      g_last_afioball_number, set_number - 1);
             log_to_screen(tmp);
-            paranoid_free(tmp);
-        }
-    }
-    asprintf(&tmp, "Verifying %s #%d's tarballs",
+            mr_free(tmp);
+        }
+    }
+    mr_asprintf(&tmp, "Verifying %s #%d's tarballs",
              bkpinfo->backup_media_string,
              g_current_media_number);
     open_evalcall_form(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     for (total_sets = set_number;
@@ -234 +235 @@
     if (bkpinfo->compression_level > 0) {
         if (bkpinfo->use_lzo) {
-            asprintf(&sz_exe, "lzop");
+            mr_asprintf(&sz_exe, "lzop");
         } else {
-            asprintf(&sz_exe, "bzip2");
+            mr_asprintf(&sz_exe, "bzip2");
         }
     } else {
-        asprintf(&sz_exe, " ");
+        mr_asprintf(&sz_exe, " ");
     }
 
     iamhere("before vsbf");
-    asprintf(&tmp, "Verifying %s#%d's big files",
+    mr_asprintf(&tmp, "Verifying %s#%d's big files",
              bkpinfo->backup_media_string,
              g_current_media_number);
     open_evalcall_form(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     iamhere("after vsbf");
-    asprintf(&mountpoint, "%s/archives", mtpt);
+    mr_asprintf(&mountpoint, "%s/archives", mtpt);
     if (last_bigfile_num == -1) {
         bigfile_num = 0;
@@ -279 +280 @@
                 paranoid_fclose(fin);
             }
-            asprintf(&tmp2, "%s/%s", bkpinfo->restore_path,
+            mr_asprintf(&tmp2, "%s/%s", bkpinfo->restore_path,
                      biggiestruct.filename);
             log_msg(2, "Opening biggiefile #%ld - '%s'", bigfile_num, tmp2);
@@ -286 +287 @@
                 retval++;
             }
-            paranoid_free(tmp2);
+            mr_free(tmp2);
 
             slice_num++;
@@ -299 +300 @@
                     g_current_media_number, bigfile_num, slice_num);
             if (bkpinfo->compression_level > 0) {
-                asprintf(&command, "%s -dc %s 2>> %s", sz_exe, tmp, MONDO_LOGFILE);
+                mr_asprintf(&command, "%s -dc %s 2>> %s", sz_exe, tmp, MONDO_LOGFILE);
             } else {
-                asprintf(&command, "cat %s", tmp);
+                mr_asprintf(&command, "cat %s", tmp);
             }
             if ((pin = popen(command, "r"))) {
@@ -339 +340 @@
                 }
             }
-            paranoid_free(command);
+            mr_free(command);
             slice_num++;
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(tmp1);
-    paranoid_free(mountpoint);
-    paranoid_free(sz_exe);
+    mr_free(tmp);
+    mr_free(tmp1);
+    mr_free(mountpoint);
+    mr_free(sz_exe);
 
     last_bigfile_num = bigfile_num;
@@ -355 +356 @@
     close_evalcall_form();
     if (bufblkA) {
-        paranoid_free(bufblkA);
+        mr_free(bufblkA);
     }
     if (bufblkB) {
-        paranoid_free(bufblkB);
+        mr_free(bufblkB);
     }
     return (0);
@@ -397 +398 @@
 
     /*  chdir("/"); */
-    asprintf(&outlog, "%s/afio.log", bkpinfo->tmpdir);
+    mr_asprintf(&outlog, "%s/afio.log", bkpinfo->tmpdir);
 
     /* if programmer forgot to say which compression thingy to use then find out */
@@ -403 +404 @@
         && strcmp(bkpinfo->zip_suffix, "lzo")) {
         log_msg(2, "OK, I'm going to start using lzop.");
-        paranoid_alloc(bkpinfo->zip_exe, "lzop");
-        paranoid_alloc(bkpinfo->zip_suffix, "lzo");
+        mr_allocstr(bkpinfo->zip_exe, "lzop");
+        mr_allocstr(bkpinfo->zip_suffix, "lzo");
         bkpinfo->use_lzo = TRUE;
     }
@@ -410 +411 @@
         && strcmp(bkpinfo->zip_suffix, "bz2")) {
         log_msg(2, "OK, I'm going to start using bzip2.");
-        paranoid_alloc(bkpinfo->zip_exe, "bzip2");
-        paranoid_alloc(bkpinfo->zip_suffix, "bz2");
+        mr_allocstr(bkpinfo->zip_exe, "bzip2");
+        mr_allocstr(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
     }
@@ -418 +419 @@
         bkpinfo->use_star = TRUE;
         if (strstr(tarball_fname, ".bz2"))
-            asprintf(&command,
+            mr_asprintf(&command,
                      "star -diff diffopts=mode,size,data file=%s %s >> %s 2>> %s",
                      tarball_fname,
@@ -425 +426 @@
     } else {
         bkpinfo->use_star = FALSE;
-        asprintf(&command, "afio -r -P %s -Z %s >> %s 2>> %s",
+        mr_asprintf(&command, "afio -r -P %s -Z %s >> %s 2>> %s",
                  bkpinfo->zip_exe, tarball_fname, outlog, outlog);
     }
     log_msg(6, "command=%s", command);
     paranoid_system(command);
-    paranoid_free(command);
+    mr_free(command);
 
     if (length_of_file(outlog) < 10) {
-        asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
+        mr_asprintf(&command, "cat %s >> %s", outlog, MONDO_LOGFILE);
     } else {
-        asprintf(&command, "cut -d':' -f%d %s | sort -u",
+        mr_asprintf(&command, "cut -d':' -f%d %s | sort -u",
                  (bkpinfo->use_star) ? 1 : 2, outlog);
         pin = popen(command, "r");
         if (pin) {
-            for (getline(&tmp, &n, pin); !feof(pin);
-                 getline(&tmp, &n, pin)) {
+            for (mr_getline(&tmp, &n, pin); !feof(pin);
+                 mr_getline(&tmp, &n, pin)) {
                 if (bkpinfo->use_star) {
                     if (!strstr(tmp, "diffopts=")) {
@@ -467 +468 @@
             }
             paranoid_pclose(pin);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else {
             log_OS_error(command);
         }
     }
-    paranoid_free(outlog);
-    paranoid_free(command);
+    mr_free(outlog);
+    mr_free(command);
 
     /*  chdir(old_pwd); */
@@ -545 +546 @@
         p++;
     }
-    asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
+    mr_free(tmp);
+
+    mr_asprintf(&tarball_fname, "%s/tmpfs/temporary-%s", bkpinfo->tmpdir, p);
     /* BERLIOS : useless
-       asprintf(&tmp, "Temporarily copying file from tape to '%s'",
+       mr_asprintf(&tmp, "Temporarily copying file from tape to '%s'",
        tarball_fname);
        log_it(tmp); 
-       paranoid_free(tmp);
+       mr_free(tmp);
      */
     read_file_from_stream_to_file(bkpinfo, tarball_fname, size);
     res = verify_a_tarball(bkpinfo, tarball_fname);
     if (res) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "Afioball '%s' no longer matches your live filesystem",
                  p);
         log_msg(0, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         retval++;
     }
     unlink(tarball_fname);
-    paranoid_free(tarball_fname);
+    mr_free(tarball_fname);
     return (retval);
 }
@@ -612 +613 @@
         p++;
     }
-    asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
-    asprintf(&tmp,
+    mr_asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
+    mr_asprintf(&tmp,
              "Temporarily copying biggiefile %s's slices from tape to '%s'",
              p, test_file);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     for (res =
          read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
@@ -629 +630 @@
         res = read_file_from_stream_to_file(bkpinfo, test_file, slice_siz);
         unlink(test_file);
-        paranoid_free(slice_fnam);
+        mr_free(slice_fnam);
         slice_fnam = (char *) &res;
         res =
@@ -640 +641 @@
         current_slice_number++;
         retval += res;
-        paranoid_free(slice_fnam);
+        mr_free(slice_fnam);
         slice_fnam = (char *) &res;
     }
-    paranoid_free(test_file);
-
-    asprintf(&biggie_cksum, slice_fnam);
-    paranoid_free(slice_fnam);
+    mr_free(test_file);
+
+    mr_asprintf(&biggie_cksum, slice_fnam);
+    mr_free(slice_fnam);
 
     if (biggie_cksum[0] != '\0') {
         orig_cksum = calc_checksum_of_file(biggie_fname);
         if (strcmp(biggie_cksum, orig_cksum)) {
-            asprintf(&tmp, "orig cksum=%s; curr cksum=%s", biggie_cksum,
+            mr_asprintf(&tmp, "orig cksum=%s; curr cksum=%s", biggie_cksum,
                      orig_cksum);
             log_msg(2, tmp);
-            paranoid_free(tmp);
-
-            asprintf(&tmp, _("%s has changed on live filesystem"),
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, _("%s has changed on live filesystem"),
                      biggie_fname);
             log_to_screen(tmp);
-            paranoid_free(tmp);
-
-            asprintf(&tmp, "echo \"%s\" >> /tmp/biggies.changed",
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, "echo \"%s\" >> /tmp/biggies.changed",
                      biggie_fname);
             system(tmp);
-            paranoid_free(tmp);
-        }
-        paranoid_free(orig_cksum);
-    }
-    paranoid_free(biggie_cksum);
+            mr_free(tmp);
+        }
+        mr_free(orig_cksum);
+    }
+    mr_free(biggie_cksum);
 
     return (retval);
@@ -702 +703 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
+    mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
              bkpinfo->tmpdir);
-    asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
+    mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
              bkpinfo->tmpdir);
     log_to_screen(_("Verifying regular archives on tape"));
@@ -726 +727 @@
         wrong_marker(BLK_START_AFIOBALLS, ctrl_chr);
     }
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
 
     for (res = read_header_block_from_stream(&size, fname, &ctrl_chr);
          ctrl_chr != BLK_STOP_AFIOBALLS;
          res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
-        asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+        mr_asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, current_afioball_number);
-        asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+        mr_asprintf(&curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, current_afioball_number);
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             iamhere("Reading EXAT files from tape");
-            paranoid_free(fname);
+            mr_free(fname);
             fname = (char *) &res;
             res =
@@ -745 +746 @@
                                           curr_acl_list_fname);
         }
-        paranoid_free(curr_xattr_list_fname);
-        paranoid_free(curr_acl_list_fname);
+        mr_free(curr_xattr_list_fname);
+        mr_free(curr_acl_list_fname);
 
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        asprintf(&tmp, "Verifying fileset #%ld", current_afioball_number);
+        mr_asprintf(&tmp, "Verifying fileset #%ld", current_afioball_number);
         /*log_it(tmp); */
         update_progress_form(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         res = verify_an_afioball_from_stream(bkpinfo, fname, size);
         if (res) {
-            asprintf(&tmp, _("Afioball %ld differs from live filesystem"),
+            mr_asprintf(&tmp, _("Afioball %ld differs from live filesystem"),
                      current_afioball_number);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         retval += res;
         current_afioball_number++;
         g_current_progress++;
-        paranoid_free(fname);
+        mr_free(fname);
         fname = (char *) &res;
         res = read_header_block_from_stream(&size, fname, &ctrl_chr);
@@ -772 +773 @@
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        paranoid_free(fname);
+        mr_free(fname);
         fname = (char *) &res;
     }
     log_msg(1, "All done with afioballs");
     close_progress_form();
-    paranoid_free(fname);
+    mr_free(fname);
     return (retval);
 }
@@ -816 +817 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
+    mr_asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
              bkpinfo->tmpdir);
-    asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
+    mr_asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
              bkpinfo->tmpdir);
-    asprintf(&comment, "Verifying all bigfiles.");
+    mr_asprintf(&comment, "Verifying all bigfiles.");
     log_to_screen(comment);
     res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
@@ -826 +827 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             iamhere("Grabbing the EXAT biggiefiles");
-            paranoid_free(orig_fname);
+            mr_free(orig_fname);
             orig_fname = (char *) &ctrl_chr;
             res =
@@ -834 +835 @@
         }
     }
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
-    paranoid_free(orig_fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
+    mr_free(orig_fname);
     orig_fname = (char *) &ctrl_chr;
 
@@ -847 +848 @@
                        _("Please wait. This may take some time."), "",
                        noof_biggiefiles);
-    paranoid_free(comment);
+    mr_free(comment);
 
     for (res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
@@ -863 +864 @@
             p++;
         }
-        asprintf(&comment, _("Verifying bigfile #%ld (%ld K)"),
+        mr_asprintf(&comment, _("Verifying bigfile #%ld (%ld K)"),
                  current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
-        paranoid_free(comment);
-
-        asprintf(&logical_fname, "%s/%s", bkpinfo->restore_path,
+        mr_free(comment);
+
+        mr_asprintf(&logical_fname, "%s/%s", bkpinfo->restore_path,
                  orig_fname);
         res =
             verify_a_biggiefile_from_stream(bkpinfo, logical_fname, size);
-        paranoid_free(logical_fname);
+        mr_free(logical_fname);
         retval += res;
         current_biggiefile_number++;
         g_current_progress++;
-        paranoid_free(orig_fname);
+        mr_free(orig_fname);
         orig_fname = (char *) &ctrl_chr;
     }
@@ -922 +923 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    asprintf(&fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
+    mr_asprintf(&mountpoint, "%s/cdrom", bkpinfo->tmpdir);
+    mr_asprintf(&fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
              bkpinfo->prefix, g_current_media_number);
 
@@ -929 +930 @@
     sync();
     if (!does_file_exist(fname)) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "%s not found; assuming you backed up to CD; verifying CD...",
                  fname);
         log_msg(2, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (bkpinfo->manual_cd_tray) {
@@ -943 +944 @@
         }
     } else {
-        asprintf(&tmp, "%s found; verifying ISO...", fname);
+        mr_asprintf(&tmp, "%s found; verifying ISO...", fname);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 #ifdef __FreeBSD__
         ret = 0;
@@ -951 +952 @@
         mddevice = make_vn(fname);
         if (ret) {
-            asprintf(&tmp, _("make_vn of %s failed; unable to verify ISO\n"),
+            mr_asprintf(&tmp, _("make_vn of %s failed; unable to verify ISO\n"),
                      fname);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (1);
         }
-        asprintf(&command, "mount_cd9660 %s %s", mddevice, mountpoint);
+        mr_asprintf(&command, "mount_cd9660 %s %s", mddevice, mountpoint);
 #else
-        asprintf(&command, "mount -o loop,ro -t iso9660 %s %s", fname,
+        mr_asprintf(&command, "mount -o loop,ro -t iso9660 %s %s", fname,
                  mountpoint);
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            asprintf(&tmp, _("%s failed; unable to mount ISO image\n"),
+            mr_asprintf(&tmp, _("%s failed; unable to mount ISO image\n"),
                      command);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (1);
         }
-        paranoid_free(command);
+        mr_free(command);
     }
     log_msg(2, "OK, I've mounted the ISO/CD\n");
-    asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
+    mr_asprintf(&tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
         log_msg
@@ -984 +985 @@
 */
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     verify_afioballs_on_CD(bkpinfo, mountpoint);
@@ -992 +993 @@
 #ifdef __FreeBSD__
     ret = 0;
-    asprintf(&command, "umount %s", mountpoint);
+    mr_asprintf(&command, "umount %s", mountpoint);
     ret += system(command);
 
@@ -998 +999 @@
     if (ret)
 #else
-    asprintf(&command, "umount %s", mountpoint);
+    mr_asprintf(&command, "umount %s", mountpoint);
 
     if (system(command))
 #endif
     {
-        asprintf(&tmp, "%s failed; unable to unmount ISO image\n",
+        mr_asprintf(&tmp, "%s failed; unable to unmount ISO image\n",
                  command);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         retval++;
     } else {
         log_msg(2, "OK, I've unmounted the ISO file\n");
     }
-    paranoid_free(command);
-    paranoid_free(mountpoint);
+    mr_free(command);
+    mr_free(mountpoint);
 
     if (!does_file_exist(fname)) {
-        asprintf(&command, "umount %s", bkpinfo->media_device);
+        mr_asprintf(&command, "umount %s", bkpinfo->media_device);
         run_program_and_log_output(command, 2);
-        paranoid_free(command);
+        mr_free(command);
 
         if (!bkpinfo->please_dont_eject
@@ -1024 +1025 @@
         }
     }
-    paranoid_free(fname);
+    mr_free(fname);
     return (retval);
 }
@@ -1068 +1069 @@
     paranoid_system
         ("rm -f /tmp/biggies.changed /tmp/changed.files.[0-9]* 2> /dev/null");
-    asprintf(&changed_files_fname, "/tmp/changed.files.%d",
+    mr_asprintf(&changed_files_fname, "/tmp/changed.files.%d",
              (int) (random() % 32767));
-    asprintf(&tmp,
+    mr_asprintf(&tmp,
              "grep -x \"%s:.*\" %s | cut -d'\"' -f2 | sort -u | awk '{print \"/\"$0;};' | tr -s '/' '/' | grep -v \"(total of\" | grep -v \"incheckentry.*xwait\" | grep -vx \"/afio:.*\" | grep -vx \"dev/.*\"  > %s",
              (bkpinfo->use_star) ? "star" : "afio", MONDO_LOGFILE,
@@ -1086 +1087 @@
         }
     }
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "cat /tmp/biggies.changed >> %s", changed_files_fname);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "cat /tmp/biggies.changed >> %s", changed_files_fname);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     diffs = count_lines_in_file(changed_files_fname);
     if (diffs > 0) {
-        asprintf(&tmp, "cp -f %s %s", changed_files_fname,
+        mr_asprintf(&tmp, "cp -f %s %s", changed_files_fname,
                  "/tmp/changed.files");
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
-
-        asprintf(&tmp,
+        mr_free(tmp);
+
+        mr_asprintf(&tmp,
                  "%ld files differed from live filesystem; type less %s or less %s to see",
                  diffs, changed_files_fname, "/tmp/changed.files");
         log_msg(0, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         log_to_screen
@@ -1111 +1112 @@
         //      retval++;
     }
-    paranoid_free(changed_files_fname);
+    mr_free(changed_files_fname);
     return (retval);
 }
@@ -1133 +1134 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
-    asprintf(&output, "%s/archives/%d.star.%s", mountpoint, setno,
+    mr_asprintf(&output, "%s/archives/%d.star.%s", mountpoint, setno,
              bkpinfo->zip_suffix);
     if (!does_file_exist(output)) {
-        paranoid_free(output);
-        asprintf(&output, "%s/archives/%d.afio.%s", mountpoint, setno,
+        mr_free(output);
+        mr_asprintf(&output, "%s/archives/%d.afio.%s", mountpoint, setno,
                  bkpinfo->zip_suffix);
     }

trunk/mondo/src/common/mondostructures.h

@@ -773 +773 @@
     int mindi_ia64_boot_size;
     char *mondo_iso_creation_cmd;
-};
+    char *mondo_logfile;
+};

trunk/mondo/src/common/mr_string.c

@@ -1 +1 @@
 /*
- * mr_string.c - New generation of string handling functions
+ * $Id$
+ *
+ * New generation of string handling functions
  */
 
@@ -98 +100 @@
 
     return retstr;
-
 }

trunk/mondo/src/common/newt-specific.c

@@ -26 +26 @@
 #include "libmondo-fork-EXT.h"
 #include "newt-specific-EXT.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -116 +117 @@
                     ("---promptdialogYN---1--- %s\r\n---promptdialogYN---Q--- [yes] [no] ---\r\n--> ",
                      prompt);
-                (void) getline(&tmp, &n, stdin);
+                mr_getline(&tmp, &n, stdin);
                 if (tmp[strlen(tmp) - 1] == '\n')
                     tmp[strlen(tmp) - 1] = '\0';
@@ -125 +126 @@
                 }
                 if (strstr(_("yesYES"), tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (TRUE);
                 } else if (strstr(_("NOno"), tmp)) {
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     return (FALSE);
                 } else {
@@ -161 +162 @@
                 ("---promptdialogOKC---1--- %s\r\n---promptdialogOKC---Q--- [OK] [Cancel] ---\r\n--> ",
                  prompt);
-            (void) getline(&tmp, &n, stdin);
+            mr_getline(&tmp, &n, stdin);
             if (tmp[strlen(tmp) - 1] == '\n')
                 tmp[strlen(tmp) - 1] = '\0';
@@ -170 +171 @@
             }
             if (strstr(_("okOKOkYESyes"), tmp)) {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (FALSE);
             }
@@ -243 +244 @@
     char *tmp = NULL;
 
-    asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
+    mr_asprintf(&tmp,"kill `ps %s | grep \" %s \" | awk '{print $1;}' | grep -vx \"\\?\"`", ps_options, str);
 run_program_and_log_output(tmp, TRUE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -264 +265 @@
         /*@ end vars **************************************************** */
 
-        asprintf(&fatalstr, "-------FATAL ERROR---------");
+        mr_asprintf(&fatalstr, "-------FATAL ERROR---------");
         set_signals(FALSE);     // link to external func
         g_exiting = TRUE;
@@ -297 +298 @@
         sync();
         if (g_tmpfs_mountpt != NULL) {
-            asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
+            mr_asprintf(&tmp, "umount %s", g_tmpfs_mountpt);
             chdir("/");
             for (i = 0; i < 10 && run_program_and_log_output(tmp, 5); i++) {
@@ -304 +305 @@
                 run_program_and_log_output(tmp, 5);
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
 
@@ -312 +313 @@
 
         if (g_selfmounted_isodir) {
-            asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 5);
-            paranoid_free(g_selfmounted_isodir);
+            mr_free(g_selfmounted_isodir);
         }
 
@@ -322 +323 @@
             log_msg(0, fatalstr);
             log_msg(0, error_string);
-            //      popup_and_OK (error_string);
             newtFinished();
         }
 
-        system
-            ("gzip -9c "MONDO_LOGFILE" > /tmp/MA.log.gz 2> /dev/null");
         printf
                 (_("If you require technical support, please contact the mailing list.\n"));
@@ -334 +332 @@
                 (_("The list's members can help you, if you attach that file to your e-mail.\n"));
         printf(_("Log file: %s\n"), MONDO_LOGFILE);
-        if (does_file_exist("/tmp/MA.log.gz")) {
-            printf
-                (_("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n"));
-        }
         printf(_("Mondo has aborted.\n"));
         register_pid(0, "mondo");   // finish() does this too, FYI
@@ -357 +351 @@
      finish(int signal) {
         char *command = NULL;
-
-        /*  if (signal==0) { popup_and_OK("Please press <enter> to quit."); } */
-
-        /* newtPopHelpLine(); */
 
         register_pid(0, "mondo");
@@ -371 +361 @@
         }
         if (g_selfmounted_isodir) {
-            asprintf(&command, "umount %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "umount %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            asprintf(&command, "rmdir %s", g_selfmounted_isodir);
+            mr_asprintf(&command, "rmdir %s", g_selfmounted_isodir);
             run_program_and_log_output(command, 1);
-            paranoid_free(g_selfmounted_isodir);
-        }
-//  iamhere("foo");
-        /* system("clear"); */
-//  iamhere("About to call newtFinished");
+            mr_free(g_selfmounted_isodir);
+        }
         if (!g_text_mode) {
             if (does_file_exist("/THIS-IS-A-RAMDISK")) {
@@ -389 +376 @@
             }
         }
-//  system("clear");
-//  iamhere("Finished calling newtFinished");
         printf(_("Execution run ended; result=%d\n"), signal);
         printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
@@ -428 +413 @@
         }
         if (grep_for_me[0] != '\0') {
-            asprintf(&command, "grep '%s' %s | tail -n%d",
+            mr_asprintf(&command, "grep '%s' %s | tail -n%d",
                      grep_for_me, filename, g_noof_log_lines);
         } else {
-            asprintf(&command, "tail -n%d %s", g_noof_log_lines, filename);
+            mr_asprintf(&command, "tail -n%d %s", g_noof_log_lines, filename);
         }
         fin = popen(command, "r");
@@ -440 +425 @@
                 for (;
                     strlen(err_log_lines[i]) < 2 && !feof(fin);) {
-                    getline(&(err_log_lines[i]), &n, fin);
+                    mr_getline(&(err_log_lines[i]), &n, fin);
                     strip_spaces(err_log_lines[i]);
                     if (!strncmp(err_log_lines[i], "root:", 5)) {
-                        asprintf(&tmp, "%s", err_log_lines[i] + 6);
-                        paranoid_free(err_log_lines[i]);
+                        mr_asprintf(&tmp, "%s", err_log_lines[i] + 6);
+                        mr_free(err_log_lines[i]);
                         err_log_lines[i] = tmp;
                     }
@@ -455 +440 @@
         }
         refresh_log_screen();
-        paranoid_free(command);
+        mr_free(command);
     }
 
@@ -477 +462 @@
 
         va_start(args, fmt);
-        vasprintf(&output, fmt, args);
+        mr_vasprintf(&output, fmt, args);
         log_msg(0, output);
         if (strlen(output) > 80) {
@@ -489 +474 @@
 
         if (err_log_lines) {
-            paranoid_free(err_log_lines[0]);
+            mr_free(err_log_lines[0]);
             for (i = 1; i < g_noof_log_lines; i++) {
                 err_log_lines[i - 1] = err_log_lines[i];
@@ -549 +534 @@
 
         assert(ttl != NULL);
-        asprintf(&title, ttl);
+        mr_asprintf(&title, ttl);
         // BERLIOS: We need to unallocate it somewhere
-        asprintf(&g_isoform_header_str, title);
+        mr_asprintf(&g_isoform_header_str, title);
         //  center_string (title, 80);
         if (g_text_mode) {
             log_msg(0, title);
         } else {
-            asprintf(&tmp, title);
+            mr_asprintf(&tmp, title);
             /* BERLIOS: center_string is now broken replace it ! */
             //center_string(tmp, 80);
             newtPushHelpLine(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         /* BERLIOS: center_string is now broken replace it ! */
@@ -581 +566 @@
         }
         update_evalcall_form(0);
-        paranoid_free(title);
+        mr_free(title);
     }
 
@@ -613 +598 @@
         assert(b3 != NULL);
 
-        asprintf(&blurb1, b1);
-        asprintf(&blurb2, b2);
-        asprintf(&blurb3, b3);
-        asprintf(&b1c, b1);
+        mr_asprintf(&blurb1, b1);
+        mr_asprintf(&blurb2, b2);
+        mr_asprintf(&blurb3, b3);
+        mr_asprintf(&b1c, b1);
         /* BERLIOS: center_string is now broken replace it ! */
         //center_string(b1c, 80);
@@ -627 +612 @@
         g_current_progress = 0;
         // BERLIOS: We need to unallocate them
-        asprintf(&g_blurb_str_1, blurb1);
-        asprintf(&g_blurb_str_2, blurb3);
-        asprintf(&g_blurb_str_3, blurb2);
+        mr_asprintf(&g_blurb_str_1, blurb1);
+        mr_asprintf(&g_blurb_str_2, blurb3);
+        mr_asprintf(&g_blurb_str_3, blurb2);
         if (g_text_mode) {
             log_msg(0, blurb1);
@@ -651 +636 @@
         }
         update_progress_form_full(blurb1, blurb2, blurb3);
-        paranoid_free(b1c);
-        paranoid_free(blurb1);
-        paranoid_free(blurb2);
-        paranoid_free(blurb3);
+        mr_free(b1c);
+        mr_free(blurb1);
+        mr_free(blurb2);
+        mr_free(blurb3);
     }
 
@@ -710 +695 @@
                 ("---promptstring---1--- %s\r\n---promptstring---2--- %s\r\n---promptstring---Q---\r\n-->  ",
                  title, b);
-            paranoid_free(output);
-            (void) getline(&output, &n, stdin);
+            mr_free(output);
+            mr_getline(&output, &n, stdin);
             if (output[strlen(output) - 1] == '\n')
                 output[strlen(output) - 1] = '\0';
             return (ret);
         }
-        asprintf(&blurb, b);
+        mr_asprintf(&blurb, b);
         text = newtTextboxReflowed(2, 1, blurb, 48, 5, 5, 0);
 
@@ -732 +717 @@
         //center_string(blurb, 80);
         newtPushHelpLine(blurb);
-        paranoid_free(blurb);
+        mr_free(blurb);
 
         b_res = newtRunForm(myForm);
@@ -741 +726 @@
             // Copy entry_value before destroying the form
             // clearing potentially output before
-            paranoid_alloc(output,*entry_value);
+            mr_allocstr(output,*entry_value);
         }
         newtFormDestroy(myForm);
@@ -779 +764 @@
                 printf("%s (%s or %s) --> ", p, button1, button2);
             }
-            for (asprintf(&tmp, " ");
+            for (mr_asprintf(&tmp, " ");
                  strcmp(tmp, button1) && (strlen(button2) == 0
                                           || strcmp(tmp, button2));) {
                 printf("--> ");
-                paranoid_free(tmp);
-                (void) getline(&tmp, &n, stdin);
+                mr_free(tmp);
+                mr_getline(&tmp, &n, stdin);
             }
             if (!strcmp(tmp, button1)) {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (TRUE);
             } else {
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (FALSE);
             }
         }
 
-        asprintf(&prompt, p);
+        mr_asprintf(&prompt, p);
         text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
         b_1 =
@@ -816 +801 @@
         //center_string(prompt, 80);
         newtPushHelpLine(prompt);
-        paranoid_free(prompt);
+        mr_free(prompt);
         b_res = newtRunForm(myForm);
         newtPopHelpLine();
@@ -943 +928 @@
             || percentage > g_isoform_old_progress) {
             g_isoform_old_progress = percentage;
-            asprintf(&timeline_str,
+            mr_asprintf(&timeline_str,
                      _("%2ld:%02ld taken            %2ld:%02ld remaining"),
                      time_taken / 60, time_taken % 60, time_remaining / 60,
@@ -968 +953 @@
                 *p = '\0';
 
-                asprintf(&pcline_str, " Working%s%s %c", tmp1, tmp2,
+                mr_asprintf(&pcline_str, " Working%s%s %c", tmp1, tmp2,
                          special_dot_char(g_mysterious_dot_counter));
-                paranoid_free(tmp1);
-                paranoid_free(tmp2);
+                mr_free(tmp1);
+                mr_free(tmp2);
             } else {
-                asprintf(&pcline_str,
+                mr_asprintf(&pcline_str,
                          _(" %3d%% done              %3d%% to go"),
                          percentage, 100 - percentage);
@@ -992 +977 @@
 
                 if (percentage >= 3) {
-                    asprintf(&taskprogress,
+                    mr_asprintf(&taskprogress,
                              "TASK:  [%s%s] %3d%% done; %2ld:%02ld to go",
                              tmp1, tmp2, percentage, time_remaining / 60,
@@ -1000 +985 @@
                     printf("---evalcall---2--- %s\r\n", taskprogress);
                     printf("---evalcall---E---\r\n");
-                    paranoid_free(taskprogress);
+                    mr_free(taskprogress);
                 }
             } else {
@@ -1010 +995 @@
                 }
             }
-            paranoid_free(timeline_str);
-            paranoid_free(pcline_str);
+            mr_free(timeline_str);
+            mr_free(pcline_str);
         }
         if (!g_text_mode) {
@@ -1032 +1017 @@
             return;
         }
-        paranoid_free(g_blurb_str_2);
-        asprintf(&g_blurb_str_2, blurb3);
+        mr_free(g_blurb_str_2);
+        mr_asprintf(&g_blurb_str_2, blurb3);
         update_progress_form_full(g_blurb_str_1, g_blurb_str_2,
                                   g_blurb_str_3);
@@ -1081 +1066 @@
         } else {
             if (g_current_progress > g_maximum_progress) {
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "update_progress_form_full(%s,%s,%s) --- g_current_progress=%ld; g_maximum_progress=%ld",
                          blurb1, blurb2, blurb3, g_current_progress,
                          g_maximum_progress);
                 log_msg(0, tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 g_current_progress = g_maximum_progress;
             }
@@ -1108 +1093 @@
         /* BERLIOS/ Is it useful here ? */
         //g_mysterious_dot_counter = (g_mysterious_dot_counter + 1) % 27;
-        asprintf(&timeline_str,
+        mr_asprintf(&timeline_str,
                  "%2ld:%02ld taken               %2ld:%02ld remaining  ",
                  time_taken / 60, time_taken % 60, time_remaining / 60,
                  time_remaining % 60);
-        asprintf(&percentline_str,
+        mr_asprintf(&percentline_str,
                  " %3d%% done                 %3d%% to go", percentage,
                  100 - percentage);
@@ -1138 +1123 @@
                 log_msg(2, _("percentage = %d"), percentage);
             }
-            asprintf(&taskprogress,
+            mr_asprintf(&taskprogress,
                      _("TASK:  [%s%s] %3d%% done; %2ld:%02ld to go"), tmp1,
                      tmp2, percentage, time_remaining / 60,
@@ -1144 +1129 @@
 
             printf(_("---progress-form---4--- %s\r\n"), taskprogress);
-            paranoid_free(taskprogress);
+            mr_free(taskprogress);
         } else {
             /* BERLIOS: center_string is now broken replace it ! */
@@ -1162 +1147 @@
             newtRefresh();
         }
-        paranoid_free(percentline_str);
-        paranoid_free(timeline_str);
+        mr_free(percentline_str);
+        mr_free(timeline_str);
     }
 
@@ -1214 +1199 @@
                 }
                 printf(")\n--> ");
-                (void) getline(&outstr, &n, stdin);
+                mr_getline(&outstr, &n, stdin);
                 strip_spaces(outstr);
                 for (i = 0; possible_responses[i]; i++) {
@@ -1222 +1207 @@
                 }
             }
-            paranoid_free(outstr);
+            mr_free(outstr);
             return (backup_type);
         }
         newtDrawRootText(18, 0, WELCOME_STRING);
         if (restoring) {
-            asprintf(&title_sz,
+            mr_asprintf(&title_sz,
                      _("Please choose the backup media from which you want to read data."));
-            asprintf(&minimsg_sz, _("Read from:"));
-        } else {
-            asprintf(&title_sz,
+            mr_asprintf(&minimsg_sz, _("Read from:"));
+        } else {
+            mr_asprintf(&title_sz,
                      _("Please choose the backup media to which you want to archive data."));
-            asprintf(&minimsg_sz, _("Backup to:"));
+            mr_asprintf(&minimsg_sz, _("Backup to:"));
         }
         newtPushHelpLine(title_sz);
-        paranoid_free(title_sz);
+        mr_free(title_sz);
 
         //  newtOpenWindow (23, 3, 34, 17, minimsg_sz);
         newtCenteredWindow(34, 17, minimsg_sz);
-        paranoid_free(minimsg_sz);
+        mr_free(minimsg_sz);
 
         b1 = newtButton(1, 1, _("CD-R disks "));
@@ -1363 +1348 @@
                 break;
             }
-            (void) getline(&tmp, &n, fin);
+            mr_getline(&tmp, &n, fin);
             i = (int) strlen(tmp);
             if (i < 2) {
@@ -1385 +1370 @@
             filelist->el[filelist->entries].severity =
                 severity_of_difference(tmp, reason);
-            paranoid_free(reason);
+            mr_free(reason);
             strcpy(filelist->el[filelist->entries].filename, tmp);
             if (feof(fin)) {
@@ -1394 +1379 @@
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
             log_to_screen(_("Arbitrary limits suck, man!"));
-            paranoid_free(tmp);
+            mr_free(tmp);
             return (1);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         for (done = FALSE; !done;) {
@@ -1442 +1427 @@
         assert(flentry != NULL);
         if (flentry->severity == 0) {
-            asprintf(&comment, "0     %93s", flentry->filename);
+            mr_asprintf(&comment, "0     %93s", flentry->filename);
         } else if (flentry->severity == 1) {
-            asprintf(&comment, "low   %93s", flentry->filename);
+            mr_asprintf(&comment, "low   %93s", flentry->filename);
         } else if (flentry->severity == 2) {
-            asprintf(&comment, "med   %93s", flentry->filename);
-        } else {
-            asprintf(&comment, "high  %93s", flentry->filename);
+            mr_asprintf(&comment, "med   %93s", flentry->filename);
+        } else {
+            mr_asprintf(&comment, "high  %93s", flentry->filename);
         }
         iamhere("leaving");
@@ -1525 +1510 @@
                                    keylist[i]);
         }
-        asprintf(&differ_sz,
+        mr_asprintf(&differ_sz,
                  _("  %ld files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
                  i);
         newtPushHelpLine(differ_sz);
-        paranoid_free(differ_sz);
+        mr_free(differ_sz);
 
         bClose = newtCompactButton(10, 15, _(" Close  "));
         bSelect = newtCompactButton(30, 15, _(" Select "));
-        asprintf(&tmp, "%-10s               %-20s", _("Priority"),
+        mr_asprintf(&tmp, "%-10s               %-20s", _("Priority"),
                  _("Filename"));
         headerMsg = newtLabel(2, 1, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         newtOpenWindow(5, 4, 70, 16, _("Non-matching files"));
@@ -1558 +1543 @@
                         severity_of_difference(filelist->el[currline].
                                                filename, reason);
-                        asprintf(&tmp, "%s --- %s",
+                        mr_asprintf(&tmp, "%s --- %s",
                                  filelist->el[currline].filename, reason);
                         popup_and_OK(tmp);
-                        paranoid_free(tmp);
-                        paranoid_free(reason);
+                        mr_free(tmp);
+                        mr_free(reason);
                     }
                 }

trunk/mondo/src/include/mr_str.h

@@ -1 @@
-/* mr_string.h
- *
+/*
  * $Id$
  *
- *     Header file of mr_string: a set of function manipulating strings
+ *     Header file of mr_str.c: a set of function manipulating strings
  *     Provided under the GPL v2
  */
 
-#ifndef MR_STRING_H
-#define MR_STRING_H
+#ifndef MR_STR_H
+#define MR_STR_H
 
 /* functions (public methods) */
@@ -15 +14 @@
 extern char *mr_stresc(char *instr, char *toesc, const char escchr);
 
-#endif                          /* MR_STRING_H */
+#endif                          /* MR_STR_H */

trunk/mondo/src/include/my-stuff.h

@@ -294 +294 @@
  */
 #define paranoid_system(x) {if(system(x)) log_msg(4, x); }
-
-/**
- * Free @p x and set it to NULL.
- */
-#define paranoid_free(x) {if ((x) != NULL) free(x); (x)=NULL;}
 
 /**

trunk/mondo/src/lib/Makefile.am

@@ -7 +7 @@
 noinst_LIBRARIES = libmr.a
 
-libmr_a_SOURCES  = mr_conf.c mr_string.c
+libmr_a_SOURCES  = mr_conf.c mr_str.c mr_mem.c mr_err.c mr_msg.c

trunk/mondo/src/lib/mr_conf.c

@@ -17 +17 @@
 #include <string.h>
 
-#include "my-stuff.h"
-
-/* BERLIOS: instead of this declaration, we need a good include structure */
-extern void (*log_debug_msg) (int debug_level, const char *szFile,
-                              const char *szFunction, int nLine,
-                              const char *fmt, ...);
+#include "mr_msg.h"
+#include "mr_mem.h"
+#include "mr_gettext.h"
 
 /* error flags */
@@ -79 +76 @@
 static FILE *CONF = NULL;       /* Configuration file FD */
 
-/*if output all error and warnin messages*/
+/*if output all error and warning messages*/
 static int mr_conf_flags = MRCONF_FLAG_VERBOSE;
 
@@ -95 +92 @@
 int mr_conf_open(const char *filename) {
     size_t length;              /*length of the buffer/file */
+    size_t res = 0;
 
     /* check if mr_conf is already opened? */
@@ -126 +124 @@
     /*reading file in buffer (skip all 0 characters) */
 
-    (void) fread(buffer, sizeof(char), length, CONF);
+    res = fread(buffer, sizeof(char), length, CONF);
     buffer[length] = (char) 0;  /*finalize the string */
 
@@ -146 +144 @@
         mr_conf_error_msg(MRCONF_CLOSE_BUT_NOT_OPEN, NULL);
     }
-    paranoid_free(buffer);
+    mr_free(buffer);
     fclose(CONF);
 
@@ -215 +213 @@
 /*
   reads string outstr after string str in the current file (between
-  "..."), not more than maxlength simbols: cannot check if outstr has
+  "..."), not more than maxlength symbols: cannot check if outstr has
   enough length! It must be at least maxlength+1 ! Returns number of
   read chars
@@ -233 +231 @@
         return(p);
     }
-    asprintf(&q, p);
+    mr_asprintf(&q, p);
 
     /* trunk at first \n */
@@ -252 +250 @@
 
     ret[i] = (char) 0;      /*and set its length */
-    paranoid_free(q);
+    mr_free(q);
 
     return ret;
@@ -299 +297 @@
     tmp_buf[k] = (char) 0;      /*and set its length */
 
-    paranoid_free(buffer);
+    mr_free(buffer);
     /*copy filtered data to the buffer */
     buffer = tmp_buf;
@@ -339 +337 @@
         switch (error_code) {
         case MRCONF_BAD_FILE:
-            log_msg(4, "%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
+            mr_msg(0,"%s %s %s\n", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
                    add_line);
             break;
 
         case MRCONF_ALLOC_FAILED:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_ALLOC_FAILED);
+            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_ALLOC_FAILED);
             break;
 
         case MRCONF_READING_FAILED:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
+            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
             break;
 
         case MRCONF_FIELD_NOT_FOUND:
-            log_msg(4, "%s %s \"%s\"\n", MRCONF_STR_ERROR,
-                   MRCONF_STR_FIELD_NOT_FOUND, add_line);
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
+            mr_msg(1,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
+            mr_msg(1,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
             break;
 
         case MRCONF_FIELD_NO_VALUE:
-            log_msg(4, "%s %s \"%s\"\n", MRCONF_STR_ERROR,
-                   MRCONF_STR_FIELD_NO_VALUE, add_line);
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
+            mr_msg(1,"%s %s \"%s\"\n", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
+            mr_msg(1,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
             break;
 
         case MRCONF_CLOSE_BUT_NOT_OPEN:
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING,
-                   MRCONF_STR_CLOSE_BUT_NOT_OPEN);
+            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
             break;
 
         case MRCONF_CALL_BUT_NOT_OPEN:
-            log_msg(4, "%s %s\n", MRCONF_STR_WARNING,
-                   MRCONF_STR_CALL_BUT_NOT_OPEN);
+            mr_msg(0,"%s %s\n", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
             break;
 
         case MRCONF_OPEN_OPENED:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
+            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
             break;
 
         default:
-            log_msg(4, "%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
-            break;
-        }
-    }
-}
+            mr_msg(1,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
+            break;
+        }
+    }
+}

trunk/mondo/src/mondoarchive/Makefile.am

@@ +1 @@
+## $Id$
 ##
 ## Process with Automake to generate Makefile.in

trunk/mondo/src/mondoarchive/main.c

@@ -21 +21 @@
 #include "../common/libmondo.h"
 #include "mondo-cli-EXT.h"
+
+#include "mr_mem.h"
 
 // for CVS
@@ -185 +187 @@
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
-    asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
+    mr_asprintf(&tmp, "/sbin:/usr/sbin:%s:/usr/local/sbin", getenv("PATH"));
     setenv("PATH", tmp, 1);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     /* Add the ARCH environment variable for ia64 purposes */
@@ -236 +238 @@
         turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
         printf("in=%s; out=%s\n", argv[2], tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(1);
     }
@@ -268 +270 @@
             printf(_("CD-RW is at %s\n"), tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if ((tmp = find_cdrom_device(FALSE)) == NULL) {
@@ -275 +277 @@
             printf(_("CD-ROM is at %s\n"), tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -288 +290 @@
             printf(_("DVD is at %s\n"), tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -345 +347 @@
         retval += res;
         if (res) {
-            asprintf(&say_at_end,
+            mr_asprintf(&say_at_end,
                    _("Data archived. Please check the logs, just as a precaution. "));
         } else {
-            asprintf(&say_at_end, _("Data archived OK. "));
+            mr_asprintf(&say_at_end, _("Data archived OK. "));
         }
     }
@@ -356 +358 @@
         res = verify_data(bkpinfo);
         if (res < 0) {
-            asprintf(&say_at_end, _("%d difference%c found."), -res,
+            mr_asprintf(&say_at_end, _("%d difference%c found."), -res,
                     (-res != 1) ? 's' : ' ');
             res = 0;
@@ -399 +401 @@
     }
     log_to_screen(say_at_end);
-    paranoid_free(say_at_end);
-
-    asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
+    mr_free(say_at_end);
+
+    mr_asprintf(&tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, TRUE);
-    paranoid_free(tmp);
-
-    asprintf(&g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
+    mr_free(tmp);
+
+    mr_asprintf(&g_erase_tmpdir_and_scratchdir, "rm -Rf %s %s", bkpinfo->tmpdir,
             bkpinfo->scratchdir);
     run_program_and_log_output(g_erase_tmpdir_and_scratchdir, TRUE);
@@ -424 +426 @@
     system(g_erase_tmpdir_and_scratchdir);
     free_libmondo_global_strings();
-    paranoid_free(bkpinfo);
+    mr_free((void *)bkpinfo);
 
     unlink("/tmp/filelist.full");

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -14 +14 @@
 #include <pthread.h>
 #endif
+#include "mr_mem.h"
 
 extern int g_loglevel;
@@ -82 +83 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            asprintf(&tmp, "-%c %s", i, flag_val[i]);
+            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
             log_msg(3, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
     }
 //    }
-    asprintf(&tmp, "rm -Rf %s/mondo.tmp.*", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "rm -Rf %s/mondo.tmp.*", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "rm -Rf %s/mondo.scratch.*", bkpinfo->scratchdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     /* BERLIOS : Useless ???
@@ -103 +104 @@
     */
 
-    asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s/tmpfs", bkpinfo->tmpdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->scratchdir);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (bkpinfo->nfs_mount != NULL) {
@@ -139 +140 @@
     for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ',');
          j++, p = strchr(p, ',') + 1) {
-        asprintf(&tmp, p);
+        mr_asprintf(&tmp, p);
         q = strchr(tmp, ',');
         if (q != NULL) {
@@ -145 +146 @@
         }
         bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        paranoid_free(tmp);
-
-        asprintf(&comment, "media_size[%d] = %ld", j,
+        mr_free(tmp);
+
+        mr_asprintf(&comment, "media_size[%d] = %ld", j,
                 bkpinfo->media_size[j]);
         log_msg(3, comment);
-        paranoid_free(comment);
+        mr_free(comment);
     }
     for (; j <= MAX_NOOF_MEDIA; j++) {
@@ -245 +246 @@
         }
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (flag_set['R']) {
@@ -257 +258 @@
         }
     }
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     if (flag_set['W']) {
@@ -276 +277 @@
             bkpinfo->include_paths = NULL;
         }
-        asprintf(&tmp1, flag_val['I']);
+        mr_asprintf(&tmp1, flag_val['I']);
         p = tmp1;
         q = tmp1;
@@ -298 +299 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         if (bkpinfo->include_paths == NULL) {
-            asprintf(&tmp1, "%s", flag_val['I']);
+            mr_asprintf(&tmp1, "%s", flag_val['I']);
         } else {
-            asprintf(&tmp1, "%s %s", bkpinfo->include_paths, flag_val['I']);
-        }
-        paranoid_alloc(bkpinfo->include_paths,tmp1);
-        paranoid_free(tmp1);
+            mr_asprintf(&tmp1, "%s %s", bkpinfo->include_paths, flag_val['I']);
+        }
+        mr_allocstr(bkpinfo->include_paths,tmp1);
+        mr_free(tmp1);
 
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
@@ -328 +329 @@
         }
         bkpinfo->make_filelist = FALSE;
-        paranoid_alloc(bkpinfo->include_paths, flag_val['J']);
+        mr_allocstr(bkpinfo->include_paths, flag_val['J']);
     }
 
@@ -384 +385 @@
         }
         flag_set['d'] = TRUE;
-        paranoid_free(tmp); // allocation from find_tape_device_and_size
-
-        asprintf(&tmp,
+        mr_free(tmp); // allocation from find_tape_device_and_size
+
+        mr_asprintf(&tmp,
                 _("You didn't specify a tape streamer device. I'm assuming %s"),
                 flag_val['d']);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         percent = 0;
     }
@@ -412 +413 @@
         }
         if (!flag_set['s']) {
-            asprintf(&flag_val['s'], "%dm", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
+            mr_asprintf(&flag_val['s'], "%dm", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4582 MB
             log_to_screen
                 (_("You did not specify a size (-s) for DVD. I'm guessing %s."),
@@ -454 +455 @@
     }
     if (flag_set['n']) {
-        paranoid_alloc(bkpinfo->nfs_mount,flag_val['n']);
+        mr_allocstr(bkpinfo->nfs_mount,flag_val['n']);
         if (!flag_set['d']) {
-            paranoid_alloc(bkpinfo->nfs_remote_dir,"/");
-        }
-        asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
+            mr_allocstr(bkpinfo->nfs_remote_dir,"/");
+        }
+        mr_asprintf(&tmp, "mount | grep -x \"%s .*\" | cut -d' ' -f3",
                 bkpinfo->nfs_mount);
-        paranoid_free(bkpinfo->isodir);
+        mr_free(bkpinfo->isodir);
         bkpinfo->isodir = call_program_and_get_last_line_of_output(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (strlen(bkpinfo->isodir) < 3) {
@@ -503 +504 @@
 
     if (flag_set['E']) {
-        asprintf(&tmp1, flag_val['E']);
+        mr_asprintf(&tmp1, flag_val['E']);
         p = tmp1;
         q = tmp1;
@@ -531 +532 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         if (bkpinfo->exclude_paths == NULL) {
-            asprintf(&tmp1, "%s", flag_val['E']);
+            mr_asprintf(&tmp1, "%s", flag_val['E']);
         } else {
-            asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, flag_val['E']);
-        }
-        paranoid_alloc(bkpinfo->exclude_paths,tmp1);
-        paranoid_free(tmp1);
+            mr_asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, flag_val['E']);
+        }
+        mr_allocstr(bkpinfo->exclude_paths,tmp1);
+        mr_free(tmp1);
     }
 
@@ -550 +551 @@
         psz = list_of_NFS_mounts_only();
         if (bkpinfo->exclude_paths != NULL) {
-            asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, psz);
+            mr_asprintf(&tmp1, "%s %s", bkpinfo->exclude_paths, psz);
         } else {
-            asprintf(&tmp1, "%s", psz);
-        }
-        paranoid_free(psz);
-        paranoid_alloc(bkpinfo->exclude_paths, tmp1);
-        paranoid_free(tmp1);
+            mr_asprintf(&tmp1, "%s", psz);
+        }
+        mr_free(psz);
+        mr_allocstr(bkpinfo->exclude_paths, tmp1);
+        mr_free(tmp1);
 
         log_msg(3, "-N means we're now excluding %s",
@@ -563 +564 @@
 
     if (flag_set['b']) {
-        asprintf(&psz, flag_val['b']);
+        mr_asprintf(&psz, flag_val['b']);
         log_msg(1, "psz = '%s'", psz);
         if (psz[strlen(psz) - 1] == 'k') {
@@ -571 +572 @@
             itbs = atol(psz);
         }
-        paranoid_free(psz);
+        mr_free(psz);
 
         log_msg(1, "'%s' --> %ld", flag_val['b'], itbs);
@@ -592 +593 @@
 
     if (flag_set['x']) {
-        paranoid_alloc(bkpinfo->image_devs,flag_val['x']);
+        mr_allocstr(bkpinfo->image_devs,flag_val['x']);
         if (run_program_and_log_output("which ntfsclone", 2)) {
             fatal_error("Please install ntfsprogs package/tarball.");
@@ -604 +605 @@
     if (flag_set['k']) {
         if (strcasecmp(flag_val['k'], "FAILSAFE")) {
-            paranoid_alloc(bkpinfo->kernel_path,"FAILSAFE");
+            mr_allocstr(bkpinfo->kernel_path,"FAILSAFE");
 
             if (!does_file_exist(bkpinfo->kernel_path)) {
                 retval++;
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                     _("You specified kernel '%s', which does not exist\n"),
                     bkpinfo->kernel_path);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
         } else {
-            paranoid_alloc(bkpinfo->kernel_path,flag_val['k']);
+            mr_allocstr(bkpinfo->kernel_path,flag_val['k']);
         }
     }
 
     if (flag_set['p']) {
-        paranoid_alloc(bkpinfo->prefix,flag_val['p']);
+        mr_allocstr(bkpinfo->prefix,flag_val['p']);
     }
 
     if (flag_set['d']) {        /* backup directory (if ISO/NFS) */
         if (flag_set['i']) {
-            paranoid_alloc(bkpinfo->isodir,flag_val['d']);
-            asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
+            mr_allocstr(bkpinfo->isodir,flag_val['d']);
+            mr_asprintf(&tmp, "ls -l %s", bkpinfo->isodir);
             if (run_program_and_log_output(tmp, FALSE)) {
                 fatal_error
                     ("output folder does not exist - please create it");
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else if (flag_set['n']) {
-            paranoid_alloc(bkpinfo->nfs_remote_dir,flag_val['d']);
+            mr_allocstr(bkpinfo->nfs_remote_dir,flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
 
-            paranoid_alloc(bkpinfo->media_device, flag_val['d']);
+            mr_allocstr(bkpinfo->media_device, flag_val['d']);
         }
     }
 
     if (flag_set['n']) {
-        asprintf(&tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
+        mr_asprintf(&tmp, "echo hi > %s/%s/.dummy.txt", bkpinfo->isodir,
                 bkpinfo->nfs_remote_dir);
         if (run_program_and_log_output(tmp, FALSE)) {
             retval++;
-            paranoid_free(tmp);
-            asprintf(&tmp,
+            mr_free(tmp);
+            mr_asprintf(&tmp,
                     _("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n"),
                     bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
             log_to_screen(tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
@@ -664 +665 @@
             }
         } else if ((tmp = find_cdrw_device()) ==  NULL) {
-            paranoid_alloc(bkpinfo->media_device, tmp);
-            paranoid_free(tmp);
+            mr_allocstr(bkpinfo->media_device, tmp);
+            mr_free(tmp);
             retval++;
             log_to_screen
@@ -671 +672 @@
         } else {
             flag_set['d'] = TRUE;
-            asprintf(&flag_val['d'], bkpinfo->media_device);
+            mr_asprintf(&flag_val['d'], bkpinfo->media_device);
         }
     }
@@ -689 +690 @@
     j = (int) random() % 32768;
     if (flag_set['S']) {
-        asprintf(&tmp, "%s/mondo.scratch.%d", flag_val['S'], j);
-        paranoid_free(bkpinfo->scratchdir);
+        mr_asprintf(&tmp, "%s/mondo.scratch.%d", flag_val['S'], j);
+        mr_free(bkpinfo->scratchdir);
         bkpinfo->scratchdir = tmp;
     }
     if (flag_set['T']) {
-        asprintf(&tmp, "%s/mondo.tmp.%d", flag_val['T'], j);
-        paranoid_free(bkpinfo->tmpdir);
+        mr_asprintf(&tmp, "%s/mondo.tmp.%d", flag_val['T'], j);
+        mr_free(bkpinfo->tmpdir);
         bkpinfo->tmpdir = tmp;
-        asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
+        mr_asprintf(&tmp, "touch %s/.foo.dat", flag_val['T']);
         if (run_program_and_log_output(tmp, 1)) {
             retval++;
@@ -704 +705 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        paranoid_free(tmp);
-
-        asprintf(&tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
+        mr_free(tmp);
+
+        mr_asprintf(&tmp, "ln -sf %s/.foo.dat %s/.bar.dat", flag_val['T'],
                 flag_val['T']);
         if (run_program_and_log_output(tmp, 1)) {
@@ -714 +715 @@
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
     if (flag_set['A']) {
-        paranoid_alloc(bkpinfo->call_after_iso,flag_val['A']);
+        mr_allocstr(bkpinfo->call_after_iso,flag_val['A']);
     }
     if (flag_set['B']) {
-        paranoid_alloc(bkpinfo->call_before_iso,flag_val['B']);
+        mr_allocstr(bkpinfo->call_before_iso,flag_val['B']);
     }
     if (flag_set['F']) {
@@ -753 +754 @@
     if (flag_set['f']) {
         tmp = resolve_softlinks_to_get_to_actual_device_file(flag_val['f']);
-        paranoid_alloc(bkpinfo->boot_device,tmp);
+        mr_allocstr(bkpinfo->boot_device,tmp);
     }
     if (flag_set['Q']) {
@@ -763 +764 @@
         log_msg(3, "boot loader is %c, residing at %s", i, tmp);
         printf(_("boot loader is %c, residing at %s\n"), i, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (flag_set['P']) {
-        paranoid_alloc(bkpinfo->postnuke_tarball,flag_val['P']);
+        mr_allocstr(bkpinfo->postnuke_tarball,flag_val['P']);
     }
 
@@ -883 +884 @@
             if (flag_set[optopt]) {
                 bad_switches = TRUE;
-                asprintf(&tmp, _("Switch -%c previously defined as %s\n"), opt,
+                mr_asprintf(&tmp, _("Switch -%c previously defined as %s\n"), opt,
                         flag_val[i]);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             } else {
                 flag_set[opt] = TRUE;
@@ -900 +901 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            asprintf(&tmp,
+                            mr_asprintf(&tmp,
                                     _("-%c flag --- must be absolute path --- '%s' isn't absolute"),
                                     opt, flag_val[opt]);
                             log_to_screen(tmp);
-                            paranoid_free(tmp);
+                            mr_free(tmp);
                             bad_switches = TRUE;
                         }
                     }
-                    asprintf(&flag_val[opt], optarg);
+                    mr_asprintf(&flag_val[opt], optarg);
                 }
             }
@@ -915 +916 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        asprintf(&tmp, _("Invalid arg -- %s\n"), argv[i]);
+        mr_asprintf(&tmp, _("Invalid arg -- %s\n"), argv[i]);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     return (bad_switches);
@@ -946 +947 @@
     switch (sig) {
     case SIGINT:
-        asprintf(&tmp, _("SIGINT signal received from OS"));
-        asprintf(&tmp2, _("You interrupted me :-)"));
+        mr_asprintf(&tmp, _("SIGINT signal received from OS"));
+        mr_asprintf(&tmp2, _("You interrupted me :-)"));
         break;
     case SIGKILL:
-        asprintf(&tmp, _("SIGKILL signal received from OS"));
-        asprintf(&tmp2,
+        mr_asprintf(&tmp, _("SIGKILL signal received from OS"));
+        mr_asprintf(&tmp2,
                _("I seriously have no clue how this signal even got to me. Something's wrong with your system."));
         break;
     case SIGTERM:
-        asprintf(&tmp, _("SIGTERM signal received from OS"));
-        asprintf(&tmp2, _("Got terminate signal"));
+        mr_asprintf(&tmp, _("SIGTERM signal received from OS"));
+        mr_asprintf(&tmp2, _("Got terminate signal"));
         break;
     case SIGHUP:
-        asprintf(&tmp, _("SIGHUP signal received from OS"));
-        asprintf(&tmp2, _("Hangup on line"));
+        mr_asprintf(&tmp, _("SIGHUP signal received from OS"));
+        mr_asprintf(&tmp2, _("Hangup on line"));
         break;
     case SIGSEGV:
-        asprintf(&tmp, _("SIGSEGV signal received from OS"));
-        asprintf(&tmp2,
+        mr_asprintf(&tmp, _("SIGSEGV signal received from OS"));
+        mr_asprintf(&tmp2,
                _("Internal programming error. Please send a backtrace as well as your log."));
         break;
     case SIGPIPE:
-        asprintf(&tmp, _("SIGPIPE signal received from OS"));
-        asprintf(&tmp2, _("Pipe was broken"));
+        mr_asprintf(&tmp, _("SIGPIPE signal received from OS"));
+        mr_asprintf(&tmp2, _("Pipe was broken"));
         break;
     case SIGABRT:
-        asprintf(&tmp, _("SIGABRT signal received from OS"));
-        asprintf(&tmp2,
+        mr_asprintf(&tmp, _("SIGABRT signal received from OS"));
+        mr_asprintf(&tmp2,
                 _("Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message."));
         break;
     default:
-        asprintf(&tmp, _("(Unknown)"));
-        asprintf(&tmp2, _("(Unknown)"));
+        mr_asprintf(&tmp, _("(Unknown)"));
+        mr_asprintf(&tmp2, _("(Unknown)"));
     }
 
     log_to_screen(tmp);
     log_to_screen(tmp2);
-    paranoid_free(tmp);
-    paranoid_free(tmp2);
+    mr_free(tmp);
+    mr_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);

trunk/mondo/src/mondorestore/Makefile.am

@@ +1 @@
+## $Id$
 ##
 ## Process with Automake to generate Makefile.in
@@ -14 +15 @@
 mondorestore_SOURCES  = mondo-prep.c mondo-restore.c mondo-rstr-newt.c \
                         mondo-rstr-compare.c mondo-rstr-tools.c
-mondorestore_LDADD    = ${top_builddir}/src/common/libmondo.a  ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@
-
-
+mondorestore_LDADD    = ${top_builddir}/src/common/libmondo.a ${top_builddir}/src/lib/libmr.a @MONDORESTORE_STATIC@

trunk/mondo/src/mondorestore/mondo-prep.c

@@ -19 +19 @@
 #include <math.h>
 #include <unistd.h>
+#include "mr_mem.h"
 
 
@@ -63 +64 @@
         make_list_of_drives_in_mountlist(mountlist, drivelist);
         for (lino = 0; lino < drivelist->entries; lino++) {
-            asprintf(&command,
+            mr_asprintf(&command,
                      "dd if=%s bs=512 count=1 2> /dev/null | grep \"%s\"",
                      drivelist->el[lino].device, MONDO_WAS_HERE);
@@ -69 +70 @@
                 log_msg(1, "Found MONDO_WAS_HERE marker on drive#%d (%s)",
                         lino, drivelist->el[lino].device);
-                paranoid_free(command);
+                mr_free(command);
                 break;
             }
-            paranoid_free(command);
+            mr_free(command);
         }
 
@@ -86 +87 @@
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
-                asprintf(&buf, "%s\n", MONDO_WAS_HERE);
+                mr_asprintf(&buf, "%s\n", MONDO_WAS_HERE);
                 fout = fopen(drivelist->el[lino].device, "w+");
                 if (!fout) {
@@ -101 +102 @@
                     fclose(fout);
                 }
-                paranoid_free(buf);
+                mr_free(buf);
             }
             sync();
@@ -201 +202 @@
     if (tmp)    // found it :) cool
     {
-        asprintf(&lvscan_sz, "lvm lvscan");
-        asprintf(&lvremove_sz, "lvm lvremove");
-        asprintf(&vgscan_sz, "lvm vgscan");
-        asprintf(&pvscan_sz, "lvm pvscan");
-        asprintf(&vgchange_sz, "lvm vgchange");
-        asprintf(&vgremove_sz, "lvm vgremove");
+        mr_asprintf(&lvscan_sz, "lvm lvscan");
+        mr_asprintf(&lvremove_sz, "lvm lvremove");
+        mr_asprintf(&vgscan_sz, "lvm vgscan");
+        mr_asprintf(&pvscan_sz, "lvm pvscan");
+        mr_asprintf(&vgchange_sz, "lvm vgchange");
+        mr_asprintf(&vgremove_sz, "lvm vgremove");
     } else {
-        asprintf(&lvscan_sz, "lvscan");
-        asprintf(&lvremove_sz, "lvremove");
-        asprintf(&vgscan_sz, "vgscan");
-        asprintf(&pvscan_sz, "pvscan");
-        asprintf(&vgchange_sz, "vgchange");
-        asprintf(&vgremove_sz, "vgremove");
-    }
-    paranoid_free(tmp);
-
-    asprintf(&command,
+        mr_asprintf(&lvscan_sz, "lvscan");
+        mr_asprintf(&lvremove_sz, "lvremove");
+        mr_asprintf(&vgscan_sz, "vgscan");
+        mr_asprintf(&pvscan_sz, "pvscan");
+        mr_asprintf(&vgchange_sz, "vgchange");
+        mr_asprintf(&vgremove_sz, "vgremove");
+    }
+    mr_free(tmp);
+
+    mr_asprintf(&command,
             "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> "
             MONDO_LOGFILE "; %s -f $i; done", lvscan_sz, lvremove_sz);
-    paranoid_free(lvscan_sz);
-    paranoid_free(lvremove_sz);
+    mr_free(lvscan_sz);
+    mr_free(lvremove_sz);
 
     run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
 
     sleep(1);
-    asprintf(&command,
+    mr_asprintf(&command,
             "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> "
             MONDO_LOGFILE "; done", vgscan_sz, vgchange_sz, vgremove_sz);
-    paranoid_free(vgchange_sz);
-    paranoid_free(vgremove_sz);
+    mr_free(vgchange_sz);
+    mr_free(vgremove_sz);
 
     run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
 
     if (just_erase_existing_volumes) {
@@ -250 +251 @@
     log_msg(1, "OK, rewound i-want-my-lvm. Doing funky stuff...");
     rewind(fin);
-    for (getline(&incoming, &n1, fin); !feof(fin); getline(&incoming, &n1, fin)) {
+    for (mr_getline(&incoming, &n1, fin); !feof(fin); mr_getline(&incoming, &n1, fin)) {
         fgetpos(fin, &orig_pos);
         /* we want to execute lines begining with a # */
@@ -264 +265 @@
         if ((p = strstr(incoming, "vgcreate"))) {
             // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
-            for (getline(&tmp, &n, fin); !feof(fin); getline(&tmp, &n, fin)) {
+            for (mr_getline(&tmp, &n, fin); !feof(fin); mr_getline(&tmp, &n, fin)) {
                 if (tmp[0] == '#') {
                     fsetpos(fin, &orig_pos);
@@ -270 +271 @@
                 } else {
                     fgetpos(fin, &orig_pos);
-                    asprintf(&tmp1, "%s%s", incoming, tmp);
-                    paranoid_free(incoming);
+                    mr_asprintf(&tmp1, "%s%s", incoming, tmp);
+                    mr_free(incoming);
                     incoming = tmp1;
                 }
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             for (q = incoming; *q != '\0'; q++) {
@@ -282 +283 @@
                 }
             }
-            asprintf(&tmp1, p + strlen("vgcreate") + 1);
+            mr_asprintf(&tmp1, p + strlen("vgcreate") + 1);
             for (q = tmp1; *q > 32; q++);
             *q = '\0';
             log_msg(1, "Deleting old entries at /dev/%s", tmp1);
-            asprintf(&tmp, "rm -Rf /dev/%s", tmp1);
-            paranoid_free(tmp1);
+            mr_asprintf(&tmp, "rm -Rf /dev/%s", tmp1);
+            mr_free(tmp1);
 
             run_program_and_log_output(tmp, 1);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             run_program_and_log_output(vgscan_sz, 1);
@@ -299 +300 @@
         }
         for (p = incoming + 1; *p == ' '; p++);
-        paranoid_alloc(command,p);
+        mr_allocstr(command,p);
         for (p = command; *p != '\0'; p++);
         for (; *(p - 1) < 32; p--);
@@ -333 +334 @@
             extents = atol(p);
             log_msg(5, "p='%s' --> extents=%ld", p, extents);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             p = strstr(command, "-L");
@@ -384 +385 @@
             retval++;
         }
-        asprintf(&tmp, "echo \"%s\" >> /tmp/out.sh", command);
+        mr_asprintf(&tmp, "echo \"%s\" >> /tmp/out.sh", command);
         system(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         sleep(1);
     }
     paranoid_fclose(fin);
-    paranoid_free(vgscan_sz);
-    paranoid_free(pvscan_sz);
-    paranoid_free(command);
-    paranoid_free(incoming);
+    mr_free(vgscan_sz);
+    mr_free(pvscan_sz);
+    mr_free(command);
+    mr_free(incoming);
 
     log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
@@ -460 +461 @@
                 finish(1);
             }
-            for (getline(&incoming, &n, fin); !feof(fin)
+            for (mr_getline(&incoming, &n, fin); !feof(fin)
                  && !strstr(incoming, old_mountlist->el[lino].device);
-                 getline(&incoming, &n, fin));
+                 mr_getline(&incoming, &n, fin));
             if (!feof(fin)) {
-                asprintf(&tmp, "Investigating %s",
+                mr_asprintf(&tmp, "Investigating %s",
                         old_mountlist->el[lino].device);
                 log_it(tmp);
-                paranoid_free(tmp);
-
-                for (getline(&incoming, &n, fin); !feof(fin)
+                mr_free(tmp);
+
+                for (mr_getline(&incoming, &n, fin); !feof(fin)
                      && !strstr(incoming, "raiddev");
-                     getline(&incoming, &n, fin)) {
+                     mr_getline(&incoming, &n, fin)) {
                     if (strstr(incoming, OSSWAP("device", "drive"))
                         && !strchr(incoming, '#')) {
@@ -478 +479 @@
                         *p = '\0';
                         for (p--; p > incoming && *(p - 1) > 32; p--);
-                        asprintf(&tmp, "Extrapolating %s", p);
+                        mr_asprintf(&tmp, "Extrapolating %s", p);
                         log_it(tmp);
-                        paranoid_free(tmp);
+                        mr_free(tmp);
 
                         for (j = 0;
@@ -499 +500 @@
                             new_mountlist->entries++;
                         } else {
-                            asprintf(&tmp,
+                            mr_asprintf(&tmp,
                                     "Not adding %s to mountlist: it's already there", p);
                             log_it(tmp);
-                            paranoid_free(tmp);
+                            mr_free(tmp);
                         }
                     }
                 }
             }
-            paranoid_free(incoming);
+            mr_free(incoming);
             paranoid_fclose(fin);
         } else {
@@ -566 +567 @@
     }
     // create device list from normal disks followed by spare ones
-    asprintf(&devices, raidlist->el[i].data_disks.el[0].device);
+    mr_asprintf(&devices, raidlist->el[i].data_disks.el[0].device);
     for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
-        asprintf(&strtmp, "%s", devices);
-        paranoid_free(devices);
-        asprintf(&devices, "%s %s", strtmp,
+        mr_asprintf(&strtmp, "%s", devices);
+        mr_free(devices);
+        mr_asprintf(&devices, "%s %s", strtmp,
                  raidlist->el[i].data_disks.el[j].device);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
     }
     for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
-        asprintf(&strtmp, "%s", devices);
-        paranoid_free(devices);
-        asprintf(&devices, "%s %s", strtmp,
+        mr_asprintf(&strtmp, "%s", devices);
+        mr_free(devices);
+        mr_asprintf(&devices, "%s %s", strtmp,
                  raidlist->el[i].spare_disks.el[j].device);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
     }
     // translate RAID level
     if (raidlist->el[i].raid_level == -2) {
-        asprintf(&level, "multipath");
+        mr_asprintf(&level, "multipath");
     } else if (raidlist->el[i].raid_level == -1) {
-        asprintf(&level, "linear");
+        mr_asprintf(&level, "linear");
     } else {
-        asprintf(&level, "raid%d", raidlist->el[i].raid_level);
+        mr_asprintf(&level, "raid%d", raidlist->el[i].raid_level);
     }
     // create RAID device:
@@ -594 +595 @@
     // - faulty devices ignored
     // - persistent superblock always used as this is recommended
-    asprintf(&program,
+    mr_asprintf(&program,
              "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d",
              raidlist->el[i].raid_device, level,
              raidlist->el[i].data_disks.entries);
     if (raidlist->el[i].parity != -1) {
-        asprintf(&strtmp, "%s", program);
-        paranoid_free(program);
+        mr_asprintf(&strtmp, "%s", program);
+        mr_free(program);
         switch (raidlist->el[i].parity) {
         case 0:
-            asprintf(&program, "%s --parity=%s", strtmp, "la");
+            mr_asprintf(&program, "%s --parity=%s", strtmp, "la");
             break;
         case 1:
-            asprintf(&program, "%s --parity=%s", strtmp, "ra");
+            mr_asprintf(&program, "%s --parity=%s", strtmp, "ra");
             break;
         case 2:
-            asprintf(&program, "%s --parity=%s", strtmp, "ls");
+            mr_asprintf(&program, "%s --parity=%s", strtmp, "ls");
             break;
         case 3:
-            asprintf(&program, "%s --parity=%s", strtmp, "rs");
+            mr_asprintf(&program, "%s --parity=%s", strtmp, "rs");
             break;
         default:
@@ -618 +619 @@
             break;
         }
-        paranoid_free(strtmp);
+        mr_free(strtmp);
     }
     if (raidlist->el[i].chunk_size != -1) {
-        asprintf(&strtmp, "%s", program);
-        paranoid_free(program);
-        asprintf(&program, "%s --chunk=%d", strtmp,
+        mr_asprintf(&strtmp, "%s", program);
+        mr_free(program);
+        mr_asprintf(&program, "%s --chunk=%d", strtmp,
                  raidlist->el[i].chunk_size);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
     }
     if (raidlist->el[i].spare_disks.entries > 0) {
-        asprintf(&strtmp, "%s", program);
-        paranoid_free(program);
-        asprintf(&program, "%s --spare-devices=%d", strtmp,
+        mr_asprintf(&strtmp, "%s", program);
+        mr_free(program);
+        mr_asprintf(&program, "%s --spare-devices=%d", strtmp,
                  raidlist->el[i].spare_disks.entries);
-        paranoid_free(strtmp);
-    }
-    asprintf(&strtmp, "%s", program);
-    paranoid_free(program);
-    asprintf(&program, "%s %s", strtmp, devices);
-    paranoid_free(strtmp);
+        mr_free(strtmp);
+    }
+    mr_asprintf(&strtmp, "%s", program);
+    mr_free(program);
+    mr_asprintf(&program, "%s %s", strtmp, devices);
+    mr_free(strtmp);
     res = run_program_and_log_output(program, 1);
     // free memory
-    paranoid_free(devices);
-    paranoid_free(level);
-    paranoid_free(program);
+    mr_free(devices);
+    mr_free(level);
+    mr_free(program);
     // return to calling instance
     return res;
@@ -687 +688 @@
 
     if (strstr(format, "raid")) {   // do not form RAID disks; do it to /dev/md* instead
-        asprintf(&tmp, "Not formatting %s (it is a RAID disk)", device);
+        mr_asprintf(&tmp, "Not formatting %s (it is a RAID disk)", device);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
@@ -699 +700 @@
 #endif
     if (strlen(format) <= 2) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 "%s has a really small format type ('%s') - this is probably a hexadecimal string, which would suggest the partition is an image --- I shouldn't format it",
                 device, format);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
     if (is_this_device_mounted(device)) {
-        asprintf(&tmp, _("%s is mounted - cannot format it       "), device);
+        mr_asprintf(&tmp, _("%s is mounted - cannot format it       "), device);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -736 +737 @@
 
         if (vinum_started_yet) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                     _
                     ("Initializing Vinum device %s (this may take a *long* time)"),
                     device);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             /* format raid partition */
-            asprintf(&program,
+            mr_asprintf(&program,
                     "for plex in `vinum lv -r %s | grep '^P' | tr '\t' ' ' | tr -s ' ' | cut -d' ' -f2`; do echo $plex; done > /tmp/plexes",
                     basename(device));
@@ -752 +753 @@
                 fprintf(g_fprep, "%s\n", program);
             }
-            paranoid_free(program);
+            mr_free(program);
 
             fin = fopen("/tmp/plexes", "r");
-            while (getline(&line, &n, fin)) {
+            while (mr_getline(&line, &n, fin)) {
                 if (strchr(line, '\n'))
                     *(strchr(line, '\n')) = '\0';   // get rid of the \n on the end
 
-                asprintf(&tmp, "Initializing plex: %s", line);
+                mr_asprintf(&tmp, "Initializing plex: %s", line);
                 open_evalcall_form(tmp);
-                paranoid_free(tmp);
-
-                asprintf(&tmp, "vinum init %s", line);
+                mr_free(tmp);
+
+                mr_asprintf(&tmp, "vinum init %s", line);
                 system(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 while (1) {
-                    asprintf(&tmp,
+                    mr_asprintf(&tmp,
                             "vinum lp -r %s | grep '^S' | head -1 | tr -s ' ' | cut -d: -f2 | cut -f1 | sed 's/^ //' | sed 's/I //' | sed 's/%%//'",
                             line);
                     pin = popen(tmp, "r");
-                    paranoid_free(tmp);
-
-                    getline(&status, &n1, pin);
+                    mr_free(tmp);
+
+                    mr_getline(&status, &n1, pin);
                     pclose(pin);
 
@@ -782 +783 @@
                     update_evalcall_form(atoi(status));
                     usleep(250000);
-                    paranoid_free(status);
+                    mr_free(status);
                 }
                 close_evalcall_form();
             }
-            paranoid_free(line);
+            mr_free(line);
             fclose(fin);
             unlink("/tmp/plexes");
@@ -792 +793 @@
         }
 #else
-        asprintf(&tmp, _("Initializing RAID device %s"), device);
+        mr_asprintf(&tmp, _("Initializing RAID device %s"), device);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
 // Shouldn't be necessary.
@@ -814 +815 @@
                     device, res);
         } else {
-            asprintf(&program, "mkraid --really-force %s", device);
+            mr_asprintf(&program, "mkraid --really-force %s", device);
             res = run_program_and_log_output(program, 1);
             log_msg(1, "%s returned %d", program, res);
@@ -823 +824 @@
                 fprintf(g_fprep, "%s\n", program);
             }
-            paranoid_free(program);
+            mr_free(program);
         }
         sync();
@@ -842 +843 @@
     res = which_format_command_do_i_need(format, program);
     if (strstr(program, "kludge")) {
-        asprintf(&tmp, "%s %s /", program, device);
+        mr_asprintf(&tmp, "%s %s /", program, device);
     } else {
-        asprintf(&tmp, "%s %s", program, device);
-    }
-    paranoid_free(program);
-
-    asprintf(&program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "Formatting %s as %s", device, format);
+        mr_asprintf(&tmp, "%s %s", program, device);
+    }
+    mr_free(program);
+
+    mr_asprintf(&program, "sh -c 'echo -en \"y\\ny\\ny\\n\" | %s'", tmp);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "Formatting %s as %s", device, format);
     update_progress_form(tmp);
 
@@ -857 +858 @@
     if (res && strstr(program, "kludge")) {
 #ifdef __FreeBSD__
-        paranoid_free(program);
-        asprintf(&program, "newfs_msdos -F 32 %s", device);
+        mr_free(program);
+        mr_asprintf(&program, "newfs_msdos -F 32 %s", device);
 #else
 #ifdef __IA64__
         /* For EFI partitions take fat16 
          * as we want to make small ones */
-        paranoid_free(program);
-        asprintf(&program, "mkfs -t %s -F 16 %s", format, device);
+        mr_free(program);
+        mr_asprintf(&program, "mkfs -t %s -F 16 %s", format, device);
 #else
-        paranoid_free(program);
-        asprintf(&program, "mkfs -t %s -F 32 %s", format, device);
+        mr_free(program);
+        mr_asprintf(&program, "mkfs -t %s -F 32 %s", format, device);
 #endif
 #endif
@@ -875 +876 @@
         }
     }
-    paranoid_free(program);
+    mr_free(program);
 
     retval += res;
     if (retval) {
-        asprintf(&tmp1, "%s%s",tmp, _("...failed"));
+        mr_asprintf(&tmp1, "%s%s",tmp, _("...failed"));
     } else {
-        asprintf(&tmp1, "%s%s",tmp, _("...OK"));
-    }
-    paranoid_free(tmp);
+        mr_asprintf(&tmp1, "%s%s",tmp, _("...OK"));
+    }
+    mr_free(tmp);
 
     log_to_screen(tmp1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
     sync();
     sleep(1);
@@ -923 +924 @@
 
     assert(mountlist != NULL);
-    asprintf(&tmp, "format_everything (mountlist, interactively = %s",
+    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s",
             (interactively) ? "true" : "false");
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     mvaddstr_and_log_it(g_currentY, 0, _("Formatting partitions     "));
@@ -952 +953 @@
             if (interactively) {
                 // ask user if we should format the current device
-                asprintf(&tmp, "Shall I format %s (%s) ?", me->device,
+                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device,
                         me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             } else {
                 do_it = TRUE;
@@ -1003 +1004 @@
         me = &mountlist->el[lino];  // the current mountlist entry
         if (!strcmp(me->mountpoint, "image")) {
-            asprintf(&tmp, "Not formatting %s - it's an image", me->device);
+            mr_asprintf(&tmp, "Not formatting %s - it's an image", me->device);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else if (!strcmp(me->format, "raid")) {
-            asprintf(&tmp, "Not formatting %s - it's a raid-let",
+            mr_asprintf(&tmp, "Not formatting %s - it's a raid-let",
                     me->device);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         } else if (!strcmp(me->format, "lvm")) {
-            asprintf(&tmp, "Not formatting %s - it's an LVM", me->device);
+            mr_asprintf(&tmp, "Not formatting %s - it's an LVM", me->device);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         } else if (!strncmp(me->device, "/dev/md", 7)) {
-            asprintf(&tmp, "Already formatted %s - it's a soft-RAID dev",
+            mr_asprintf(&tmp, "Already formatted %s - it's a soft-RAID dev",
                     me->device);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         } else if (!does_file_exist(me->device)
                    && strncmp(me->device, "/dev/hd", 7)
                    && strncmp(me->device, "/dev/sd", 7)) {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                     "Not formatting %s yet - doesn't exist - probably an LVM",
                     me->device);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         } else {
             if (interactively) {
                 // ask user if we should format the current device
-                asprintf(&tmp, "Shall I format %s (%s) ?", me->device,
+                mr_asprintf(&tmp, "Shall I format %s (%s) ?", me->device,
                         me->mountpoint);
                 do_it = ask_me_yes_or_no(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             } else {
                 do_it = TRUE;
@@ -1068 +1069 @@
     }
 
-    asprintf(&tmp, "format_everything () - %s",
+    mr_asprintf(&tmp, "format_everything () - %s",
             (retval) ? "failed!" : "finished successfully");
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (g_partition_table_locked_up > 0) {
@@ -1135 +1136 @@
 
     if (devno_we_must_allow_for >= 5) {
-        asprintf(&tmp, "Making dummy primary %s%d", drivename, 1);
+        mr_asprintf(&tmp, "Making dummy primary %s%d", drivename, 1);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         g_maximum_progress++;
@@ -1151 +1152 @@
     }
     for (; current_devno < devno_we_must_allow_for; current_devno++) {
-        asprintf(&tmp, "Creating dummy partition %s%d", drivename,
+        mr_asprintf(&tmp, "Creating dummy partition %s%d", drivename,
                 current_devno);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         g_maximum_progress++;
@@ -1301 +1302 @@
     off_t mediasize;
 
-    asprintf(&lnamebuf, "%s", dkname);
+    mr_asprintf(&lnamebuf, "%s", dkname);
     if ((f = open(lnamebuf, O_RDONLY)) == -1) {
         warn("cannot open %s", lnamebuf);
-        paranoid_free(lnamebuf);
+        mr_free(lnamebuf);
         return (NULL);
     }
-    paranoid_free(lnamebuf);
+    mr_free(lnamebuf);
 
     /* New world order */
@@ -1389 +1390 @@
     for (c = 'a'; c <= 'z'; ++c) {
         int idx;
-        asprintf(&subdev_str, "%s%c", drivename, c);
+        mr_asprintf(&subdev_str, "%s%c", drivename, c);
         if ((idx = find_device_in_mountlist(mountlist, subdev_str)) < 0) {
             lp->d_partitions[c - 'a'].p_size = 0;
@@ -1414 +1415 @@
                 lp->d_partitions[c - 'a'].p_fstype = FS_OTHER;
         }
-        paranoid_free(subdev_str);
+        mr_free(subdev_str);
     }
 
@@ -1445 +1446 @@
     display_disklabel(ftmp, lp);
     fclose(ftmp);
-    asprintf(&command, "disklabel -wr %s auto", canonical_name(drivename));
+    mr_asprintf(&command, "disklabel -wr %s auto", canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
-    paranoid_free(command);
-
-    asprintf(&command, "disklabel -R %s /tmp/disklabel",
+    mr_free(command);
+
+    mr_asprintf(&command, "disklabel -R %s /tmp/disklabel",
             canonical_name(drivename));
     retval += run_program_and_log_output(command, TRUE);
-    paranoid_free(command);
+    mr_free(command);
     if (ret)
         *ret = *lp;
@@ -1495 +1496 @@
     assert_string_is_neither_NULL_nor_zerolength(drivename);
 
-    asprintf(&tmp, "Partitioning drive %s", drivename);
+    mr_asprintf(&tmp, "Partitioning drive %s", drivename);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
 #if __FreeBSD__
@@ -1504 +1505 @@
 #else
     make_hole_for_file(FDISK_LOG);
-    asprintf(&tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG,
+    mr_asprintf(&tmp, "parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG,
             FDISK_LOG);
     pout_to_fdisk = popen(tmp, "w");
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!pout_to_fdisk) {
@@ -1531 +1532 @@
                 // try DangerouslyDedicated mode
                 for (c = 'a'; c <= 'z'; c++) {
-                    asprintf(&subdev_str, "%s%c", drivename, c);
+                    mr_asprintf(&subdev_str, "%s%c", drivename, c);
                     if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
                         fbsd_part = TRUE;
                     }
-                    paranoid_free(subdev_str);
+                    mr_free(subdev_str);
                 }
                 if (fbsd_part) {
@@ -1541 +1542 @@
                                                  drivename,
                                                  0);
-                    asprintf(&command, "disklabel -B %s",
+                    mr_asprintf(&command, "disklabel -B %s",
                             basename(drivename));
                     if (system(command)) {
@@ -1548 +1549 @@
                              ("Warning! Unable to make the drive bootable."));
                     }
-                    paranoid_free(command);
-                    paranoid_free(device_str);
+                    mr_free(command);
+                    mr_free(device_str);
 
                     return r;
@@ -1555 +1556 @@
             }
             for (c = 'a'; c <= 'z'; c++) {
-                asprintf(&subdev_str, "%s%c", device_str, c);
+                mr_asprintf(&subdev_str, "%s%c", device_str, c);
                 if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
                     fbsd_part = TRUE;
                 }
-                paranoid_free(subdev_str);
+                mr_free(subdev_str);
             }
             // Now we check the subpartitions of the current partition.
@@ -1565 +1566 @@
                 int i, line;
 
-                asprintf(&format, "ufs");
+                mr_asprintf(&format, "ufs");
                 partsize = 0;
                 for (i = 'a'; i < 'z'; ++i) {
-                    asprintf(&subdev_str, "%s%c", device_str, i);
+                    mr_asprintf(&subdev_str, "%s%c", device_str, i);
                     line = find_device_in_mountlist(mountlist, subdev_str);
-                    paranoid_free(subdev_str);
+                    mr_free(subdev_str);
 
                     if (line > 0) {
@@ -1596 +1597 @@
             file = open(drivename, O_WRONLY);
             if (!file) {
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                         _("Warning - unable to open %s for wiping it's partition table"),
                         drivename);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
 
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    asprintf(&tmp, _("Warning - unable to write to %s"),
+                    mr_asprintf(&tmp, _("Warning - unable to write to %s"),
                             drivename);
                     log_to_screen(tmp);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 }
             }
@@ -1629 +1630 @@
 #endif
 
-            asprintf(&format, mountlist->el[lino].format);
+            mr_asprintf(&format, mountlist->el[lino].format);
             partsize = mountlist->el[lino].size;
 
@@ -1640 +1641 @@
                 (_
                  ("You must leave at least one partition spare as the Extended partition."));
-            paranoid_free(device_str);
-            paranoid_free(format);
+            mr_free(device_str);
+            mr_free(format);
 
             return (1);
@@ -1652 +1653 @@
 #ifdef __FreeBSD__
         if ((current_devno <= 4) && fbsd_part) {
-            asprintf(&tmp, "disklabel -B %s", basename(device_str));
+            mr_asprintf(&tmp, "disklabel -B %s", basename(device_str));
             retval += label_drive_or_slice(mountlist, device_str, 0);
             if (system(tmp)) {
@@ -1658 +1659 @@
                     (_("Warning! Unable to make the slice bootable."));
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
 #endif
@@ -1664 +1665 @@
         previous_devno = current_devno;
     }
-    paranoid_free(device_str);
-    paranoid_free(format);
+    mr_free(device_str);
+    mr_free(format);
 
     if (pout_to_fdisk) {
@@ -1671 +1672 @@
         tmp1 = call_program_and_get_last_line_of_output
                 ("make-me-bootable /tmp/mountlist.txt dummy");
-        asprintf(&tmp, "a\n%s\n", tmp1);
-        paranoid_free(tmp1);
+        mr_asprintf(&tmp, "a\n%s\n", tmp1);
+        mr_free(tmp1);
 
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         // close fdisk
@@ -1683 +1684 @@
         log_msg(0,
                 "------------------- fdisk.log looks like this ------------------");
-        asprintf(&tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
+        mr_asprintf(&tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
         system(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         log_msg(0,
                 "------------------- end of fdisk.log... word! ------------------");
-        asprintf(&tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
+        mr_asprintf(&tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
         if (!run_program_and_log_output(tmp, 5)) {
             g_partition_table_locked_up++;
@@ -1696 +1697 @@
                  ("A flaw in the Linux kernel has locked the partition table."));
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     return (retval);
@@ -1739 +1740 @@
 
     if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-        asprintf(&tmp, "Not partitioning %s - it is a virtual drive", drive);
+        mr_asprintf(&tmp, "Not partitioning %s - it is a virtual drive", drive);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
     partition_name = build_partition_name(drive, partno);
     if (partsize <= 0) {
-        asprintf(&tmp, "Partitioning device %s (max size)", partition_name);
+        mr_asprintf(&tmp, "Partitioning device %s (max size)", partition_name);
     } else {
-        asprintf(&tmp, "Partitioning device %s (%lld MB)", partition_name,
+        mr_asprintf(&tmp, "Partitioning device %s (%lld MB)", partition_name,
                 (long long) partsize / 1024);
     }
     update_progress_form(tmp);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (is_this_device_mounted(partition_name)) {
-        asprintf(&tmp, _("%s is mounted, and should not be partitioned"),
+        mr_asprintf(&tmp, _("%s is mounted, and should not be partitioned"),
                 partition_name);
-        paranoid_free(partition_name);
+        mr_free(partition_name);
 
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
 
     p = (char *) strrchr(partition_name, '/');
-    asprintf(&program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE,
+    mr_asprintf(&program, "parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE,
             MONDO_LOGFILE);
 
@@ -1773 +1774 @@
     /* make it a primary/extended/logical */
     if (partno <= 4) {
-        asprintf(&output,"n\np\n%d\n", partno);
+        mr_asprintf(&output,"n\np\n%d\n", partno);
     } else {
         /* MBR needs an extended partition if more than 4 partitions */
@@ -1782 +1783 @@
                         (_
                          ("You need to leave at least one partition free, for 'extended/logical'"));
-                    paranoid_free(partition_name);
-                    paranoid_free(program);
-
-                    paranoid_free(output);
+                    mr_free(partition_name);
+                    mr_free(program);
+
+                    mr_free(output);
                     return (1);
                 } else {
-                    asprintf(&output,"n\ne\n%d\n\n\n",prev_partno + 1);
+                    mr_asprintf(&output,"n\ne\n%d\n\n\n",prev_partno + 1);
                 }
             }
-            asprintf(&tmp,"%sn\nl\n",output);
-            paranoid_free(output);
+            mr_asprintf(&tmp,"%sn\nl\n",output);
+            mr_free(output);
             output = tmp;
         } else {
             /* GPT allows more than 4 primary partitions */
-            asprintf(&output,"n\np\n%d\n",partno);
-        }
-    }
-    paranoid_free(part_table_fmt);
+            mr_asprintf(&output,"n\np\n%d\n",partno);
+        }
+    }
+    mr_free(part_table_fmt);
     /*start block (ENTER for next free blk */
-    asprintf(&tmp,"%s\n",output);
-    paranoid_free(output);
+    mr_asprintf(&tmp,"%s\n",output);
+    mr_free(output);
     output = tmp;
 
@@ -1810 +1811 @@
             partsize += 512;
         }
-        asprintf(&tmp,"%s+%lldK", output,  (long long) (partsize));
-        paranoid_free(output);
+        mr_asprintf(&tmp,"%s+%lldK", output,  (long long) (partsize));
+        mr_free(output);
         output = tmp;
     }
-    asprintf(&tmp,"%s\n",output);
-    paranoid_free(output);
+    mr_asprintf(&tmp,"%s\n",output);
+    mr_free(output);
     output = tmp;
 #if 0
 /*
 #endif
-    asprintf(&tmp,"PARTSIZE = +%ld",(long)partsize);
+    mr_asprintf(&tmp,"PARTSIZE = +%ld",(long)partsize);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_it("---fdisk command---");
@@ -1845 +1846 @@
                     partno);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (!retval) {
@@ -1864 +1865 @@
         }
     } else {
-        asprintf(&tmp,"%sw\n\n",output);
-        paranoid_free(output);
+        mr_asprintf(&tmp,"%sw\n\n",output);
+        mr_free(output);
         output = tmp;
 
@@ -1885 +1886 @@
                                  format, -1);
             if (res) {
-                asprintf(&tmp, "Failed to vacuum-pack %s", partition_name);
+                mr_asprintf(&tmp, "Failed to vacuum-pack %s", partition_name);
                 log_it(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 retval++;
@@ -1899 +1900 @@
                                    partsize);
             if (retval) {
-                asprintf(&tmp, "Partitioned %s but failed to set its type",
+                mr_asprintf(&tmp, "Partitioned %s but failed to set its type",
                         partition_name);
                 log_it(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
             } else {
                 if (partsize > 0) {
-                    asprintf(&tmp, "Partition %s created+configured OK",
+                    mr_asprintf(&tmp, "Partition %s created+configured OK",
                             partition_name);
                     log_to_screen(tmp);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 } else {
                     log_it("Returning from a successful vacuum-pack");
@@ -1914 +1915 @@
             }
         } else {
-            asprintf(&tmp, "Failed to partition %s", partition_name);
+            mr_asprintf(&tmp, "Failed to partition %s", partition_name);
             if (partsize > 0) {
                 log_to_screen(tmp);
@@ -1920 +1921 @@
                 log_it(tmp);
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
             retval++;
         }
@@ -1926 +1927 @@
     g_current_progress++;
     log_it("partition_device() --- leaving");
-    paranoid_free(partition_name);
-    paranoid_free(program);
-    paranoid_free(output);
+    mr_free(partition_name);
+    mr_free(program);
+    mr_free(output);
     return (retval);
 }
@@ -2014 +2015 @@
     system("clear");
     newtResume();
-    paranoid_free(drivelist);
+    mr_free(drivelist);
     return (retval);
 }
@@ -2058 +2059 @@
     p = (char *) strrchr(partition, '/');
     if (strcmp(format, "swap") == 0) {
-        asprintf(&partcode, "82");
+        mr_asprintf(&partcode, "82");
     } else if (strcmp(format, "vfat") == 0) {
         if (partsize / 1024 > 8192) {
-            asprintf(&partcode, "c");
+            mr_asprintf(&partcode, "c");
         } else {
-            asprintf(&partcode, "b");
+            mr_asprintf(&partcode, "b");
         }
     } else if (strcmp(format, "ext2") == 0
@@ -2069 +2070 @@
                || strcmp(format, "ext3") == 0 || strcmp(format, "xfs") == 0
                || strcmp(format, "jfs") == 0) {
-        asprintf(&partcode, "83");
+        mr_asprintf(&partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
-        asprintf(&partcode, "81");
+        mr_asprintf(&partcode, "81");
     } else if (strcmp(format, "raid") == 0) {
-        asprintf(&partcode, "fd");
+        mr_asprintf(&partcode, "fd");
     } else if ((strcmp(format, "ufs") == 0)
                || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
-        asprintf(&partcode, "a5");
+        mr_asprintf(&partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
-        asprintf(&partcode, "8e");
+        mr_asprintf(&partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        asprintf(&partcode, "%s", "");
+        mr_asprintf(&partcode, "%s", "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
-        asprintf(&partcode, format);
+        mr_asprintf(&partcode, format);
     } else {
         /* probably an image */
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 "Unknown format ('%s') - using supplied string anyway",
                 format);
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 #ifdef __FreeBSD__
-        asprintf(&partcode, format);    // was a5
+        mr_asprintf(&partcode, format); // was a5
 #else
-        asprintf(&partcode, format);    // was 83
-#endif
-    }
-    asprintf(&tmp, "Setting %s's type to %s (%s)", partition, format,
+        mr_asprintf(&partcode, format); // was 83
+#endif
+    }
+    mr_asprintf(&tmp, "Setting %s's type to %s (%s)", partition, format,
             partcode);
-    paranoid_free(partition);
+    mr_free(partition);
 
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     if (partcode[0] != '\0' && strcmp(partcode, "83")) {    /* no need to set type if 83: 83 is default */
 
@@ -2111 +2112 @@
                 || strstr(tmp1, " (1-4)")) {
                 log_msg(5, "Specifying partno (%d) - yay", partno);
-                asprintf(&tmp, "%d\n", partno);
+                mr_asprintf(&tmp, "%d\n", partno);
                 fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-                paranoid_free(tmp);
-                paranoid_free(tmp1);
+                mr_free(tmp);
+                mr_free(tmp1);
                 tmp1 = last_line_of_file(FDISK_LOG);
                 log_msg(5, "A - last line = '%s'", tmp1);
             }
-            paranoid_free(tmp1);
-
-            asprintf(&tmp, "%s\n", partcode);
+            mr_free(tmp1);
+
+            mr_asprintf(&tmp, "%s\n", partcode);
             fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             tmp1 = last_line_of_file(FDISK_LOG);
             log_msg(5, "B - last line = '%s'",tmp1);
-            paranoid_free(tmp1);
+            mr_free(tmp1);
 
             fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
             tmp1 = last_line_of_file(FDISK_LOG);
             log_msg(5, "C - last line = '%s'",tmp1);
-            paranoid_free(tmp1);
+            mr_free(tmp1);
 
             tmp = last_line_of_file(FDISK_LOG);
@@ -2138 +2139 @@
                 fput_string_one_char_at_a_time(pout_to_fdisk, "\n");
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
             fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         } else {
-            asprintf(&output, "t\n%d\n%s\nw\n", partno, partcode);
-            asprintf(&command, "parted2fdisk %s >> %s 2>> %s", drive,
+            mr_asprintf(&output, "t\n%d\n%s\nw\n", partno, partcode);
+            mr_asprintf(&command, "parted2fdisk %s >> %s 2>> %s", drive,
                     MONDO_LOGFILE, MONDO_LOGFILE);
             log_msg(5, "output = '%s'", output);
@@ -2156 +2157 @@
                 paranoid_pclose(fout);
             }
-            paranoid_free(command);
-            paranoid_free(output);
+            mr_free(command);
+            mr_free(output);
         }
         /* BERLIOS: Useless as command not initialized in all cases
@@ -2165 +2166 @@
         */
     }
-    paranoid_free(partcode);
+    mr_free(partcode);
 
 
@@ -2190 +2191 @@
         return 1;
     }
-    asprintf(&program, "vinum start -f %s", raid_device);
+    mr_asprintf(&program, "vinum start -f %s", raid_device);
 #else
-    asprintf(&program, "raidstart %s", raid_device);
+    mr_asprintf(&program, "raidstart %s", raid_device);
 #endif
     log_msg(1, "program = %s", program);
@@ -2199 +2200 @@
         fprintf(g_fprep, "%s\n", program);
     }
-    paranoid_free(program);
+    mr_free(program);
 
     if (res) {
@@ -2234 +2235 @@
         return 1;
     }
-    asprintf(&program, "vinum stop -f %s", raid_device);
+    mr_asprintf(&program, "vinum stop -f %s", raid_device);
 #else
     // use raidstop if it exists, otherwise use mdadm
     if (run_program_and_log_output("which raidstop", FALSE)) {
-        asprintf(&program, "mdadm -S %s", raid_device);
+        mr_asprintf(&program, "mdadm -S %s", raid_device);
     } else {
-        asprintf(&program, "raidstop %s", raid_device);
+        mr_asprintf(&program, "raidstop %s", raid_device);
     }
 #endif
@@ -2248 +2249 @@
         fprintf(g_fprep, "%s\n", program);
     }
-    paranoid_free(program);
+    mr_free(program);
 
     if (res) {
@@ -2322 +2323 @@
             return (1);
         }
-        for (getline(&incoming, &n, fin); !feof(fin);
-             getline(&incoming, &n, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin);
+             mr_getline(&incoming, &n, fin)) {
             retval += stop_raid_device(incoming);
         }
@@ -2332 +2333 @@
             return (1);
         }
-        for (getline(&incoming, &n, fin); !feof(fin);
-             getline(&incoming, &n, fin)) {
+        for (mr_getline(&incoming, &n, fin); !feof(fin);
+             mr_getline(&incoming, &n, fin)) {
             for (p = incoming;
                  *p != '\0' && (*p != 'm' || *(p + 1) != 'd'
                                 || !isdigit(*(p + 2))); p++);
             if (*p != '\0') {
-                asprintf(&dev, "/dev/%s", p);
+                mr_asprintf(&dev, "/dev/%s", p);
                 /* BERLIOS : 32 Hard coded value */
                 for (p = dev; *p > 32; p++);
                 *p = '\0';
                 res = stop_raid_device(dev);
-                paranoid_free(dev);
-            }
-        }
-#endif
-        paranoid_free(incoming);
+                mr_free(dev);
+            }
+        }
+#endif
+        mr_free(incoming);
     }
     paranoid_fclose(fin);
@@ -2381 +2382 @@
     if (strcmp(format, "swap") == 0) {
 #ifdef __FreeBSD__
-        asprintf(&program, "true");
+        mr_asprintf(&program, "true");
 #else
-        asprintf(&program, "mkswap");
+        mr_asprintf(&program, "mkswap");
 #endif
     } else if (strcmp(format, "vfat") == 0) {
-        asprintf(&program, "format-and-kludge-vfat");
+        mr_asprintf(&program, "format-and-kludge-vfat");
 #ifndef __FreeBSD__
     } else if (strcmp(format, "reiserfs") == 0) {
-        asprintf(&program, "mkreiserfs -ff");
+        mr_asprintf(&program, "mkreiserfs -ff");
     } else if (strcmp(format, "xfs") == 0) {
-        asprintf(&program, "mkfs.xfs -f -q");
+        mr_asprintf(&program, "mkfs.xfs -f -q");
     } else if (strcmp(format, "jfs") == 0) {
-        asprintf(&program, "mkfs.jfs");
+        mr_asprintf(&program, "mkfs.jfs");
     } else if (strcmp(format, "ext3") == 0) {
-        asprintf(&program, "mkfs -t ext2 -F -j -q");
+        mr_asprintf(&program, "mkfs -t ext2 -F -j -q");
     } else if (strcmp(format, "minix") == 0) {
-        asprintf(&program, "mkfs.minix");
+        mr_asprintf(&program, "mkfs.minix");
 #endif
     } else if (strcmp(format, "ext2") == 0) {
-        asprintf(&program, "mke2fs -F -q");
+        mr_asprintf(&program, "mke2fs -F -q");
     } else {
 #ifdef __FreeBSD__
-        asprintf(&program, "newfs_%s", format);
+        mr_asprintf(&program, "newfs_%s", format);
 #else
-        asprintf(&program, "mkfs -t %s -c", format);    // -c checks for bad blocks
-#endif
-        asprintf(&tmp, "Unknown format (%s) - assuming '%s' will do", format,
+        mr_asprintf(&program, "mkfs -t %s -c", format); // -c checks for bad blocks
+#endif
+        mr_asprintf(&tmp, "Unknown format (%s) - assuming '%s' will do", format,
                 program);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         res = 0;
     }
@@ -2448 +2449 @@
             original_size_of_drive += mountlist->el[partno].size;
         } else {
-            asprintf(&tmp, "Skipping %s", mountlist->el[partno].device);
+            mr_asprintf(&tmp, "Skipping %s", mountlist->el[partno].device);
 //                      log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
     }
@@ -2512 +2513 @@
         return;
     }
-    asprintf(&tmp, _("Expanding entries to suit drive %s (%ld MB)"),
+    mr_asprintf(&tmp, _("Expanding entries to suit drive %s (%ld MB)"),
             drive_name, current_size_of_drive);
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     drivemntlist = malloc(sizeof(struct mountlist_reference));
@@ -2532 +2533 @@
 
     if (original_size_of_drive <= 0) {
-        asprintf(&tmp, _("Cannot resize %s's entries. Drive not found."),
+        mr_asprintf(&tmp, _("Cannot resize %s's entries. Drive not found."),
                 drive_name);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return;
     }
     factor =
         (float) (current_size_of_drive) / (float) (original_size_of_drive);
-    asprintf(&tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f",
+    mr_asprintf(&tmp, "Disk %s was %ld MB; is now %ld MB; factor = %f",
             drive_name, original_size_of_drive, current_size_of_drive,
             factor);
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     lastpart = drivemntlist->entries - 1;
@@ -2563 +2564 @@
             newsizL = (long) new_size;
         }
-        asprintf(&tmp, _("Changing %s from %lld KB to %ld KB"),
+        mr_asprintf(&tmp, _("Changing %s from %lld KB to %ld KB"),
                 drivemntlist->el[partno]->device,
                 drivemntlist->el[partno]->size, newsizL);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         drivemntlist->el[partno]->size = newsizL;
     }
     final_size = get_phys_size_of_drive(drive_name);
-    asprintf(&tmp, _("final_size = %ld MB"), final_size);
+    mr_asprintf(&tmp, _("final_size = %ld MB"), final_size);
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -2613 +2614 @@
     }
     log_to_screen(_("Mountlist adjusted to suit current hard drive(s)"));
-    paranoid_free(drivelist);
+    mr_free(drivelist);
 }
 
@@ -2637 +2638 @@
     log_msg(1, "Creating list of partitions for drive %s", drive_name);
 
-    asprintf(&tmp_drive_name,drive_name);
+    mr_asprintf(&tmp_drive_name,drive_name);
     if (!tmp_drive_name)
         fatal_error("Out of memory");
@@ -2657 +2658 @@
         }
     }
-    paranoid_free(tmp_drive_name);
+    mr_free(tmp_drive_name);
 }
 

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -23 +23 @@
 #include <pthread.h>
 #endif
+#include "mr_mem.h"
 
 extern void twenty_seconds_til_yikes(void);
@@ -160 +161 @@
     assert(raidlist != NULL);
     if (!bkpinfo->disaster_recovery) {
-        paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
+        mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
         log_msg(2, "I guess you're testing edit_mountlist()");
     }
@@ -274 +275 @@
         }
         if (g_ISO_restore_mode) {
-            asprintf(&tmp, "umount %s", bkpinfo->isodir);
+            mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         paranoid_MR_finish(0);
@@ -386 +387 @@
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
             tmp1 = find_my_editor();
-            asprintf(&tmp, "%s %s", tmp1, g_mountlist_fname);
-            paranoid_free(tmp1);
+            mr_asprintf(&tmp, "%s %s", tmp1, g_mountlist_fname);
+            mr_free(tmp1);
 
             res = system(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             load_mountlist(mountlist, g_mountlist_fname);
         } else {
@@ -500 +501 @@
              ask_me_yes_or_no
              (_("Do you want me to restore _some_ of your data?")))) {
-        asprintf(&old_restpath,bkpinfo->restore_path);
+        mr_asprintf(&old_restpath,bkpinfo->restore_path);
         for (done = FALSE; !done;) {
             unlink("/tmp/filelist.full");
@@ -514 +515 @@
                     if (!strcmp(bkpinfo->restore_path, "/")) {
                         if (!ask_me_yes_or_no(_("Are you sure?"))) {
-                            paranoid_alloc(bkpinfo->restore_path, old_restpath);
+                            mr_allocstr(bkpinfo->restore_path, old_restpath);
                             goto gotos_suck;
                         }
-                        paranoid_alloc(bkpinfo->restore_path, "");  // so we restore to [blank]/file/name :)
+                        mr_allocstr(bkpinfo->restore_path, ""); // so we restore to [blank]/file/name :)
                     }
                     log_msg(1, "Restoring subset");
@@ -523 +524 @@
                     free_filelist(filelist);
                 } else {
-                    paranoid_alloc(bkpinfo->restore_path,old_restpath);
+                    mr_allocstr(bkpinfo->restore_path,old_restpath);
                     free_filelist(filelist);
                 }
@@ -534 +535 @@
             }
         }
-        paranoid_free(old_restpath);
+        mr_free(old_restpath);
     } else {
         mvaddstr_and_log_it(g_currentY++,
@@ -567 +568 @@
                             ("Using e2label to label your ext2,3 partitions"));
         if (does_file_exist("/tmp/fstab.new")) {
-            asprintf(&fstab_fname, "/tmp/fstab.new");
+            mr_asprintf(&fstab_fname, "/tmp/fstab.new");
         } else {
-            asprintf(&fstab_fname, "/tmp/fstab");
-        }
-        asprintf(&tmp,
+            mr_asprintf(&fstab_fname, "/tmp/fstab");
+        }
+        mr_asprintf(&tmp,
                 "label-partitions-as-necessary %s < %s >> %s 2>> %s",
                 g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
                 MONDO_LOGFILE);
-        paranoid_free(fstab_fname);
+        mr_free(fstab_fname);
 
         res = system(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         if (res) {
             log_to_screen
@@ -679 +680 @@
             (strstr(tmp1,"RESTORE") == NULL)) {
                 /* -H option */
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                     _
                     (" Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information."));
                 popup_and_OK(tmp);
-                paranoid_free(tmp);
-        }
-        paranoid_free(tmp1);
+                mr_free(tmp);
+        }
+        mr_free(tmp1);
 
         log_to_screen(_
@@ -739 +740 @@
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 _
                 ("Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?"),
                 tmpA, tmpB, tmpC);
         if (ask_me_yes_or_no(tmp)) {
-            paranoid_free(tmp);
+            mr_free(tmp);
             retval = interactive_mode(bkpinfo, mountlist, raidlist);
             goto after_the_nuke;
         } else {
-            paranoid_free(tmp);
+            mr_free(tmp);
             fatal_error("Nuke Mode aborted. ");
         }
@@ -787 +788 @@
                 }
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             retval += res;
@@ -840 +841 @@
                         ("Using e2label to label your ext2,3 partitions"));
 
-    asprintf(&tmp, "label-partitions-as-necessary %s < /tmp/fstab",
+    mr_asprintf(&tmp, "label-partitions-as-necessary %s < /tmp/fstab",
             g_mountlist_fname);
     res = run_program_and_log_output(tmp, TRUE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (res) {
@@ -916 +917 @@
     }
 
-    paranoid_alloc(bkpinfo->restore_path, "/");
+    mr_allocstr(bkpinfo->restore_path, "/");
     if (!g_restoring_live_from_cd) {
         popup_and_OK
@@ -945 +946 @@
     if (filelist) {
         save_filelist(filelist, "/tmp/selected-files.txt");
-        asprintf(&old_restpath,bkpinfo->restore_path);
+        mr_asprintf(&old_restpath,bkpinfo->restore_path);
         if (popup_and_get_string(_("Restore path"),
                                  _("Restore files to where? )"),
@@ -953 +954 @@
         }
         free_filelist(filelist);
-        paranoid_alloc(bkpinfo->restore_path,old_restpath);
+        mr_allocstr(bkpinfo->restore_path,old_restpath);
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1034 +1035 @@
     if (!(fin = fopen(tmp,"r"))) {
         log_to_screen(_("Cannot even open bigfile's info file"));
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (pathname_of_last_file_restored);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     memset((void *) &biggiestruct, 0, sizeof(biggiestruct));
@@ -1047 +1048 @@
     paranoid_fclose(fin);
 
-    asprintf(&checksum, biggiestruct.checksum);
+    mr_asprintf(&checksum, biggiestruct.checksum);
 
     if (!checksum[0]) {
-        asprintf(&tmp, "Warning - bigfile %ld does not have a checksum",
+        mr_asprintf(&tmp, "Warning - bigfile %ld does not have a checksum",
                 bigfileno + 1);
         log_msg(3, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         /* BERLIOS : Useless ???
         p = checksum;
         */
     }
-    paranoid_free(checksum);
+    mr_free(checksum);
 
     if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
     {
-        asprintf(&outfile_fname, biggiestruct.filename);
+        mr_asprintf(&outfile_fname, biggiestruct.filename);
     } else {
-        asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path,
+        mr_asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path,
                 biggiestruct.filename);
     }
@@ -1101 +1102 @@
                 "Calling ntfsclone in background because %s is an NTFS /dev entry",
                 outfile_fname);
-        asprintf(&ntfsprog_fifo, "/tmp/%d.%d.000", (int) (random() % 32768),
+        mr_asprintf(&ntfsprog_fifo, "/tmp/%d.%d.000", (int) (random() % 32768),
                 (int) (random() % 32768));
         mkfifo(ntfsprog_fifo, 0x770);
@@ -1125 +1126 @@
         }
         // BERLIOS: Is it the right place ??
-        paranoid_free(ntfsprog_fifo);
+        mr_free(ntfsprog_fifo);
     } else {
         use_ntfsprog_hack = FALSE;
@@ -1135 +1136 @@
     }
 
-    asprintf(&tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
+    mr_asprintf(&tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
             outfile_fname);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     /*
@@ -1146 +1147 @@
      */
 
-    asprintf(&pathname_of_last_file_restored, biggiestruct.filename);
+    mr_asprintf(&pathname_of_last_file_restored, biggiestruct.filename);
 
     log_msg(3, "file_to_openout = %s", file_to_openout);
@@ -1165 +1166 @@
                     g_current_media_number);
             g_current_media_number++;
-            asprintf(&tmp3,
+            mr_asprintf(&tmp3,
                     "Asking for %s #%d so that I may read slice #%ld\n",
                     bkpinfo->backup_media_string,
                     g_current_media_number, sliceno);
             log_msg(2, tmp3);
-            paranoid_free(tmp3);
-
-            asprintf(&tmp3, _("Restoring from %s #%d"),
+            mr_free(tmp3);
+
+            mr_asprintf(&tmp3, _("Restoring from %s #%d"),
                     bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(tmp3);
-            paranoid_free(tmp3);
+            mr_free(tmp3);
 
             insist_on_this_cd_number(bkpinfo, g_current_media_number);
@@ -1189 +1190 @@
             } else {
                 if (does_file_exist(tmp1)) {
-                    asprintf(&bzip2_command, "lzop -dc %s 2>> %s",tmp1, MONDO_LOGFILE);
+                    mr_asprintf(&bzip2_command, "lzop -dc %s 2>> %s",tmp1, MONDO_LOGFILE);
                 } else if (does_file_exist(tmp2)) {
-                        asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
+                        mr_asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
                 } else if (does_file_exist(tmp)) {
-                        asprintf(&bzip2_command, "%s", "");
+                        mr_asprintf(&bzip2_command, "%s", "");
                 } else {
                     log_to_screen(_("OK, that's pretty fsck0red..."));
@@ -1201 +1202 @@
 
             if (bzip2_command == NULL) {
-                asprintf(&bzip2_command, "cat %s 2>> %s", tmp, MONDO_LOGFILE);
-            }
-            asprintf(&tmp3, "Working on %s #%d, file #%ld, slice #%ld ",
+                mr_asprintf(&bzip2_command, "cat %s 2>> %s", tmp, MONDO_LOGFILE);
+            }
+            mr_asprintf(&tmp3, "Working on %s #%d, file #%ld, slice #%ld ",
                     bkpinfo->backup_media_string,
                     g_current_media_number, bigfileno + 1, sliceno);
@@ -1212 +1213 @@
                 update_progress_form(tmp3);
             }
-            paranoid_free(tmp3);
+            mr_free(tmp3);
 
             if (!(fbzip2 = popen(bzip2_command, "r"))) {
                 fatal_error("Can't run popen command");
             }
-            paranoid_free(bzip2_command);
+            mr_free(bzip2_command);
 
             while (!feof(fbzip2)) {
@@ -1223 +1224 @@
                 if (siz > 0) {
                     siz1 = fwrite(bigblk, 1, siz, fout);
-                    asprintf(&sz_msg, "Read %ld from fbzip2; written %ld to fout", siz, siz1);
+                    mr_asprintf(&sz_msg, "Read %ld from fbzip2; written %ld to fout", siz, siz1);
                     log_it(sz_msg);
-                    paranoid_free(sz_msg);
+                    mr_free(sz_msg);
                 }
             }
@@ -1234 +1235 @@
             g_current_progress++;
         }
-        paranoid_free(tmp);
-        paranoid_free(tmp1);
-        paranoid_free(tmp2);
+        mr_free(tmp);
+        mr_free(tmp1);
+        mr_free(tmp2);
     }
     paranoid_fclose(fout);
@@ -1243 +1244 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         log_it("OK, ntfsclone has really finished");
     }
@@ -1260 +1261 @@
         utime(outfile_fname, ubuf);
     }
-    paranoid_free(outfile_fname);
-    paranoid_free(bigblk);
+    mr_free(outfile_fname);
+    mr_free(bigblk);
 
     return (pathname_of_last_file_restored);
@@ -1329 +1330 @@
     }
 
-    asprintf(&pathname_of_last_file_restored, orig_bf_fname);
+    mr_asprintf(&pathname_of_last_file_restored, orig_bf_fname);
 
     /* open out to biggiefile to be restored (or /dev/null if biggiefile is not to be restored) */
@@ -1359 +1360 @@
     if (use_ntfsprog) {
         g_loglevel = 4;
-        asprintf(&outfile_fname, orig_bf_fname);
+        mr_asprintf(&outfile_fname, orig_bf_fname);
         use_ntfsprog_hack = TRUE;
         log_msg(2,
                 "Calling ntfsclone in background because %s is a /dev entry",
                 outfile_fname);
-        asprintf(&ntfsprog_fifo, "%s/%d.%d.000", 
+        mr_asprintf(&ntfsprog_fifo, "%s/%d.%d.000", 
                 bkpinfo->tmpdir,
                 (int) (random() % 32768),
@@ -1387 +1388 @@
                     (long int) (pid));
         }
-        paranoid_free(ntfsprog_fifo);
+        mr_free(ntfsprog_fifo);
     } else {
         if (!strncmp(orig_bf_fname, "/dev/", 5))    // non-NTFS partition
         {
-            asprintf(&outfile_fname, orig_bf_fname);
+            mr_asprintf(&outfile_fname, orig_bf_fname);
         } else                  // biggiefile
         {
-            asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path,
+            mr_asprintf(&outfile_fname, "%s/%s", bkpinfo->restore_path,
                     orig_bf_fname);
         }
@@ -1403 +1404 @@
             make_hole_for_file(outfile_fname);
         }
-        asprintf(&tmp1, "Reassembling big file %ld (%s)",
+        mr_asprintf(&tmp1, "Reassembling big file %ld (%s)",
                 biggiefile_number + 1, orig_bf_fname);
         log_msg(2, tmp1);
-        paranoid_free(tmp1);
+        mr_free(tmp1);
     }
 
     if (dummy_restore) {
-        paranoid_free(outfile_fname);
-        asprintf(&outfile_fname, "/dev/null");
+        mr_free(outfile_fname);
+        mr_asprintf(&outfile_fname, "/dev/null");
     }
 
     if (bkpinfo->zip_exe == NULL) {
-        asprintf(&command, "cat > \"%s\"", file_to_openout);
+        mr_asprintf(&command, "cat > \"%s\"", file_to_openout);
     } else {
-        asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
+        mr_asprintf(&command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
                 file_to_openout, MONDO_LOGFILE);
     }
-    asprintf(&tmp1, "Pipe command = '%s'", command);
+    mr_asprintf(&tmp1, "Pipe command = '%s'", command);
     log_msg(3, tmp1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     /* restore biggiefile, one slice at a time */
@@ -1428 +1429 @@
         fatal_error("Cannot pipe out");
     }
-    paranoid_free(command);
+    mr_free(command);
 
     for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
@@ -1436 +1437 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        asprintf(&tmp1, "Working on file #%ld, slice #%ld    ",
+        mr_asprintf(&tmp1, "Working on file #%ld, slice #%ld    ",
                 biggiefile_number + 1, current_slice_number);
         log_msg(2, tmp1);
@@ -1446 +1447 @@
         strip_spaces(tmp1);
         update_progress_form(tmp1);
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         if (current_slice_number == 0) {
@@ -1477 +1478 @@
         g_current_progress++;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     paranoid_pclose(pout);
 
@@ -1485 +1486 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
         }   
-        paranoid_free(tmp);
+        mr_free(tmp);
         log_msg(3, "OK, ntfsclone has really finished");
     }
@@ -1505 +1506 @@
     }
 
-    paranoid_free(outfile_fname);
+    mr_free(outfile_fname);
     g_loglevel = old_loglevel;
     return (pathname_of_last_file_restored);
@@ -1551 +1552 @@
     log_msg(5, "Entering");
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-    asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
+    mr_asprintf(&command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
-    paranoid_free(command);
-
-    asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%ld",
+    mr_free(command);
+
+    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%ld",
             current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
@@ -1572 +1573 @@
         log_msg(3, "length_of_file(%s) = %llu", tarball_fname,
                 length_of_file(tarball_fname));
-        asprintf(&tmp, "Unable to restore fileset #%ld (CD I/O error)",
+        mr_asprintf(&tmp, "Unable to restore fileset #%ld (CD I/O error)",
                 current_tarball_number);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         retval = 1;
         log_msg(5, "Leaving");
@@ -1582 +1583 @@
 
     if (filelist) {
-        asprintf(&filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
+        mr_asprintf(&filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
                 current_tarball_number);
         if ((matches =
@@ -1589 +1590 @@
                                              use_star))
             <= 0) {
-            asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
+            mr_asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
             log_msg(1, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else {
             log_msg(3, "Saved fileset %ld's subset to %s",
                     current_tarball_number, filelist_subset_fname);
         }
-        asprintf(&tmp, "Tarball #%ld --- %ld matches",
+        mr_asprintf(&tmp, "Tarball #%ld --- %ld matches",
                 current_tarball_number, matches);
         log_to_screen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         filelist_subset_fname = NULL;
     }
-    paranoid_free(filelist_name);
+    mr_free(filelist_name);
 
     if (filelist == NULL || matches > 0) {
-        asprintf(&xattr_fname, XATTR_LIST_FNAME_RAW_SZ,
+        mr_asprintf(&xattr_fname, XATTR_LIST_FNAME_RAW_SZ,
                 MNT_CDROM "/archives", current_tarball_number);
-        asprintf(&acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives",
+        mr_asprintf(&acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives",
                 current_tarball_number);
         if (strstr(tarball_fname, ".bz2")) {
-            asprintf(&executable, "bzip2");
+            mr_asprintf(&executable, "bzip2");
         } else if (strstr(tarball_fname, ".lzo")) {
-            asprintf(&executable, "lzop");
+            mr_asprintf(&executable, "lzop");
         } else {
             executable = NULL;
@@ -1619 +1620 @@
 
         if (executable == NULL) {
-            asprintf(&tmp, "which %s > /dev/null 2> /dev/null", executable);
+            mr_asprintf(&tmp, "which %s > /dev/null 2> /dev/null", executable);
             if (run_program_and_log_output(tmp, FALSE)) {
                 log_to_screen
@@ -1626 +1627 @@
                 paranoid_MR_finish(1);
             }
-            paranoid_free(tmp);
-
-            asprintf(&tmp, executable);
-            asprintf(&executable, "-P %s -Z", tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, executable);
+            mr_asprintf(&executable, "-P %s -Z", tmp);
+            mr_free(tmp);
         }
 #ifdef __FreeBSD__
@@ -1638 +1639 @@
 #endif
 
-        asprintf(&temp_log, "/tmp/%d.%d", (int) (random() % 32768),
+        mr_asprintf(&temp_log, "/tmp/%d.%d", (int) (random() % 32768),
             (int) (random() % 32768));
 
         if (use_star) {
             if (strstr(tarball_fname, ".bz2")) {
-                asprintf(&tmp, " -bz");
+                mr_asprintf(&tmp, " -bz");
             } else {
-                asprintf(&tmp, "%s", "");
-            }
-            asprintf(&command,
+                mr_asprintf(&tmp, "%s", "");
+            }
+            mr_asprintf(&command,
                     "star -x -force-remove -U " STAR_ACL_SZ
                     " errctl= file=%s %s 2>> %s >> %s", tarball_fname, tmp, temp_log, temp_log);
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else {
             if (filelist_subset_fname != NULL) {
-                asprintf(&command,
+                mr_asprintf(&command,
                         "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s 2>> %s >> %s",
                         TAPE_BLOCK_SIZE,
@@ -1660 +1661 @@
                         tarball_fname, temp_log, temp_log);
             } else {
-                asprintf(&command,
+                mr_asprintf(&command,
                         "afio -i -b %ld -c %ld -M 8m %s %s 2>> %s >> %s",
                         TAPE_BLOCK_SIZE,
@@ -1666 +1667 @@
             }
         }
-        paranoid_free(executable);
+        mr_free(executable);
 
 #undef BUFSIZE
@@ -1680 +1681 @@
             }
         }
-        paranoid_free(command);
+        mr_free(command);
 
         if (res && length_of_file(temp_log) < 5) {
@@ -1711 +1712 @@
         }
         if (retval) {
-            asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
+            mr_asprintf(&command, "cat %s >> %s", temp_log, MONDO_LOGFILE);
             system(command);
-            paranoid_free(command);
+            mr_free(command);
             log_msg(2, "Errors occurred while processing fileset #%d",
                     current_tarball_number);
@@ -1720 +1721 @@
         }
         unlink(xattr_fname);
-        paranoid_free(xattr_fname);
+        mr_free(xattr_fname);
     }
     if (does_file_exist("/PAUSE")) {
@@ -1731 +1732 @@
     unlink(temp_log);
 
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(temp_log);
+    mr_free(filelist_subset_fname);
+    mr_free(acl_fname);
+    mr_free(temp_log);
 
     log_msg(5, "Leaving");
@@ -1785 +1786 @@
     /* to do it with a file... */
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-    asprintf(&tmp,
+    mr_asprintf(&tmp,
             "Restoring from fileset #%ld (%ld KB) on %s #%d",
             current_tarball_number, (long) size >> 10,
@@ -1791 +1792 @@
             g_current_media_number);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
@@ -1799 +1800 @@
    * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
    ****************************************************************************/
-    asprintf(&afio_fname, "/tmp/tmpfs/archive.tmp.%ld",
+    mr_asprintf(&afio_fname, "/tmp/tmpfs/archive.tmp.%ld",
             current_tarball_number);
-    asprintf(&filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
+    mr_asprintf(&filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
             current_tarball_number);
-    asprintf(&filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
+    mr_asprintf(&filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
             bkpinfo->tmpdir, current_tarball_number);
     res = read_file_from_stream_to_file(bkpinfo, afio_fname, size);
@@ -1814 +1815 @@
     if (bkpinfo->compression_level != 0) {
         if (bkpinfo->use_star) {
-            asprintf(&executable, " -bz");
+            mr_asprintf(&executable, " -bz");
         } else {
-            asprintf(&executable, "-P %s -Z", bkpinfo->zip_exe);
+            mr_asprintf(&executable, "-P %s -Z", bkpinfo->zip_exe);
         }
     }
@@ -1827 +1828 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            asprintf(&command, "star -t file=%s %s > %s 2>> %s", afio_fname, executable, filelist_fname, MONDO_LOGFILE);
+            mr_asprintf(&command, "star -t file=%s %s > %s 2>> %s", afio_fname, executable, filelist_fname, MONDO_LOGFILE);
         } else {
             use_star = FALSE;
-            asprintf(&command, "afio -t -M 8m -b %ld %s %s > %s 2>> %s", TAPE_BLOCK_SIZE,
+            mr_asprintf(&command, "afio -t -M 8m -b %ld %s %s > %s 2>> %s", TAPE_BLOCK_SIZE,
                     executable, afio_fname, filelist_fname, MONDO_LOGFILE);
         }
@@ -1837 +1838 @@
             log_msg(4, "Warning - error occurred while retrieving TOC");
         }
-        paranoid_free(command);
+        mr_free(command);
         if ((matches =
              save_filelist_entries_in_common(filelist_fname, filelist,
@@ -1847 +1848 @@
                         current_tarball_number);
             }
-            asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
+            mr_asprintf(&tmp, "Skipping fileset %ld", current_tarball_number);
             log_msg(2, tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
             restore_this_fileset = FALSE;
         } else {
@@ -1859 +1860 @@
     }
     unlink(filelist_fname);
-    paranoid_free(filelist_fname);
+    mr_free(filelist_fname);
 
 // Concoct the call to star/afio to restore files
@@ -1865 +1866 @@
         // star
         if (filelist) {
-            asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable,
+            mr_asprintf(&command, "star -x file=%s %s list=%s 2>> %s", afio_fname, executable,
                     filelist_subset_fname,MONDO_LOGFILE);
         } else {
-            asprintf(&command,"star -x file=%s %s 2>> %s", afio_fname, executable,MONDO_LOGFILE);
+            mr_asprintf(&command,"star -x file=%s %s 2>> %s", afio_fname, executable,MONDO_LOGFILE);
         }
     } else {
         // afio
         if (filelist) {
-            asprintf(&command, "afio -i -M 8m -b %ld %s -w %s %s 2>> %s", TAPE_BLOCK_SIZE, executable, filelist_subset_fname,afio_fname,MONDO_LOGFILE);
+            mr_asprintf(&command, "afio -i -M 8m -b %ld %s -w %s %s 2>> %s", TAPE_BLOCK_SIZE, executable, filelist_subset_fname,afio_fname,MONDO_LOGFILE);
         } else {
-            asprintf(&command, "afio -i -M 8m -b %ld %s %s 2>> %s", TAPE_BLOCK_SIZE, executable,afio_fname,MONDO_LOGFILE);
-        }
-    }
-    paranoid_free(executable);
+            mr_asprintf(&command, "afio -i -M 8m -b %ld %s %s 2>> %s", TAPE_BLOCK_SIZE, executable,afio_fname,MONDO_LOGFILE);
+        }
+    }
+    mr_free(executable);
 
     // Call if IF there are files to restore (selectively/unconditionally)
@@ -1905 +1906 @@
         log_msg(1, "NOT CALLING '%s'", command);
     }
-    paranoid_free(command);
+    mr_free(command);
 
     if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
@@ -1915 +1916 @@
     unlink(afio_fname);
 
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(afio_fname);
+    mr_free(filelist_subset_fname);
+    mr_free(afio_fname);
     return (retval);
 }
@@ -1952 +1953 @@
     assert(bkpinfo != NULL);
 
-    asprintf(&biggies_whose_EXATs_we_should_set,
+    mr_asprintf(&biggies_whose_EXATs_we_should_set,
             "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
@@ -1961 +1962 @@
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
     total_slices = atol(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, _("Reassembling large files      "));
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, _("Reassembling large files      "));
     mvaddstr_and_log_it(g_currentY, 0, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (length_of_file(BIGGIELIST) < 6) {
@@ -1977 +1978 @@
         return (0);
     }
-    asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
+    mr_asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     open_progress_form(_("Reassembling large files"),
@@ -1998 +1999 @@
             tmp1 = slice_fname(bigfileno + 1, 0, ARCHIVES_PATH, "");
             log_msg(3, "Slicename would have been %s", tmp1);
-            paranoid_free(tmp1);
+            mr_free(tmp1);
 
             // I'm not positive 'just_changed_cds' is even necessary...
@@ -2008 +2009 @@
                 insist_on_this_cd_number(bkpinfo,
                                          ++g_current_media_number);
-                asprintf(&tmp, _("Restoring from %s #%d"),
+                mr_asprintf(&tmp, _("Restoring from %s #%d"),
                         bkpinfo->backup_media_string,
                         g_current_media_number);
                 log_to_screen(tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 just_changed_cds = TRUE;
@@ -2023 +2024 @@
         } else {
             just_changed_cds = FALSE;
-            asprintf(&tmp, _("Restoring big file %ld"), bigfileno + 1);
+            mr_asprintf(&tmp, _("Restoring big file %ld"), bigfileno + 1);
             update_progress_form(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             pathname_of_last_biggie_restored =
@@ -2033 +2034 @@
                 fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
             }
-            paranoid_free(pathname_of_last_biggie_restored);
+            mr_free(pathname_of_last_biggie_restored);
             retval += res;
             bigfileno++;
 
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
     if (fbw) {
         fclose(fbw);
-        asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
-        asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+        mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+        mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
         tmp = find_home_of_exe("setfacl");
         if (length_of_file(acl_fname) > 0 && tmp) {
             set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         tmp = find_home_of_exe("setfattr");
@@ -2055 +2056 @@
             set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
         }
-        paranoid_free(tmp);
-        paranoid_free(acl_fname);
-        paranoid_free(xattr_fname);
-    }
-    paranoid_free(biggies_whose_EXATs_we_should_set);
+        mr_free(tmp);
+        mr_free(acl_fname);
+        mr_free(xattr_fname);
+    }
+    mr_free(biggies_whose_EXATs_we_should_set);
 
     if (does_file_exist("/PAUSE")) {
@@ -2117 +2118 @@
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
     max_val = atol(tmp) + 1;
-    paranoid_free(tmp);
-
-    asprintf(&progress_str, _("Restoring from %s #%d"),
+    mr_free(tmp);
+
+    mr_asprintf(&progress_str, _("Restoring from %s #%d"),
             bkpinfo->backup_media_string,
             g_current_media_number);
@@ -2131 +2132 @@
         update_progress_form(progress_str);
 
-        asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
+        mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
                 current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.afio.",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.bz2",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.bz2",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%ld.star.",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
+            mr_free(tarball_fname);
             if (current_tarball_number == 0) {
                 log_to_screen
@@ -2168 +2169 @@
             }
             g_current_media_number++;
-            paranoid_free(progress_str);
-            asprintf(&progress_str, _("Restoring from %s #%d"),
+            mr_free(progress_str);
+            mr_asprintf(&progress_str, _("Restoring from %s #%d"),
                     bkpinfo->backup_media_string,
                     g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            paranoid_free(progress_str);
-            asprintf(&progress_str,
+            mr_free(progress_str);
+            mr_asprintf(&progress_str,
                     _("Restoring from fileset #%ld on %s #%d"),
                     current_tarball_number,
@@ -2189 +2190 @@
             }
             if (res) {
-                asprintf(&tmp1, _("reported errors"));
+                mr_asprintf(&tmp1, _("reported errors"));
             } else {
-                asprintf(&tmp1, _("succeeded"));
-            }
-            asprintf(&tmp, _("%s #%d, fileset #%ld - restore %s"),
+                mr_asprintf(&tmp1, _("succeeded"));
+            }
+            mr_asprintf(&tmp, _("%s #%d, fileset #%ld - restore %s"),
                     bkpinfo->backup_media_string,
                     g_current_media_number, current_tarball_number,tmp1);
-            paranoid_free(tmp1);
+            mr_free(tmp1);
             
             if (attempts > 1) {
-                asprintf(&tmp1, _(" (%d attempts) - review logs"), attempts);
-            }
-            asprintf(&comment, "%s%s", tmp, tmp1);
-            paranoid_free(tmp);
-            paranoid_free(tmp1);
+                mr_asprintf(&tmp1, _(" (%d attempts) - review logs"), attempts);
+            }
+            mr_asprintf(&comment, "%s%s", tmp, tmp1);
+            mr_free(tmp);
+            mr_free(tmp1);
             if (attempts > 1) {
                 log_to_screen(comment);
             }
-            paranoid_free(comment);
+            mr_free(comment);
 
             retval += res;
@@ -2213 +2214 @@
             g_current_progress++;
         }
-        paranoid_free(tarball_fname);
-    }
-    paranoid_free(progress_str);
+        mr_free(tarball_fname);
+    }
+    mr_free(progress_str);
     close_progress_form();
 
@@ -2265 +2266 @@
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
     total_slices = atol(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "Reassembling large files      ");
-    asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "Reassembling large files      ");
+    mr_asprintf(&xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    mr_asprintf(&acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     mvaddstr_and_log_it(g_currentY, 0, tmp);
-    paranoid_free(tmp);
-
-    asprintf(&biggies_whose_EXATs_we_should_set,
+    mr_free(tmp);
+
+    mr_asprintf(&biggies_whose_EXATs_we_should_set,
             "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
@@ -2290 +2291 @@
 
     noof_biggiefiles = atol(biggie_fname);
-    asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
+    mr_asprintf(&tmp, "OK, there are %ld biggiefiles in the archives",
             noof_biggiefiles);
     log_msg(2, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     open_progress_form(_("Reassembling large files"),
@@ -2319 +2320 @@
         }
         */
-        asprintf(&tmp, _("Restoring big file %ld (%lld K)"),
+        mr_asprintf(&tmp, _("Restoring big file %ld (%lld K)"),
                 current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         pathname_of_last_biggie_restored = restore_a_biggiefile_from_stream(bkpinfo, biggie_fname,
@@ -2332 +2333 @@
             fprintf(fbw, "%s\n", pathname_of_last_biggie_restored);
         }
-        paranoid_free(pathname_of_last_biggie_restored);
+        mr_free(pathname_of_last_biggie_restored);
 
         retval += res;
@@ -2340 +2341 @@
     if (current_bigfile_number != noof_biggiefiles
         && noof_biggiefiles != 0) {
-        asprintf(&tmp, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
+        mr_asprintf(&tmp, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
                 current_bigfile_number, noof_biggiefiles);
     } else {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
                 noof_biggiefiles, current_bigfile_number);
     }
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (fbw) {
@@ -2370 +2371 @@
         }
     }
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(biggies_whose_EXATs_we_should_set);
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(biggies_whose_EXATs_we_should_set);
 
     if (does_file_exist("/PAUSE")) {
@@ -2386 +2387 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
-    paranoid_free(biggie_fname);
+    mr_free(biggie_fname);
     return (retval);
 }
@@ -2428 +2429 @@
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
     max_val = atol(tmp) + 1;
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     chdir(bkpinfo->restore_path);   /* I don't know why this is needed _here_ but it seems to be. -HR, 02/04/2002 */
@@ -2434 +2435 @@
     run_program_and_log_output("pwd", 5);
 
-    asprintf(&progress_str, _("Restoring from media #%d"),
+    mr_asprintf(&progress_str, _("Restoring from media #%d"),
             g_current_media_number);
     log_to_screen(progress_str);
@@ -2456 +2457 @@
     while (ctrl_chr != BLK_STOP_AFIOBALLS) {
         update_progress_form(progress_str);
-        asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
+        mr_asprintf(&xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
                 current_afioball_number);
-        asprintf(&acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir,
+        mr_asprintf(&acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir,
                 current_afioball_number);
         unlink(xattr_fname);
@@ -2473 +2474 @@
         }
         /* BERLIOS: useless ?
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 _("Restoring from fileset #%ld (name=%s, size=%ld K)"),
                 current_afioball_number, tmp_fname, (long) tmp_size >> 10);
@@ -2484 +2485 @@
         retval += res;
         if (res) {
-            asprintf(&tmp, _("Fileset %ld - errors occurred"),
+            mr_asprintf(&tmp, _("Fileset %ld - errors occurred"),
                     current_afioball_number);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         res =
@@ -2498 +2499 @@
         g_current_progress++;
 
-        paranoid_free(progress_str);
-        asprintf(&progress_str, _("Restoring from fileset #%ld on %s #%d"),
+        mr_free(progress_str);
+        mr_asprintf(&progress_str, _("Restoring from fileset #%ld on %s #%d"),
                 current_afioball_number,
                 bkpinfo->backup_media_string,
@@ -2507 +2508 @@
         unlink(xattr_fname);
         unlink(acl_fname);
-        paranoid_free(xattr_fname);
-        paranoid_free(acl_fname);
+        mr_free(xattr_fname);
+        mr_free(acl_fname);
     }                           // next
-    paranoid_free(progress_str);
-    paranoid_free(tmp_fname);
+    mr_free(progress_str);
+    mr_free(tmp_fname);
 
     log_msg(1, "All done with afioballs");
@@ -2555 +2556 @@
     /* BERLIOS: should test return value, or better change the function */
     getcwd(cwd, MAX_STR_LEN - 1);
-    asprintf(&tmp, "mkdir -p %s", bkpinfo->restore_path);
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
@@ -2572 +2573 @@
         newtRefresh();
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     mvaddstr_and_log_it(g_currentY, 0,
@@ -2613 +2614 @@
     kill_petris();
     log_msg(2, "restore_everything() --- leaving");
-    paranoid_free(cwd);
-    paranoid_free(newpath);
+    mr_free(cwd);
+    mr_free(newpath);
     return (resA + resB);
 }
@@ -2715 +2716 @@
         g_text_mode = FALSE;
     }                           // newt :-)
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!
@@ -2732 +2733 @@
 
     g_mondo_home = call_program_and_get_last_line_of_output("which mondorestore");
-    paranoid_alloc(g_tmpfs_mountpt, "/tmp/tmpfs");
+    mr_allocstr(g_tmpfs_mountpt, "/tmp/tmpfs");
     make_hole_for_dir(g_tmpfs_mountpt);
     g_current_media_number = 1; // precaution
@@ -2757 +2758 @@
 
 /* Backup original mountlist.txt */
-    asprintf(&tmp, "%s.orig", g_mountlist_fname);
+    mr_asprintf(&tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
         log_msg(2,
@@ -2763 +2764 @@
                 __LINE__, g_mountlist_fname);
     } else if (!does_file_exist(tmp)) {
-        paranoid_free(tmp);
-        asprintf(&tmp, "cp -f %s %s.orig", g_mountlist_fname,
+        mr_free(tmp);
+        mr_asprintf(&tmp, "cp -f %s %s.orig", g_mountlist_fname,
                 g_mountlist_fname);
         run_program_and_log_output(tmp, FALSE);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
 /* Init directories */
     make_hole_for_dir(bkpinfo->tmpdir);
-    asprintf(&tmp, "mkdir -p %s", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "mkdir -p %s", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     make_hole_for_dir("/var/log");
@@ -2805 +2806 @@
         load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
         if (!does_file_exist(g_mountlist_fname)) {
-            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
+            mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
         }
         res = let_user_edit_the_mountlist(bkpinfo, mountlist, raidlist);
@@ -2832 +2833 @@
         bkpinfo->compression_level = 1;
         g_current_media_number = 2;
-        paranoid_alloc(bkpinfo->restore_path, "/tmp/TESTING");
+        mr_allocstr(bkpinfo->restore_path, "/tmp/TESTING");
         bkpinfo->backup_media_type = dvd;
-        paranoid_free(bkpinfo->backup_media_string);
+        mr_free(bkpinfo->backup_media_string);
         bkpinfo->backup_media_string = bkptype_to_string(bkpinfo->backup_media_type);
         open_progress_form(_("Reassembling /dev/hda1"),
@@ -2859 +2860 @@
 //      finish(0);
 //      toggle_path_selection (filelist, "/root/stuff", TRUE);
-        asprintf(&a, argv[3]);
-        asprintf(&b, argv[4]);
+        mr_asprintf(&a, argv[3]);
+        mr_asprintf(&b, argv[4]);
 
         res = save_filelist_entries_in_common(a, filelist, b, FALSE);
         free_filelist(filelist);
-        paranoid_free(a);
-        paranoid_free(b);
+        mr_free(a);
+        mr_free(b);
         printf("res = %d", res);
         finish(0);
@@ -2944 +2945 @@
         log_msg(2, "Still here. Yay.");
         if (strlen(bkpinfo->tmpdir) > 0) {
-            asprintf(&tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
+            mr_asprintf(&tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
             run_program_and_log_output(tmp, FALSE);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         unmount_boot_if_necessary();    /* for Gentoo users */
@@ -2960 +2961 @@
 
         iamhere("About to call load_mountlist and load_raidtab");
-        paranoid_alloc(bkpinfo->restore_path, MNT_RESTORING);
+        mr_allocstr(bkpinfo->restore_path, MNT_RESTORING);
         read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
         retval = load_mountlist(mountlist, g_mountlist_fname);
@@ -2973 +2974 @@
                 && !is_this_device_mounted(bkpinfo->nfs_mount)) {
                 log_msg(1, "Mounting nfs dir");
-                paranoid_alloc(bkpinfo->isodir, "/tmp/isodir");
+                mr_allocstr(bkpinfo->isodir, "/tmp/isodir");
                 run_program_and_log_output("mkdir -p /tmp/isodir", 5);
-                asprintf(&tmp, "mount %s -t nfs -o nolock /tmp/isodir",
+                mr_asprintf(&tmp, "mount %s -t nfs -o nolock /tmp/isodir",
                         bkpinfo->nfs_mount);
                 run_program_and_log_output(tmp, 1);
-                paranoid_free(tmp);
+                mr_free(tmp);
             }
         }
@@ -2995 +2996 @@
             log_msg(0, "Partitioning only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
+            mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = partition_everything(mountlist);
@@ -3004 +3005 @@
             log_msg(0, "Formatting only.");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
+            mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = format_everything(mountlist, FALSE, raidlist);
@@ -3013 +3014 @@
             log_msg(0, "Stopping LVM and RAID");
             load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
-            paranoid_alloc(g_mountlist_fname, "/tmp/mountlist.txt");
+            mr_allocstr(g_mountlist_fname, "/tmp/mountlist.txt");
             load_mountlist(mountlist, g_mountlist_fname);
             res = do_my_funky_lvm_stuff(TRUE, FALSE);
@@ -3139 +3140 @@
     unlink("/tmp/mondo-run-prog.tmp");
     set_signals(FALSE);
-    asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
+    mr_asprintf(&tmp, "rm -Rf %s", bkpinfo->tmpdir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_to_screen
         (_
          ("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
-    asprintf(&tmp,
+    mr_asprintf(&tmp,
             _
             ("Mondo-restore is exiting (retval=%d)                                      "),
             retval);
     log_to_screen(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&tmp, "umount %s", bkpinfo->isodir);
+    mr_free(tmp);
+
+    mr_asprintf(&tmp, "umount %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
-    paranoid_free(tmp);
-
-    paranoid_free(mountlist);
-    paranoid_free(raidlist);
+    mr_free(tmp);
+
+    mr_free(mountlist);
+    mr_free(raidlist);
     if (am_I_in_disaster_recovery_mode()) {
         run_program_and_log_output("mount / -o remount,rw", 2);

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

@@ -14 +14 @@
 #include <pthread.h>
 #endif
+#include "mr_mem.h"
 
 void popup_changelist_from_file(char *);
@@ -61 +62 @@
     }
     if (!(fin = fopen(tmp1, "r"))) {
-        asprintf(&tmp, _("Cannot open bigfile %ld (%s)'s info file"),
+        mr_asprintf(&tmp, _("Cannot open bigfile %ld (%s)'s info file"),
                 bigfileno + 1, tmp);
         log_to_screen(tmp);
-        paranoid_free(tmp);
-        paranoid_free(tmp1);
+        mr_free(tmp);
+        mr_free(tmp1);
         return (1);
     }
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     fread((void *) &biggiestruct, 1, sizeof(biggiestruct), fin);
     paranoid_fclose(fin);
 
-    asprintf(&checksum, biggiestruct.checksum);
-    asprintf(&bigfile_fname, biggiestruct.filename);
+    mr_asprintf(&checksum, biggiestruct.checksum);
+    mr_asprintf(&bigfile_fname, biggiestruct.filename);
 
     log_msg(2, "biggiestruct.filename = %s", bigfile_fname);
@@ -80 +81 @@
 
     if (!g_text_mode) {
-        asprintf(&tmp, _("Comparing %s"), bigfile_fname);
+        mr_asprintf(&tmp, _("Comparing %s"), bigfile_fname);
         newtDrawRootText(0, 22, tmp);
         newtRefresh();
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     /* BERLIOS: Useless ?
@@ -93 +94 @@
         return(0);
     } else {
-        asprintf(&command,
+        mr_asprintf(&command,
                 "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors.txt",
                 MNT_RESTORING, bigfile_fname);
@@ -101 +102 @@
     if (system(command)) {
         log_OS_error("Warning - command failed");
-        paranoid_free(command);
-        paranoid_free(bigfile_fname);
+        mr_free(command);
+        mr_free(bigfile_fname);
         return (1);
     } else {
-        paranoid_free(command);
+        mr_free(command);
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
             log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
-            paranoid_free(bigfile_fname);
+            mr_free(bigfile_fname);
             return (1);
         } else {
-            getline(&original_cksum, &n, fin);
+            mr_getline(&original_cksum, &n, fin);
             paranoid_fclose(fin);
             for (i = strlen(original_cksum);
@@ -128 +129 @@
         retval++;
     }
-    paranoid_free(original_cksum);
-    paranoid_free(checksum);
+    mr_free(original_cksum);
+    mr_free(checksum);
 
     if (retval) {
@@ -138 +139 @@
         paranoid_fclose(fout);
     }
-    paranoid_free(bigfile_fname);
+    mr_free(bigfile_fname);
 
     return (retval);
@@ -181 +182 @@
                        noof_biggiefiles);
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
-        asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
+        mr_asprintf(&tmp, "Comparing big file #%ld", bigfileno + 1);
         log_msg(1, tmp);
         update_progress_form(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         res = compare_a_biggiefile(bkpinfo, bigfileno);
         retval += res;
@@ -232 +233 @@
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%d",
+    mr_asprintf(&filelist_name, MNT_CDROM "/archives/filelist.%d",
             current_tarball_number);
 
     noof_lines = count_lines_in_file(filelist_name);
-    paranoid_free(filelist_name);
+    mr_free(filelist_name);
 
     if (strstr(tarball_fname, ".bz2")) {
-        asprintf(&compressor_exe, "bzip2");
+        mr_asprintf(&compressor_exe, "bzip2");
     } else if (strstr(tarball_fname, ".lzo")) {
-        asprintf(&compressor_exe, "lzop");
+        mr_asprintf(&compressor_exe, "lzop");
     } else {
         compressor_exe = NULL;
@@ -247 +248 @@
 
     if (use_star) {
-        asprintf(&archiver_exe, "star -bz");
-    } else {
-        asprintf(&archiver_exe, "afio");
+        mr_asprintf(&archiver_exe, "star -bz");
+    } else {
+        mr_asprintf(&archiver_exe, "afio");
     }
 
@@ -257 +258 @@
             fatal_error("(compare_a_tarball) Compression program missing");
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (use_star) {
@@ -266 +267 @@
         } else {
             tmp = compressor_exe;
-            asprintf(&compressor_exe, "-P %s -Z", tmp);
-            paranoid_free(tmp);
+            mr_asprintf(&compressor_exe, "-P %s -Z", tmp);
+            mr_free(tmp);
         }
     }
@@ -278 +279 @@
 #endif
 
-    asprintf(&logfile, "/tmp/afio.log.%d", current_tarball_number);
+    mr_asprintf(&logfile, "/tmp/afio.log.%d", current_tarball_number);
     if (use_star)               // doesn't use compressor_exe
     {
-        asprintf(&command,
+        mr_asprintf(&command,
                 "%s -diff H=star file=%s >> %s 2>> %s",
                 archiver_exe, tarball_fname, logfile, logfile);
     } else {
-        asprintf(&command,
+        mr_asprintf(&command,
                 "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
                 archiver_exe,
@@ -292 +293 @@
     }
 #undef BUFSIZE
-    paranoid_free(archiver_exe);
-    paranoid_free(compressor_exe);
+    mr_free(archiver_exe);
+    mr_free(compressor_exe);
 
     res = system(command);
@@ -300 +301 @@
         log_OS_error(command);
     }
-    paranoid_free(command);
+    mr_free(command);
 
     if (length_of_file(logfile) > 5) {
-        asprintf(&command,
+        mr_asprintf(&command,
                 "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vx \"dev/.*\" >> /tmp/changed.txt",
                 logfile);
         system(command);
-        paranoid_free(command);
+        mr_free(command);
         archiver_errors = count_lines_in_file(logfile);
     } else {
@@ -314 +315 @@
 
     if (archiver_errors) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                 "Differences found while processing fileset #%d       ",
                 current_tarball_number);
         log_msg(1, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     unlink(logfile);
-    paranoid_free(logfile);
+    mr_free(logfile);
     return (retval);
 }
@@ -353 +354 @@
 
     max_val = atol(tmp);
-    paranoid_free(tmp);
-
-    asprintf(&progress_str, _("Comparing with %s #%d "),
+    mr_free(tmp);
+
+    mr_asprintf(&progress_str, _("Comparing with %s #%d "),
             bkpinfo->backup_media_string,
             g_current_media_number);
@@ -369 +370 @@
         insist_on_this_cd_number(bkpinfo, g_current_media_number);
         update_progress_form(progress_str);
-        asprintf(&tarball_fname,
+        mr_asprintf(&tarball_fname,
                 MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
 
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.afio.",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
                     current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            paranoid_free(tarball_fname);
-            asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.",
+            mr_free(tarball_fname);
+            mr_asprintf(&tarball_fname, MNT_CDROM "/archives/%d.star.",
                     current_tarball_number);
         }
@@ -398 +399 @@
                 == 0) {
                 log_msg(2, "OK, I think I'm done with tarballs...");
-                paranoid_free(tarball_fname);
+                mr_free(tarball_fname);
                 break;
             }
             log_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            paranoid_free(progress_str);
-            asprintf(&progress_str, _("Comparing with %s #%d "),
+            mr_free(progress_str);
+            mr_asprintf(&progress_str, _("Comparing with %s #%d "),
                     bkpinfo->backup_media_string,
                     g_current_media_number);
@@ -410 +411 @@
         } else {
             res = compare_a_tarball(tarball_fname, current_tarball_number);
-            paranoid_free(tarball_fname);
+            mr_free(tarball_fname);
 
             g_current_progress++;
@@ -416 +417 @@
         }
     }
-    paranoid_free(progress_str);
+    mr_free(progress_str);
     close_progress_form();
 
@@ -470 +471 @@
     noof_changed_files = count_lines_in_file("/tmp/changed.txt");
     if (noof_changed_files) {
-        asprintf(&tmp, _("%ld files do not match the backup            "),
+        mr_asprintf(&tmp, _("%ld files do not match the backup            "),
                 noof_changed_files);
         //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
         log_to_screen(tmp);
-        paranoid_free(tmp);
-
-        asprintf(&command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
+        mr_free(tmp);
+
+        mr_asprintf(&command, "cat /tmp/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
-        paranoid_free(command);
-    } else {
-        asprintf(&tmp, _("All files match the backup                     "));
+        mr_free(command);
+    } else {
+        mr_asprintf(&tmp, _("All files match the backup                     "));
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         log_to_screen(tmp);
-        paranoid_free(tmp);
-    }
-
-    paranoid_free(cwd);
-    paranoid_free(new);
+        mr_free(tmp);
+    }
+
+    mr_free(cwd);
+    mr_free(new);
 
     return (resA + resB);
@@ -573 +574 @@
         } else {
             q = count_lines_in_file("/tmp/changed.files");
-            asprintf(&tmp, _("%ld significant difference%s found."), q,
+            mr_asprintf(&tmp, _("%ld significant difference%s found."), q,
                     (q != 1) ? "s" : "");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
-            paranoid_free(tmp);
-
-            asprintf(&tmp,
+            mr_free(tmp);
+
+            mr_asprintf(&tmp,
                    _("Type 'less /tmp/changed.files' for a list of non-matching files"));
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             log_msg(2, "calling popup_changelist_from_file()");
@@ -624 +625 @@
     chdir(bkpinfo->restore_path);
 
-    asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
             bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
     mvaddstr_and_log_it(g_currentY,
                         0, _("Verifying archives against filesystem"));
@@ -633 +634 @@
     if (bkpinfo->disaster_recovery
         && does_file_exist("/tmp/CDROM-LIVES-HERE")) {
-        paranoid_free(bkpinfo->media_device);
+        mr_free(bkpinfo->media_device);
         // last_line_of_file allocates the string
         bkpinfo->media_device = last_line_of_file("/tmp/CDROM-LIVES-HERE");
     } else {
-        paranoid_free(bkpinfo->media_device);
+        mr_free(bkpinfo->media_device);
         // find_cdrom_device allocates the string
         bkpinfo->media_device = find_cdrom_device(FALSE);
@@ -653 +654 @@
 
     mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
-    paranoid_free(dir);
+    mr_free(dir);
     return (res);
 }
@@ -684 +685 @@
     getcwd(dir, MAX_STR_LEN);
     chdir(bkpinfo->restore_path);
-    asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
+    mr_asprintf(&command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
             bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
-    paranoid_free(command);
+    mr_free(command);
 
     mvaddstr_and_log_it(g_currentY,
@@ -698 +699 @@
         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
-    paranoid_free(dir);
+    mr_free(dir);
     return (res);
 }

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

@@ -16 +16 @@
 
 #include "mondo-rstr-newt.h"
+#include "mr_mem.h"
 
 /**
@@ -78 +79 @@
         (_
          ("   Add one of the following unallocated RAID partitions to this RAID device."));
-    asprintf(&tmp, "%-26s %s", _("Device"), _("Size"));
+    mr_asprintf(&tmp, "%-26s %s", _("Device"), _("Size"));
     headerMsg = newtLabel(1, 1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     partitionsListbox =
@@ -167 +168 @@
     assert(keylist != NULL);
 
-    asprintf(&device_str, "/dev/");
-    asprintf(&mountpoint_str, "/");
+    mr_asprintf(&device_str, "/dev/");
+    mr_asprintf(&mountpoint_str, "/");
 #ifdef __FreeBSD__
-    asprintf(&format_str, "ufs");
+    mr_asprintf(&format_str, "ufs");
 #else
-    asprintf(&format_str, "ext2");
+    mr_asprintf(&format_str, "ext2");
 #endif
     newtOpenWindow(20, 5, 48, 10, _("Add entry"));
@@ -199 +200 @@
         b_res = newtRunForm(myForm);
 
-        paranoid_free(device_str);
-        asprintf(&device_str, device_here);
+        mr_free(device_str);
+        mr_asprintf(&device_str, device_here);
         strip_spaces(device_str);
 
-        paranoid_free(format_str);
-        asprintf(&format_str, format_here);
+        mr_free(format_str);
+        mr_asprintf(&format_str, format_here);
         strip_spaces(format_str);
 
-        paranoid_free(mountpoint_str);
-        asprintf(&mountpoint_str, mountpoint_here);
+        mr_free(mountpoint_str);
+        mr_asprintf(&mountpoint_str, mountpoint_here);
         strip_spaces(mountpoint_str);
 
-        paranoid_free(size_str);
-        asprintf(&size_str, size_here);
+        mr_free(size_str);
+        mr_asprintf(&size_str, size_here);
         strip_spaces(size_str);
 
@@ -234 +235 @@
         return;
     }
-    asprintf(&drive_to_add, device_str);
+    mr_asprintf(&drive_to_add, device_str);
     for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
     num_to_add = atoi(drive_to_add + i);
     drive_to_add[i] = '\0';
-    paranoid_free(drive_to_add);
+    mr_free(drive_to_add);
 
     currline = mountlist->entries;
     strcpy(mountlist->el[currline].device, device_str);
     strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
-    paranoid_free(mountpoint_str);
+    mr_free(mountpoint_str);
 
     strcpy(mountlist->el[currline].format, format_str);
-    paranoid_free(format_str);
+    mr_free(format_str);
 
     mountlist->el[currline].size = atol(size_str) * 1024;
-    paranoid_free(size_str);
+    mr_free(size_str);
 
     mountlist->entries++;
@@ -256 +257 @@
                                     device_str);
     }
-    paranoid_free(device_str);
+    mr_free(device_str);
     redraw_mountlist(mountlist, keylist, listbox);
 }
@@ -296 +297 @@
         }
     }
-    paranoid_free(sz_out);
+    mr_free(sz_out);
 }
 #endif
@@ -335 +336 @@
          && strcmp(raidlist->el[i].volname, basename(raid_device)); i++);
     if (i == raidlist->entries) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "Cannot calc size of raid device %s - cannot find it in raidlist",
                  raid_device);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);             // Isn't this more sensible than 999999999? If the raid dev !exists,
         // then it has no size, right?
@@ -351 +352 @@
         int k = 0, l = 0;
         for (k = 0; k < raidrec->plex[j].subdisks; ++k) {
-            asprintf(&devname, raidrec->plex[j].sd[k].which_device);
+            mr_asprintf(&devname, raidrec->plex[j].sd[k].which_device);
             for (l = 0; l < raidlist->disks.entries; ++l) {
                 if (!strcmp(devname, raidlist->disks.el[l].name)) {
@@ -379 +380 @@
                 }
             }
-            paranoid_free(devname);
+            mr_free(devname);
         }
 
@@ -400 +401 @@
     }
 
-    asprintf(&tmp, "I have calculated %s's real size to be %ld",
+    mr_asprintf(&tmp, "I have calculated %s's real size to be %ld",
              raid_device, (long) smallest_plex);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (smallest_plex);
 #else
@@ -431 +432 @@
          && strcmp(raidlist->el[i].raid_device, raid_device); i++);
     if (i == raidlist->entries) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  "Cannot calc size of raid device %s - cannot find it in raidlist",
                  raid_device);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (999999999);
     }
@@ -458 +459 @@
         total_size = smallest_partition * (noof_partitions - 1);
     }
-    asprintf(&tmp, "I have calculated %s's real size to be %ld",
+    mr_asprintf(&tmp, "I have calculated %s's real size to be %ld",
              raid_device, (long) total_size);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (total_size);
 #endif
@@ -487 +488 @@
     char *sz = NULL;
 
-    asprintf(&prompt,
+    mr_asprintf(&prompt,
              _
              ("Please enter the RAID level you want. (concat, striped, raid5)"));
     if (raidrec->raidlevel == -1) {
-        asprintf(&tmp, "concat");
+        mr_asprintf(&tmp, "concat");
     } else if (raidrec->raidlevel == 0) {
-        asprintf(&tmp, "striped");
+        mr_asprintf(&tmp, "striped");
     } else {
-        asprintf(&tmp, "raid%i", raidrec->raidlevel);
+        mr_asprintf(&tmp, "raid%i", raidrec->raidlevel);
     }
     for (out = 999; out == 999;) {
@@ -504 +505 @@
         /* BERLIOS: Useless ??? 
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            asprintf(&sz, tmp);
+            mr_asprintf(&sz, tmp);
             strncpy(tmp, sz + 1, strlen(sz) - 2);
             tmp[strlen(sz) - 2] = '\0';
-            paranoid_free(sz);
+            mr_free(sz);
         }
         */
@@ -518 +519 @@
         }
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         if (is_this_raid_personality_registered(out)) {
             log_it
@@ -530 +531 @@
         }
     }
-    paranoid_free(prompt);
+    mr_free(prompt);
     raidrec->raidlevel = out;
 #else
@@ -544 +545 @@
         ("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
     personalities = last_line_of_file("/tmp/raid-personalities.txt");
-    asprintf(&prompt, _("Please enter the RAID level you want. %s"),
+    mr_asprintf(&prompt, _("Please enter the RAID level you want. %s"),
              personalities);
-    paranoid_free(personalities);
+    mr_free(personalities);
 
     if (raidrec->raid_level == -1) {
-        asprintf(&tmp, "linear");
+        mr_asprintf(&tmp, "linear");
     } else {
-        asprintf(&tmp, "%d", raidrec->raid_level);
+        mr_asprintf(&tmp, "%d", raidrec->raid_level);
     }
     for (out = 999;
@@ -563 +564 @@
         /* BERLIOS: Useless ???
         if (tmp[0] == '[' && tmp[strlen(tmp) - 1] == ']') {
-            asprintf(&sz, tmp);
-            paranoid_free(tmp);
-
-            asprintf(&tmp, sz + 1);
+            mr_asprintf(&sz, tmp);
+            mr_free(tmp);
+
+            mr_asprintf(&tmp, sz + 1);
             tmp[strlen(sz) - 2] = '\0';
-            paranoid_free(sz);
+            mr_free(sz);
         }
         */
@@ -591 +592 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(prompt);
+    mr_free(tmp);
+    mr_free(prompt);
     raidrec->raid_level = out;
 #endif
@@ -659 +660 @@
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
 
-    asprintf(&tmp, _("Delete %s from RAID device %s - are you sure?"),
+    mr_asprintf(&tmp, _("Delete %s from RAID device %s - are you sure?"),
              disklist->el[currline].device, raid_device);
     if (!ask_me_yes_or_no(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         return;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     for (pos = currline; pos < disklist->entries - 1; pos++) {
         /* memcpy((void*)&disklist->el[pos], (void*)&disklist->el[pos+1], sizeof(struct s_disk)); */
@@ -707 +708 @@
                                                   device);
     if (pos >= 0) {
-        asprintf(&tmp,
+        mr_asprintf(&tmp,
                  _("Cannot delete %s: it is in use by RAID device %s"),
                  mountlist->el[currline].device,
                  raidlist->el[pos].OSSWAP(raid_device, volname));
         popup_and_OK(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         return;
     }
-    asprintf(&tmp, _("Delete %s - are you sure?"),
+    mr_asprintf(&tmp, _("Delete %s - are you sure?"),
              mountlist->el[currline].device);
     if (!ask_me_yes_or_no(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         return;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
-        asprintf(&device, mountlist->el[currline].device);
+        mr_asprintf(&device, mountlist->el[currline].device);
         delete_raidlist_entry(mountlist, raidlist, device);
         for (currline = 0;
@@ -732 +733 @@
             if (currline == mountlist->entries) {
                 log_it("Dev is gone. I can't delete it. Ho-hum");
-                paranoid_free(device);
+                mr_free(device);
                 return;
             }
-        paranoid_free(device);
+        mr_free(device);
     }
     memcpy((void *) &mountlist->el[currline],
@@ -775 +776 @@
         return;
     }
-    asprintf(&tmp,
+    mr_asprintf(&tmp,
              _("Do you want me to delete %s's partitions, too?"), device);
     delete_partitions_too = ask_me_yes_or_no(tmp);
@@ -820 +821 @@
         items--;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     raidlist->entries = items;
@@ -845 +846 @@
 
     av = &raidrec->additional_vars;
-    asprintf(&tmp, _("Delete %s - are you sure?"), av->el[lino].label);
+    mr_asprintf(&tmp, _("Delete %s - are you sure?"), av->el[lino].label);
     if (ask_me_yes_or_no(tmp)) {
         if (!strcmp(av->el[lino].label, "persistent-superblock")
             || !strcmp(av->el[lino].label, "chunk-size")) {
-            paranoid_free(tmp);
-            asprintf(&tmp, _("%s must not be deleted. It would be bad."),
+            mr_free(tmp);
+            mr_asprintf(&tmp, _("%s must not be deleted. It would be bad."),
                      av->el[lino].label);
             popup_and_OK(tmp);
         } else {
-            paranoid_free(av->el[lino].label);
-            paranoid_free(av->el[lino].value);
+            mr_free(av->el[lino].label);
+            mr_free(av->el[lino].value);
             memcpy((void *) &av->el[lino], (void *) &av->el[av->entries--],
                    sizeof(struct raid_var_line));
@@ -864 +865 @@
         }
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 #endif
@@ -924 +925 @@
                 if (!warned_already) {
                     warned_already = TRUE;
-                    asprintf(&tmp,
+                    mr_asprintf(&tmp,
                              _
                              ("Too many lines. Displaying first %d entries only. Close a directory to see more."),
                              ARBITRARY_MAXIMUM);
                     popup_and_OK(tmp);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 }
             } else {
@@ -948 +949 @@
                 (g_strings_of_flist_window[i],
                  g_strings_of_flist_window[i - 1]) < 0) {
-                asprintf(&tmp, g_strings_of_flist_window[i]);
+                mr_asprintf(&tmp, g_strings_of_flist_window[i]);
                 strcpy(g_strings_of_flist_window[i],
                        g_strings_of_flist_window[i - 1]);
                 strcpy(g_strings_of_flist_window[i - 1], tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
 
                 dummybool = g_is_path_selected[i];
@@ -963 +964 @@
         newtListboxClear(listbox);
         for (i = 0; i < lines_in_flist_window; i++) {
-            asprintf(&tmp, "%c%c %-80s",
+            mr_asprintf(&tmp, "%c%c %-80s",
                      (g_is_path_selected[i] ? '*' : ' '),
                      (g_is_path_expanded[i] ? '+' : '-'),
@@ -973 +974 @@
             keylist[i] = (void *) i;
             newtListboxAppendEntry(listbox, tmp, keylist[i]);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
         return (lines_in_flist_window);
@@ -1223 +1224 @@
     memcpy((void *) &bkp_raidlist, (void *) raidlist,
            sizeof(struct raidlist_itself));
-    asprintf(&device_str, mountlist->el[currline].device);
-    asprintf(&device_used_to_be, mountlist->el[currline].device);
-    asprintf(&mountpoint_str, mountlist->el[currline].mountpoint);
-    asprintf(&mountpt_used_to_be, mountlist->el[currline].mountpoint);
-    asprintf(&format_str, mountlist->el[currline].format);
-    asprintf(&size_str, "%lld", mountlist->el[currline].size / 1024);
+    mr_asprintf(&device_str, mountlist->el[currline].device);
+    mr_asprintf(&device_used_to_be, mountlist->el[currline].device);
+    mr_asprintf(&mountpoint_str, mountlist->el[currline].mountpoint);
+    mr_asprintf(&mountpt_used_to_be, mountlist->el[currline].mountpoint);
+    mr_asprintf(&format_str, mountlist->el[currline].format);
+    mr_asprintf(&size_str, "%lld", mountlist->el[currline].size / 1024);
 
     newtOpenWindow(20, 5, 48, 10, "Edit entry");
@@ -1237 +1238 @@
     deviceComp =
         newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
-    paranoid_free(device_str);
+    mr_free(device_str);
 
     mountpointComp =
         newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
-    paranoid_free(mountpoint_str);
+    mr_free(mountpoint_str);
 
     formatComp =
         newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
-    paranoid_free(format_str);
+    mr_free(format_str);
 
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
@@ -1253 +1254 @@
         sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
     }
-    paranoid_free(size_str);
+    mr_free(size_str);
 
     bOK = newtButton(2, 6, _("  OK  "));
@@ -1270 +1271 @@
         b_res = newtRunForm(myForm);
 
-        paranoid_free(device_str);
-        asprintf(&device_str, device_here);
+        mr_free(device_str);
+        mr_asprintf(&device_str, device_here);
         strip_spaces(device_str);
 
-        paranoid_free(mountpoint_str);
-        asprintf(&mountpoint_str, mountpoint_here);
+        mr_free(mountpoint_str);
+        mr_asprintf(&mountpoint_str, mountpoint_here);
         strip_spaces(mountpoint_str);
 
-        paranoid_free(format_str);
-        asprintf(&format_str, format_here);
-        paranoid_free(format_here);
+        mr_free(format_str);
+        mr_asprintf(&format_str, format_here);
+        mr_free(format_here);
         strip_spaces(format_str);
         if (b_res == bOK && strstr(device_str, RAID_DEVICE_STUB)
@@ -1295 +1296 @@
             continue;
         }
-        paranoid_free(mountpt_used_to_be);
+        mr_free(mountpt_used_to_be);
 
         if (!strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
             && strcmp(mountlist->el[currline].mountpoint, "image")) {
-            asprintf(&size_str, size_here);
+            mr_asprintf(&size_str, size_here);
             strip_spaces(size_str);
         } else {
-            asprintf(&size_str, "%ld",
+            mr_asprintf(&size_str, "%ld",
                     calculate_raid_device_size(mountlist, raidlist,
                                                mountlist->el[currline].
@@ -1308 +1309 @@
             newtLabelSetText(sizeComp, size_str);
         }
-        paranoid_free(size_here);
+        mr_free(size_here);
 
         /* do not let user click RAID button if user has changed device_str */
@@ -1325 +1326 @@
                                                  device);
                 if (j < 0) {
-                    asprintf(&tmp,
+                    mr_asprintf(&tmp,
                             _
                             ("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
                             mountlist->el[currline].device);
                     popup_and_OK(tmp);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                 } else {
                     log_it(_("edit_raidlist_entry - calling"));
@@ -1339 +1340 @@
         }
     }
-    paranoid_free(device_here);
-    paranoid_free(mountpoint_here);
+    mr_free(device_here);
+    mr_free(mountpoint_here);
 
     newtFormDestroy(myForm);
@@ -1352 +1353 @@
     strcpy(mountlist->el[currline].device, device_str);
     strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
-    paranoid_free(mountpoint_str);
+    mr_free(mountpoint_str);
 
     strcpy(mountlist->el[currline].format, format_str);
-    paranoid_free(format_str);
+    mr_free(format_str);
 
     if (strcmp(mountlist->el[currline].mountpoint, "image")) {
@@ -1366 +1367 @@
         }
     }
-    paranoid_free(size_str);
+    mr_free(size_str);
 
     newtListboxSetEntry(listbox, (long) keylist[currline],
@@ -1397 +1398 @@
 #endif
     redraw_mountlist(mountlist, keylist, listbox);
-    paranoid_free(device_str);
-    paranoid_free(device_used_to_be);
+    mr_free(device_str);
+    mr_free(device_used_to_be);
 }
 
@@ -1516 +1517 @@
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct vinum_volume));
-    asprintf(&title_of_editraidForm_window, _("Plexes on %s"),
+    mr_asprintf(&title_of_editraidForm_window, _("Plexes on %s"),
             raidrec->volname);
     newtPushHelpLine(_("   Please select a plex to edit"));
     newtOpenWindow(13, 5, 54, 15, title_of_editraidForm_window);
-    paranoid_free(title_of_editraidForm_window);
+    mr_free(title_of_editraidForm_window);
 
     for (;;) {
-        asprintf(&headerstr, "%-14s %-8s  %11s  %8s", _("Plex"), _("Level",) _("Stripe Size"), _("Subdisks"));
+        mr_asprintf(&headerstr, "%-14s %-8s  %11s  %8s", _("Plex"), _("Level",) _("Stripe Size"), _("Subdisks"));
 
         bOK = newtCompactButton(2, 13, _("  OK  "));
@@ -1534 +1535 @@
             newtListbox(2, 3, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
         plexesHeader = newtLabel(2, 2, headerstr);
-        paranoid_free(headerstr);
+        mr_free(headerstr);
 
         editraidForm = newtForm(NULL, NULL, 0);
@@ -1544 +1545 @@
                 switch (raidrec->plex[i].raidlevel) {
                 case -1:
-                    asprintf(&raidlevel, "concat");
+                    mr_asprintf(&raidlevel, "concat");
                     break;
                 case 0:
-                    asprintf(&raidlevel, "striped");
+                    mr_asprintf(&raidlevel, "striped");
                     break;
                 case 5:
-                    asprintf(&raidlevel, "raid5");
+                    mr_asprintf(&raidlevel, "raid5");
                     break;
                 default:
-                    asprintf(&raidlevel, "raid%i",
+                    mr_asprintf(&raidlevel, "raid%i",
                             raidrec->plex[i].raidlevel);
                     break;
@@ -1559 +1560 @@
 
                 if (raidrec->plex[i].raidlevel == -1) {
-                    asprintf(&chunksize, "N/A");
+                    mr_asprintf(&chunksize, "N/A");
                 } else {
-                    asprintf(&chunksize, "%dk", raidrec->plex[i].stripesize);
+                    mr_asprintf(&chunksize, "%dk", raidrec->plex[i].stripesize);
                 }
-                asprintf(&pname, "%s.p%i", raidrec->volname, i);
-                asprintf(&entry, "%-14s %-8s  %11s  %8d",
+                mr_asprintf(&pname, "%s.p%i", raidrec->volname, i);
+                mr_asprintf(&entry, "%-14s %-8s  %11s  %8d",
                          pname, raidlevel, chunksize,
                          raidrec->plex[i].subdisks);
-                paranoid_free(pname);
-                paranoid_free(chunksize);
-                paranoid_free(raidlevel);
+                mr_free(pname);
+                mr_free(chunksize);
+                mr_free(raidlevel);
                 newtListboxAppendEntry(plexesListbox, entry, keylist[i]);
-                paranoid_free(entry);
+                mr_free(entry);
             }
         }
@@ -1592 +1593 @@
 
         if (b_res == bDelete) {
-            asprintf(&msg, _("Are you sure you want to delete %s.p%i?"),
+            mr_asprintf(&msg, _("Are you sure you want to delete %s.p%i?"),
                     raidrec->volname, currline2);
             if (ask_me_yes_or_no(msg)) {
@@ -1601 +1602 @@
                 raidrec->plexes--;
             }
-            paranoid_free(msg);
+            mr_free(msg);
             continue;
         }
@@ -1659 +1660 @@
     memcpy((void *) bkp_raidrec, (void *) raidrec,
            sizeof(struct raid_device_record));
-    asprintf(&title_of_editraidForm_window, _("Edit %s"), raidrec->raid_device);
+    mr_asprintf(&title_of_editraidForm_window, _("Edit %s"), raidrec->raid_device);
     log_msg(2, "Opening newt window");
     newtOpenWindow(20, 5, 40, 14, title_of_editraidForm_window);
-    paranoid_free(title_of_editraidForm_window);
+    mr_free(title_of_editraidForm_window);
 
     for (;;) {
         log_msg(2, "Main loop");
-        asprintf(&sz_raid_level,
+        mr_asprintf(&sz_raid_level,
                turn_raid_level_number_to_string(raidrec->raid_level));
-        asprintf(&sz_data_disks,
+        mr_asprintf(&sz_data_disks,
                number_of_disks_as_string(raidrec->data_disks.entries,
                                          _("data")));
-        asprintf(&sz_spare_disks,
+        mr_asprintf(&sz_spare_disks,
                number_of_disks_as_string(raidrec->spare_disks.entries,
                                          _("spare")));
-        asprintf(&sz_parity_disks,
+        mr_asprintf(&sz_parity_disks,
                number_of_disks_as_string(raidrec->parity_disks.entries,
                                          _("parity")));
-        asprintf(&sz_failed_disks,
+        mr_asprintf(&sz_failed_disks,
                number_of_disks_as_string(raidrec->failed_disks.entries,
                                          _("failed")));
@@ -1685 +1686 @@
         bSelectFailed = newtButton(20, 5, sz_failed_disks);
         bChangeRaid = newtButton(1, 9, sz_raid_level);
-        paranoid_free(sz_raid_level);
-        paranoid_free(sz_data_disks);
-        paranoid_free(sz_spare_disks);
-        paranoid_free(sz_parity_disks);
-        paranoid_free(sz_failed_disks);
+        mr_free(sz_raid_level);
+        mr_free(sz_data_disks);
+        mr_free(sz_spare_disks);
+        mr_free(sz_parity_disks);
+        mr_free(sz_failed_disks);
 
         bOK = newtButton(16 + (raidrec->raid_level == -1), 9, _("  OK  "));
@@ -1735 +1736 @@
         calculate_raid_device_size(mountlist, raidlist,
                                    raidrec->raid_device);
-    paranoid_free(bkp_raidrec);
+    mr_free(bkp_raidrec);
 #endif
 }
@@ -1792 +1793 @@
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct vinum_plex));
-    asprintf(&title_of_editraidForm_window, "%s.p%i",
+    mr_asprintf(&title_of_editraidForm_window, "%s.p%i",
             raidlist->el[currline].volname, currline2);
     newtPushHelpLine
@@ -1798 +1799 @@
          ("   Please select a subdisk to edit, or edit this plex's parameters"));
     newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
-    paranoid_free(title_of_editraidForm_window);
+    mr_free(title_of_editraidForm_window);
 
     for (;;) {
         switch (raidrec->raidlevel) {
         case -1:
-            asprintf(&tmp, "concat");
+            mr_asprintf(&tmp, "concat");
             break;
         case 0:
-            asprintf(&tmp, "striped");
+            mr_asprintf(&tmp, "striped");
             break;
         case 5:
-            asprintf(&tmp, "raid5");
+            mr_asprintf(&tmp, "raid5");
             break;
         default:
-            asprintf(&tmp, _("unknown (%i)"), raidrec->raidlevel);
+            mr_asprintf(&tmp, _("unknown (%i)"), raidrec->raidlevel);
             break;
         }
         bLevel = newtCompactButton(2, 2, _(" RAID level "));
         sLevel = newtLabel(19, 2, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (raidrec->raidlevel >= 0) {
-            asprintf(&tmp, "%ik", raidrec->stripesize);
+            mr_asprintf(&tmp, "%ik", raidrec->stripesize);
             bStripeSize = newtCompactButton(2, 4, _(" Stripe size "));
         } else {
-            asprintf(&tmp, "N/A");
+            mr_asprintf(&tmp, "N/A");
             bStripeSize = newtLabel(2, 4, _("Stripe size:"));
         }
         sStripeSize = newtLabel(19, 4, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         bOK = newtCompactButton(2, 16, _("  OK  "));
@@ -1854 +1855 @@
             keylist[i] = (void *) i;
             if (i < raidrec->subdisks) {
-                asprintf(&entry, "%-17s",
+                mr_asprintf(&entry, "%-17s",
                          find_dev_entry_for_raid_device_name(raidlist,
                                                              raidrec->
@@ -1860 +1861 @@
                                                              which_device));
                 newtListboxAppendEntry(allocListbox, entry, keylist[i]);
-                paranoid_free(entry);
+                mr_free(entry);
             }
             if (i < unallocparts->entries) {
-                asprintf(&entry, "%-17s", unallocparts->el[i].device);
+                mr_asprintf(&entry, "%-17s", unallocparts->el[i].device);
                 newtListboxAppendEntry(unallocListbox, entry, keylist[i]);
-                paranoid_free(entry);
+                mr_free(entry);
             }
         }
@@ -1915 +1916 @@
             choose_raid_level(raidrec);
         } else if (b_res == bStripeSize) {
-            asprintf(&tmp, "%i", raidrec->stripesize);
+            mr_asprintf(&tmp, "%i", raidrec->stripesize);
             if (popup_and_get_string
                 (_("Stripe size"),
@@ -1921 +1922 @@
                 raidrec->stripesize = atoi(tmp);
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
         } else if ((b_res == bAlloc) || (b_res == unallocListbox)) {
             if (currline_u <= unallocparts->entries)
@@ -1969 +1970 @@
     assert(lino >= 0);
 
-    asprintf(&sz_out, raidrec->additional_vars.el[lino].value);
-    asprintf(&header, _("Edit %s"), raidrec->additional_vars.el[lino].label);
-    asprintf(&comment, _("Please set %s's value (currently '%s')"),
+    mr_asprintf(&sz_out, raidrec->additional_vars.el[lino].value);
+    mr_asprintf(&header, _("Edit %s"), raidrec->additional_vars.el[lino].label);
+    mr_asprintf(&comment, _("Please set %s's value (currently '%s')"),
             raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out)) {
-        paranoid_free(raidrec->additional_vars.el[lino].value);
+        mr_free(raidrec->additional_vars.el[lino].value);
         raidrec->additional_vars.el[lino].value = sz_out;
     }
-    paranoid_free(header);
-    paranoid_free(comment);
+    mr_free(header);
+    mr_free(comment);
 }
 #endif
@@ -2043 +2044 @@
     bCancel = newtCompactButton(i += 12, 17, _("Cancel"));
     bOK = newtCompactButton(i += 12, 17, _("  OK  "));
-    asprintf(&tmp, "%-24s %-24s %-8s  %s", _("Device"), _("Mountpoint"),
+    mr_asprintf(&tmp, "%-24s %-24s %-8s  %s", _("Device"), _("Mountpoint"),
             _("Format"), _("Size (MB)"));
     headerMsg = newtLabel(2, 1, tmp);
@@ -2064 +2065 @@
         newtLabelSetText(flawsLabelC, flaws_str_C);
 
-        paranoid_free(flaws_str_A);
-        paranoid_free(flaws_str_B);
-        paranoid_free(flaws_str_C);
+        mr_free(flaws_str_A);
+        mr_free(flaws_str_B);
+        mr_free(flaws_str_C);
 
         b_res = newtRunForm(myForm);
@@ -2196 +2197 @@
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct raid_device_record));
-    asprintf(&title_of_window, "Additional variables");
+    mr_asprintf(&title_of_window, "Additional variables");
     newtPushHelpLine
         (_
@@ -2211 +2212 @@
     bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
     newtOpenWindow(17, 7, 46, 10, title_of_window);
-    paranoid_free(title_of_window);
+    mr_free(title_of_window);
 
     myForm = newtForm(NULL, NULL, 0);
@@ -2306 +2307 @@
 #ifdef __FreeBSD__
     for (i = 0; i < raidlist->entries; i++) {
-        asprintf(&vdev, "/dev/vinum/%s", raidlist->el[i].volname);
+        mr_asprintf(&vdev, "/dev/vinum/%s", raidlist->el[i].volname);
         if (!strcmp(device, vdev)) {
-            paranoid_free(vdev);
+            mr_free(vdev);
             break;
         }
-        paranoid_free(vdev);
+        mr_free(vdev);
     }
 #else
@@ -2344 +2345 @@
     // log_it("%d - AAA - isodir_path = %s", isodir_path);
     if (isodir_device == NULL) {
-        asprintf(&isodir_device, "/dev/");
+        mr_asprintf(&isodir_device, "/dev/");
     }
     if (isodir_path == NULL) {
-        asprintf(&isodir_path, "/");
+        mr_asprintf(&isodir_path, "/");
     }
     if (does_file_exist("/tmp/NFS-SERVER-PATH")) {
-        paranoid_free(isodir_device);
+        mr_free(isodir_device);
         isodir_device = last_line_of_file("/tmp/NFS-SERVER-MOUNT");
-        asprintf(&isodir_format, "nfs");
-        paranoid_free(isodir_path);
+        mr_asprintf(&isodir_format, "nfs");
+        mr_free(isodir_path);
         isodir_path = last_line_of_file("/tmp/NFS-SERVER-PATH");
     }
@@ -2415 +2416 @@
     raidrec = &raidlist->el[pos_in_raidlist];
     initialize_raidrec(raidrec);
-    asprintf(&raidrec->OSSWAP(raid_device, volname),
+    mr_asprintf(&raidrec->OSSWAP(raid_device, volname),
            OSSWAP(device, basename(device)));
 #ifndef __FreeBSD__
@@ -2573 +2574 @@
     }
     for (i = 0; i < unallocated_raid_partitions->entries; i++) {
-        asprintf(&tmp, "%-22s %8lld",
+        mr_asprintf(&tmp, "%-22s %8lld",
                 unallocated_raid_partitions->el[i].device,
                 unallocated_raid_partitions->el[i].size / 1024);
         newtListboxAppendEntry(listbox, tmp, keylist[i]);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 }
@@ -2610 +2611 @@
     }
     for (i = 0; i < additional_vars->entries; i++) {
-        asprintf(&tmp, "%-32s %-8s", additional_vars->el[i].label,
+        mr_asprintf(&tmp, "%-32s %-8s", additional_vars->el[i].label,
                 additional_vars->el[i].value);
         newtListboxAppendEntry(listbox, tmp, keylist[i]);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 }
@@ -2683 +2684 @@
     pos = which_raid_device_is_using_this_partition(raidlist, old_dev);
     if (pos < 0) {
-        asprintf(&tmp, "No need to rejig %s in raidlist: it's not listed.",
+        mr_asprintf(&tmp, "No need to rejig %s in raidlist: it's not listed.",
                 old_dev);
         log_it(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         if ((j =
@@ -2718 +2719 @@
 #endif
         else {
-            asprintf(&tmp,
+            mr_asprintf(&tmp,
                     "%s is supposed to be listed in this raid dev but it's not...",
                     old_dev);
             log_it(tmp);
-            paranoid_free(tmp);
+            mr_free(tmp);
         }
     }
@@ -2833 +2834 @@
 
     iamhere("Post-malloc");
-    asprintf(&help_text,
+    mr_asprintf(&help_text,
            _
            ("   Edit this RAID device's list of partitions. Choose OK or Cancel when done."));
-    asprintf(&header_text, "%-24s    %s", _("Device"), _("Index"));
-    asprintf(&title_of_window, _("%s contains..."), raidrec->raid_device);
+    mr_asprintf(&header_text, "%-24s    %s", _("Device"), _("Index"));
+    mr_asprintf(&title_of_window, _("%s contains..."), raidrec->raid_device);
     newtPushHelpLine(help_text);
-    paranoid_free(help_text);
+    mr_free(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
         headerMsg = newtLabel(1, 1, header_text);
@@ -2896 +2897 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    asprintf(&tmp, _("%s's index is %d. What should it be?"),
+                    mr_asprintf(&tmp, _("%s's index is %d. What should it be?"),
                             raidrec->raid_device,
                             disklist->el[currline].index);
-                    asprintf(&sz_res, "%d", disklist->el[currline].index);
+                    mr_asprintf(&sz_res, "%d", disklist->el[currline].index);
                     if (popup_and_get_string
                         (_("Set index"), tmp, sz_res)) {
                         disklist->el[currline].index = atoi(sz_res);
                     }
-                    paranoid_free(tmp);
-                    paranoid_free(sz_res);
+                    mr_free(tmp);
+                    mr_free(sz_res);
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 }
@@ -2913 +2914 @@
         newtPopWindow();
     }
-    paranoid_free(title_of_window);
-    paranoid_free(header_text);
+    mr_free(title_of_window);
+    mr_free(header_text);
 
     newtPopHelpLine();
@@ -2925 +2926 @@
                sizeof(struct list_of_disks));
     }
-    paranoid_free(bkp_raidrec);
-    paranoid_free(bkp_disklist);
-    paranoid_free(bkp_raidlist);
-    paranoid_free(unallocated_raid_partitions);
+    mr_free(bkp_raidrec);
+    mr_free(bkp_disklist);
+    mr_free(bkp_raidlist);
+    mr_free(unallocated_raid_partitions);
 }
 #endif
@@ -2960 +2961 @@
                 (_
                  ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> "));
-            getline(&tmp, &n, stdin);
-        }
-        paranoid_free(tmp);
+            mr_getline(&tmp, &n, stdin);
+        }
+        mr_free(tmp);
         return (output);
     }

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

trunk/mondo/src/test/mktest

@@ -7 +7 @@
 
 gcc -O2 -I../common -I../lib test-conf.c ../lib/mr_conf.c ../common/libmondo-msg.c -o test-conf
-gcc -O2 -I../common -I../lib test-string.c ../lib/mr_string.c -o test-string
+gcc -O2 -I../common -I../lib test-string.c ../lib/mr_str.c -o test-string
 
 for f in "test-conf"; do

trunk/mondo/src/test/test-conf.c

@@ -9 +9 @@
 #include "my-stuff.h"
 #include "mr_conf.h"
+#include "mr_mem.h"
 
 int g_main_pid = 0;
@@ -38 +39 @@
     }
     fprintf(stdout, "String : ***%s***\n",s);
-    paranoid_free(s);
+    mr_free(s);
     mr_conf_close();
     exit(0);

trunk/mondo/src/test/test-string.c

@@ -12 +12 @@
 
 #include "my-stuff.h"
-#include "mr_string.h"
+#include "mr_str.h"
+#include "mr_mem.h"
 
 main() {
@@ -21 +22 @@
     char *string = NULL;
 
-    asprintf(&string, "%s", "md0 : active raid10 hda1[0] hda12[3] hda6[2] hda5[1]\n");
+    mr_asprintf(&string, "%s", "md0 : active raid10 hda1[0] hda12[3] hda6[2] hda5[1]\n");
     fprintf(stdout, "string=|%s|\n", string);
     token = mr_strtok(string, delims, &lastpos);
     while (lastpos > 0) {
         fprintf(stdout, "token=|%s|, lastpos=%d\n", token, lastpos);
-        paranoid_free(token);
+        mr_free(token);
         token = mr_strtok(string, delims, &lastpos);
     }
-    paranoid_free(string);
+    mr_free(string);
     exit(0);
 }

trunk/tools/build2pkg

@@ -63 +63 @@
             ar=$ARCH
         fi
-        pkg1="${TOPBUILDDIR}/RPMS/${ar}/$pv-${TAG}${suf}.${ar}.rpm"
-        #rm -f $pkg1
 
-        pkg="$pkg $pkg1"
-
-        log=$TMP/$p-rpm.log
+        log=$MONDOTMP/$p-rpm.log
 
         if [ "$dfam" = "mandriva" ] || [ "$dfam" = "suse" ]; then
@@ -87 +83 @@
             status=-1
         else
+            export pkg1="`egrep '^Wrote:' $log | grep -v debug | cut -d: -f2`"
             if [ -f /usr/bin/rpmlint ]; then
-                /usr/bin/rpmlint `egrep '^Wrote:' $log | cut -d: -f2`
+                /usr/bin/rpmlint $pkg1
             else
                 echo "No rpmlint found, please install it"
             fi
+            export pkg="$pkg `ls $pkg1 | grep -v src.rpm`"
         fi
         rm -rf ${TOPBUILDDIR}/BUILD/*
@@ -116 +114 @@
         fi
     elif [  _"$dtype" = _"deb" ]; then
-        export TMPDIR=/tmp
         cd $TOPBUILDDIR
         tar xfz $src
@@ -130 +127 @@
 echo "Packages handled : $pkg"
 
-rm -rf $TMP
+rm -rf $MONDOTMP
 
 if [ $status = 0 ]; then

trunk/tools/build2qemu

@@ -45 +45 @@
 fi
 
-mkdir -p $TMP
-cat > $TMP/mkmondo << EOF
+cat > $MONDOTMP/mkmondo << EOF
 #!/bin/bash
 
@@ -57 +56 @@
 $TOOLHOME/pkg2ftp $LAST
 EOF
-chmod 755 $TMP/mkmondo
+chmod 755 $MONDOTMP/mkmondo
 
 if [ $single -eq 0 ]; then
     $TOOLHOME/file2ftp
 fi
-cd $TOOLHOME/..
-tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
+
+# TOPDIR contains ../.. which causes problems to tar
+# so we need to recompute it
+cd $TOPDIR
+dir=`pwd`
+tar cfz $MONDOTMP/mkmondo.tar.gz $TOOLHOME $MONDOTMP/mkmondo $dir/${VER}-$TAG
 
 for m in $VMS; do
@@ -69 +72 @@
     if [ ! -f /users/qemu/$m.qemu ]; then
             echo "VM unaccessible. Verify NFS mount"
-            rm -rf $TMP
+            rm -rf $MONDOTMP
             exit -1
     fi
@@ -82 +85 @@
         sleep 300
     fi
-    scp -P $sp $TMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
+    scp -P $sp $MONDOTMP/mkmondo.tar.gz ~/.rpmmacros ~/.rpmrc bruno@localhost:
     rdate=`date "+%m%d%H%M"`
     ssh -p $sp root@localhost "date $rdate"
-    ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo " | tee $TMP/mkvm.log
-    #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $TMP/mkmondo ; rm -f $TMP" | tee $TMP/mkvm.log
+    ssh -p $sp bruno@localhost "cd / ; rm -rf ~bruno/mondo ~bruno/RPMS/BUILD/* ~bruno/RPMS/tmp/* /tmp/* ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo " | tee $MONDOTMP/mkvm.log
+    #ssh -p $sp bruno@localhost "cd / ; tar xfz ~bruno/mkmondo.tar.gz ; $MONDOTMP/mkmondo ; rm -f $MONDOTMP" | tee $MONDOTMP/mkvm.log
     if [ $vmp -eq 1 ]; then
         ssh -p $sp root@localhost "halt -p"
@@ -99 +102 @@
 
 # Should be removed at the end
-rm -rf $TMP
+rm -rf $MONDOTMP
 ) 2>&1 | tee /tmp/build2qemu.log

trunk/tools/common-env

@@ -7 +7 @@
 
 # Adapt to your needs
-export BASE=${HOME}/mondo
-export TOPDIR=${BASE}/build
+d=`dirname ${TOOLHOME}`
+if [ _"`basename ${d}/..`" = _"trunk" ]; then
+    BASE=${TOOLHOME}/../..
+else
+    BASE=${TOOLHOME}/../../..
+fi
+export TOPDIR=${BASE}/delivery
 mkdir -p ${TOPDIR}
+
 export TMPDIR=/tmp
-export TMP=`mktemp -d /tmp/mondobuild.XXXXXXXXXX`
+export MONDOTMP=`mktemp -d $TMPDIR/mondobuild.XXXXXXXXXX`
+mkdir -p $MONDOTMP
 
 umask 022

trunk/tools/distro-env

@@ -7 +7 @@
 # Input parameters : $ddir (distro name) and $dver (distro version)
 # If they do not exist then deduce from current distro
-# Exports : $dfam (distro family) $suf (pkg suffix) $dtype (distro type) BUILDDIR (dir to build packages) 
+# Exports : $dfam (distro family) $suf (pkg suffix) $dtype (distro type) TOPBUILDDIR (dir to build packages) 
 
 #
@@ -68 +68 @@
     dtype="deb"
     suf=".${dfam}${dver}"
-    BUILDDIR=${TOPDIR}/debian 
 elif [ $ddir = "gentoo" ]; then
     dfam="gentoo"
@@ -74 +73 @@
     dver1=`echo ${dver} | sed "s/\.//"`
     suf=".${ddir}${dver1}"
-    BUILDDIR=${TOPDIR}/ebuild 
 elif [ $ddir = "slackware" ]; then
     dfam="slack"
     dtype="tgz"
     suf=".${dfam}${dver}"
-    BUILDDIR=${TOPDIR}/slack 
 elif [ $ddir = "sles" -o $ddir = "suse" ]; then
     dfam="suse"
     dtype="rpm"
     suf=".${ddir}${dver}"
-    BUILDDIR=${TOPDIR}/SPECS 
 elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
     dfam="redhat"
@@ -96 +92 @@
         suf=".rhel${dver1}"
     fi
-    BUILDDIR=${TOPDIR}/SPECS 
-elif [ $ddir = "mandrake" -o $ddir = "mandriva" ]; then
+elif [ $ddir = "mandrake" ]; then
     dfam="mandriva"
     dtype="rpm"
     suf=".`echo $dver | sed 's/\.//'`mdk"
-    BUILDDIR=${TOPDIR}/SPECS 
+elif [ $ddir = "mandriva" ]; then
+    dfam="mandriva"
+    dtype="rpm"
+    suf=".`echo $dver | sed 's/\.//'`mdv"
 else
     dfam="unknown"
     dtype="unknown"
-    BUILDDIR=${TOPDIR}/SPECS 
     suf="unknown"
 fi
@@ -111 +108 @@
 export dfam
 export dtype
-export BUILDDIR
 export suf
 
@@ -117 +113 @@
 # Additional exports and preparation for some distros
 #
+
+# Default
+export TOPBUILDDIR=${TOPDIR}/../build
+
 if [ _"$dtype" = _"rpm" ]; then
     export ARCH=`rpm --showrc | egrep "^build arch" | awk '{print $4}'`
     if [ -f ${HOME}/.rpmmacros ]; then
         export TOPBUILDDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
-    else
-        export TOPBUILDDIR=${BASE}/build
     fi
     mkdir -p ${TOPBUILDDIR}/{RPMS,SRPMS,SPECS,SOURCES,BUILD}
 elif [ _"$dtype" = _"deb" ]; then
-    export TOPBUILDDIR=${BASE}/build
     mkdir -p ${TOPBUILDDIR}
 elif [ _"$dtype" = _"ebuild" ]; then
-    export TOPBUILDDIR=${BASE}/build
     mkdir -p ${TOPBUILDDIR}/portage
 fi

trunk/tools/ftp-env

@@ -7 +7 @@
 
 # BerliOS FTP/SSH setup
-export ACCOUNT=bruno@ftp.mondorescue.org
+/sbin/ifconfig | egrep -q '10\.3' 2>&1 > /dev/null
+if [ $? = 0 ]; then
+    export DESTMACH=mondo.hpintelco.org
+else
+    export DESTMACH=www.mondorescue.org
+fi
+
+export ACCOUNT=bruno@$DESTMACH
 export DSTDIR=/mondo/ftp
 export FTPSERV="ftp.berlios.de"

trunk/tools/livwww

@@ -31 +31 @@
 fi
 
-/sbin/ifconfig | egrep -q '10\.3' 2>&1 > /dev/null
-if [ $? = 0 ]; then
-    DESTMACH=mondo.hpintelco.org
-else
-    DESTMACH=www.mondorescue.org
-fi
-
 dname=`dirname $0`
 prem=`echo $dname |cut -c1`
@@ -48 +41 @@
 . $TOOLHOME/common-env
 . $TOOLHOME/svn-env
+. $TOOLHOME/ftp-env
 
-cd ${BASE}/svn
+# To be safe for SVN commands
+cd ${TOOLHOME}/..
 
 if [ $force -eq 1 ]; then
@@ -56 +51 @@
 fi
 
-svn export $optsvn ${SVNBRANCH}/website $LOCALDIR
+svn export $optsvn ${TOOLHOME}/../website $LOCALDIR
 
 if [ $force -eq 1 ]; then
@@ -63 +58 @@
 fi
 
-svn export $optsvn ${SVNBRANCH}/mondo-doc $LOCALDOC
+svn export $optsvn ${TOOLHOME}/../mondo-doc $LOCALDOC
 
 #

trunk/tools/mkannounce

@@ -32 +32 @@
 SEARCH=`echo $VER | cut -c2-`
 
-rm -f $TMP/announce.tmp
-cat > $TMP/announce.tmp << EOF
+rm -f $MONDOTMP/announce.tmp
+cat > $MONDOTMP/announce.tmp << EOF
 MondoRescue $VER is now available</p>
 
@@ -43 +43 @@
 <p>
 EOF
-ssh ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $TMP/announce.tmp
-cat >> $TMP/announce.tmp << EOF
+ssh ${ACCOUNT} "cd $DSTDIR ; find . -name 'm[oi]nd[io]-[0-9]$SEARCH*'" | grep -v 'src.rpm' >> $MONDOTMP/announce.tmp
+cat >> $MONDOTMP/announce.tmp << EOF
 </p>
 
@@ -55 +55 @@
 
 # Generating log files
-$TOOLHOME/mkchangelog.pl announce mindi $TMP/mindi.ann
-$TOOLHOME/mkchangelog.pl announce mondo $TMP/mondo.ann
-echo "<p>" >> $TMP/announce.tmp
-sed 's/$/<br>/' $TMP/mindi.ann >> $TMP/announce.tmp
-echo "</p><p>" >> $TMP/announce.tmp
-sed 's/$/<br>/' $TMP/mondo.ann >> $TMP/announce.tmp
-echo "</p>" >> $TMP/announce.tmp
-rm -f $TMP/mindi.ann $TMP/mondo.ann
+$TOOLHOME/mkchangelog.pl announce mindi $MONDOTMP/mindi.ann
+$TOOLHOME/mkchangelog.pl announce mondo $MONDOTMP/mondo.ann
+echo "<p>" >> $MONDOTMP/announce.tmp
+sed 's/$/<br>/' $MONDOTMP/mindi.ann >> $MONDOTMP/announce.tmp
+echo "</p><p>" >> $MONDOTMP/announce.tmp
+sed 's/$/<br>/' $MONDOTMP/mondo.ann >> $MONDOTMP/announce.tmp
+echo "</p>" >> $MONDOTMP/announce.tmp
+rm -f $MONDOTMP/mindi.ann $MONDOTMP/mondo.ann
 
-vi $TMP/announce.tmp
+vi $MONDOTMP/announce.tmp
 # Store it in DB for Web pages generation
-$TOOLHOME/mkannounce.pl $TMP/announce.tmp
+$TOOLHOME/mkannounce.pl $MONDOTMP/announce.tmp
 # Then deliver it on the Web
 $TOOLHOME/livwww www
-cat > $TMP/announce.hdr << EOF
+cat > $MONDOTMP/announce.hdr << EOF
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/x html1/DTD/xhtml1-strict.dtd">
 
@@ -78 +78 @@
   <p>
 EOF
-cat > $TMP/announce.ftr << EOF
+cat > $MONDOTMP/announce.ftr << EOF
 </body>
 </html>
 EOF
 # Mail it to mr ML
-cat $TMP/announce.hdr $TMP/announce.tmp $TMP/announce.ftr | w3m -dump -T text/html > $TMP/mondo.ann.txt
+cat $MONDOTMP/announce.hdr $MONDOTMP/announce.tmp $MONDOTMP/announce.ftr | w3m -dump -T text/html > $MONDOTMP/mondo.ann.txt
 export EMAIL="bruno@mondorescue.org"
-export TMPDIR=$TMP
-cat $TMP/mondo.ann.txt | mutt -s "`head -1 $TMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
-rm -rf $TMP
+cat $MONDOTMP/mondo.ann.txt | mutt -s "`head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
+rm -rf $MONDOTMP

trunk/tools/qemu-vm.txt

@@ -4 +4 @@
 
 # RPM based : urpmi, yum install, yast2
-urpmi neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo
+urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gvim/vim-X11 gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo
 
 # gentoo

trunk/tools/quality

@@ -28 +28 @@
 
 # How many sprintf/strcat/strcpy vs asprintf are they
-for s in asprintf sprintf strcat strcpy strncpy fgets malloc malloc_string MAX_STR_LEN getcwd goto; do
+for s in asprintf mr_asprintf sprintf strcat strcpy strncpy fgets malloc mr_malloc malloc_string getline mr_getline MAX_STR_LEN getcwd goto free mr_free; do
     echo "monodrescue $s usage : "
     tot=0

trunk/tools/svn-env

@@ -6 +6 @@
 #
 
-export SVNBRANCH="`cat ${TOOLHOME}/../mondo/VERSION`"
-export VER=`cat ${BASE}/svn/${SVNBRANCH}/mondo/VERSION`
+export VER=`cat ${TOOLHOME}/../mondo/VERSION`
 
 # To be safe for SVN commands

trunk/tools/svn2build

@@ -33 +33 @@
 
 # Make it safe for SVN commands
-cd ${BASE}/svn
+cd ${TOOLHOME}/..
 
 for p in $c; do
-    v=`cat ${SVNBRANCH}/$p/VERSION`
+    v=`cat ${TOOLHOME}/../$p/VERSION`
     echo "Management of $p $v-$TAG (rev $REVISION)"
-    dest="$p-$v"
+    dest="$DEST/$p-$v"
     rm -fr $dest
-    svn export ${SVNBRANCH}/$p $dest
+    svn export ${TOOLHOME}/../$p $dest
     echo "$REVISION" > $dest/REVISION
     echo "Generating SVN log file ..."
-    svn log -v ${SVNBRANCH}/$p > $dest/svn.log
+    svn log -v ${TOOLHOME}/../$p > $dest/svn.log
 
     for d in `cat ${TOOLHOME}/DISTROS`; do
@@ -51 +51 @@
         . $TOOLHOME/distro-env
 
-        # Create conf file dir
-        mkdir -p ${BUILDDIR}
-
         ddd=`LANG=C ; date '+%Y-%m-%d'`
-        cat > $TMP/mondorescue.mc << EOF
+        cat > $MONDOTMP/mondorescue.mc << EOF
 define(\`TTT', ${TAG})dnl
 define(\`RRR', ${TAG}${suf})dnl
@@ -74 +71 @@
             echo "Using $inc customization to build SPEC file"
 
-            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
+            $TOOLHOME/mkchangelog.pl $dtype $p $MONDOTMP/$p.spec
             if [ $? -ne 0 ]; then
                 echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
-            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $TMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
+            m4 $MONDOTMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec $MONDOTMP/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
-            rm -f $TMP/$p.spec
+            rm -f $MONDOTMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
-            m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
+            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
         elif [ "$dtype" = "deb" ]; then
-            # To be developped
-            #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
             cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver
-            m4 $TMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
+            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$ddir/rules > $dest/distributions/${ddir}-$dver/rules
             $TOOLHOME/mkchangelog.pl $dtype $p $dest/distributions/${ddir}-$dver/changelog
             if [ $? -ne 0 ]; then
@@ -99 +94 @@
     done
 
+    # The rest is done there
+    cd $DEST
     if [ _"`echo $p | grep mondo-doc`" != _"" ]; then
         cd $dest
         for f in mondorescue-howto.sgml *8; do
-            m4 $TMP/mondorescue.mc $f > ${f}.new
+            m4 $MONDOTMP/mondorescue.mc $f > ${f}.new
             mv ${f}.new $f
         done
@@ -117 +114 @@
 
     if [ _"`echo $p | grep -vE 'kernel|busybox' | grep mindi`" != _"" ]; then
-        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
+        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
             exit -1
         fi
-        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$dest)
+        (cd mondo-doc-$v1 ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v)
         rm -f $dest/rootfs/sbin/parted2fdisk-ia64 
     fi
     if [ "`echo $p | grep -v doc | grep  mondo`" != "" ]; then
-        v1=`cat ${SVNBRANCH}/mondo-doc/VERSION`
+        v1=`cat ${TOOLHOME}/../mondo-doc/VERSION`
         if [ ! -d mondo-doc-$v1 ]; then
             echo "mondo-doc should be created before $p"
             exit -1
         fi
-        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$dest/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$dest/docs/man)
+        (cd mondo-doc-$v1 ; make -f Makefile.howto install INSTALLDIR=../$p-$v/docs/en ; make -f Makefile.man install-$p INSTALLDIR=../$p-$v/docs/man)
         (cd $dest ; echo "Bootstraping mondo ... " ; ./bootstrap)
     fi
@@ -137 +134 @@
     # Finally creates the tar files
     echo -n "Creating $p tar files (gzip... "
-    tar cfphz ${DEST}/$p-$v.tar.gz $dest
+    tar cfphz ${DEST}/$p-$v.tar.gz $p-$v
     echo -n " bzip2..."
-    tar cfphj ${DEST}/$p-$v.tar.bz2 $dest
+    tar cfphj ${DEST}/$p-$v.tar.bz2 $p-$v
     echo " )"
 done
 
-rm -rf $TMP
+rm -rf $MONDOTMP
 
 echo "Version delivered :"