Changeset 3191 in MondoRescue

Timestamp:

Sep 25, 2013, 8:55:45 AM (6 years ago)

Author:

Bruno Cornec

Message:

• Lots of memory management backports from 3.1 to 3.2 - still not finished, nor working ATM. the common subdir was done during travel, so this is essentially a backup !

Location:

branches/3.2

Files:

• mindi/mindi (modified) (5 diffs)
• mondo/src/common/libmondo-archive.c (modified) (127 diffs)
• mondo/src/common/libmondo-cli.c (modified) (39 diffs)
• mondo/src/common/libmondo-devices-EXT.h (modified) (2 diffs)
• mondo/src/common/libmondo-devices.c (modified) (112 diffs)
• mondo/src/common/libmondo-fifo.c (modified) (3 diffs)
• mondo/src/common/libmondo-filelist.c (modified) (55 diffs)
• mondo/src/common/libmondo-files-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-files.c (modified) (48 diffs)
• mondo/src/common/libmondo-files.h (modified) (1 diff)
• mondo/src/common/libmondo-fork.c (modified) (32 diffs)
• mondo/src/common/libmondo-gui-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-gui.c (modified) (1 diff)
• mondo/src/common/libmondo-gui.h (modified) (1 diff)
• mondo/src/common/libmondo-mountlist.c (modified) (30 diffs)
• mondo/src/common/libmondo-raid.c (modified) (21 diffs)
• mondo/src/common/libmondo-stream.c (modified) (42 diffs)
• mondo/src/common/libmondo-string.c (modified) (20 diffs)
• mondo/src/common/libmondo-tools.c (modified) (57 diffs)
• mondo/src/common/libmondo-verify.c (modified) (52 diffs)
• mondo/src/common/mondostructures.h (modified) (6 diffs)
• mondo/src/common/newt-specific.c (modified) (88 diffs)
• mondo/src/include/my-stuff.h (modified) (2 diffs)
• mondo/src/lib/mr_err.c (modified) (2 diffs)

branches/3.2/mindi/mindi

@@ -376 +376 @@
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share/kbd     # Slackware
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/lib/kbd
+    [ ! -e "$KEYDIR" ] && KEYDIR=/lib/kbd
     [ ! -e "$KEYDIR" ] && KEYDIR=/usr/share
     [ ! -e "$KEYDIR" ] && KEYDIR=/etc/condole
@@ -423 +424 @@
         LogFile "INFO: Gentoo-style config detected."
         keyfile=/etc/conf.d/keymaps
+    elif [ -e "/etc/X11/xorg.conf.d/00-keyboard.conf" ] ; then
+        LogFile "INFO: X11-style config detected."
+        keyfile=/etc/X11/xorg.conf.d/00-keyboard.conf
     else
         LogFile "Searching for rc.config ..."
@@ -442 +446 @@
     [ ! "$locale" ] && locale=`grep '.map$' "$keyfile" | sed 's/^.* //'`        # Slackware
     [ ! "$locale" ] && locale=`grep -E '^KEYMAP=' "$keyfile" | grep -v '^#' | tr -d '"' |cut -d'=' -f2`     # Gentoo & ArchLinux
+    [ ! "$locale" ] && locale=`grep -E 'XkbLayout' "$keyfile" | grep -v '^#' | awk '{print $3}' | tr -d '"'`        #  Fedora 19
     LogFile "INFO: locale=$locale"
     #
@@ -707 +712 @@
     local lcMagicExt2fs="EXT2-fs: blocksize too small for device."
     local lcMagicExt3fs="<3>EXT3-fs: blocksize too small for journal device."
-    local lcMagicInitfs="<6>checking if image is initramfs...|<6>Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
+    local lcMagicInitfs="<6>checking if image is initramfs...|[<]6[>]Unpacking initramfs...|<6>Trying to unpack rootfs image as initramfs"
 
     # local variables
@@ -2351 +2356 @@
         if [ "$?" -eq "0" ] ; then
             # Used by ia64
-            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
+            fkern_ver=`gzip -cd $fname | strings 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
         else
-            fkern_ver=`strings $fname 2> /dev/null | grep -E '[2-9]+[.][0-9]+[.][0-9]+[^\@]*@'`
+            fkern_ver=`strings $fname 2> /dev/null | grep "[2-9]+*[.][0-9]+*[.][0-9]+*[^\@]*@"`
         fi
         echo "$fkern_ver"

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -64 +64 @@
 extern bool g_cd_recovery;
 extern char *g_mondo_home;
-/*
-extern char *g_tmpfs_mountpt;
-*/
-extern char *g_serial_string;
+
+/**
+ * The serial string (used to differentiate between backups) of the current backup.
+ */
+char *g_serial_string = NULL;
+
 extern char *g_getfacl;
 extern char *g_getfattr;
@@ -200 +202 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist", filelist);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
         return (1);
     }
@@ -208 +208 @@
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
     paranoid_free(tmp);
 
-    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s",
-            filelist, fname);
+    mr_asprintf(command, "star H=exustar list=%s -c -sparse " STAR_ACL_SZ " file=%s", filelist, fname);
     if (bkpinfo->use_lzo) {
+        mr_free(command);
         fatal_error("Can't use lzop");
     }
@@ -235 +235 @@
             res = 0;
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (res) {
@@ -251 +251 @@
         }
     }
-    paranoid_free(command);
+    mr_free(command);
 
     retval += res;
@@ -307 +307 @@
 
     if (!does_file_exist(filelist)) {
-        mr_asprintf(tmp, "(archive_this_fileset) - filelist %s does not exist",
-                filelist);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("(archive_this_fileset) - filelist %s does not exist", filelist);
         return (1);
     }
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(tmp);
         fatal_error("Unable to write tarball to scratchdir");
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
 
@@ -324 +321 @@
         mr_asprintf(tmp, "%s/do-not-compress-these", g_mondo_home);
         //       -b %ld, TAPE_BLOCK_SIZE
-        mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe,
-                bkpinfo->compression_level);
+        mr_asprintf(zipparams, "-Z -P %s -G %d -T 3k", bkpinfo->zip_exe, bkpinfo->compression_level);
         if (does_file_exist(tmp)) {
             mr_strcat(zipparams, " -E %s",tmp);
@@ -331 +327 @@
             log_msg(3, "%s not found. Cannot exclude zipfiles, etc.", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         mr_asprintf(zipparams, "");
     }
-
-//  make_hole_for_file(fname);
 
     if (!does_file_exist(bkpinfo->tmpdir)) {
@@ -346 +340 @@
         fatal_error("scratchdir not found");
     }
-    mr_asprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname,
-            fname, bkpinfo->zip_suffix);
+    mr_asprintf(command, "rm -f %s %s. %s.gz %s.%s", fname, fname, fname, fname, bkpinfo->zip_suffix);
     paranoid_system(command);
-    paranoid_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);
+    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);
+    mr_free(zipparams);
 
     mr_asprintf(tmp, "echo hi > %s 2> /dev/null", fname);
     if (system(tmp)) {
-        paranoid_free(tmp);
+        mr_free(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++) {
@@ -406 +398 @@
 {
     int retval = 0, res = 0;
-    char *tmp;
+    char *tmp = NULL;
 
     assert(bkpinfo != NULL);
     set_g_cdrom_and_g_dvd_to_bkpinfo_value();
-    malloc_string(tmp);
     if (bkpinfo->backup_media_type == dvd) {
 #ifdef DVDRWFORMAT
@@ -431 +422 @@
     }
 
-/*
-      sprintf(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"); }
-*/
-    sprintf(tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
+    mr_asprintf(tmp, "gzip -9 %s/archives/filelist.full", bkpinfo->scratchdir);
     if (run_program_and_log_output(tmp, 2)) {
+        mr_free(tmp);
         fatal_error("Failed to gzip filelist.full");
     }
-    sprintf(tmp, "cp -f %s/archives/*list*.gz %s", bkpinfo->scratchdir,
-            bkpinfo->tmpdir);
+    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)) {
+        mr_free(tmp);
         fatal_error("Failed to copy to tmpdir");
     }
+    mr_free(tmp);
 
     copy_mondo_and_mindi_stuff_to_scratchdir(); // payload, too, if it exists
@@ -464 +454 @@
     }
     retval += do_that_initial_phase();  // prepare
-    sprintf(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);
+    mr_free(tmp);
+
     retval += make_those_afios_phase(); // backup regular files
     retval += make_those_slices_phase();    // backup BIG files
@@ -473 +465 @@
         sleep(2);
     }
-    paranoid_free(tmp);
     return (retval);
 }
@@ -514 +505 @@
     char *use_lzo_sz = NULL;
     char *use_gzip_sz = NULL;
+    char *use_lzma_sz = NULL;
     char *use_comp_sz = NULL;
     char *use_star_sz = NULL;
@@ -542 +534 @@
     assert(bkpinfo != NULL);
 
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Calling MINDI to create boot+data disks");
+    mvaddstr_and_log_it(g_currentY, 0, "Calling MINDI to create boot+data disks");
     open_evalcall_form("Calling MINDI to create boot+data disks");
     mr_asprintf(tmp, "%s/filelist.full", bkpinfo->tmpdir);
@@ -550 +541 @@
         mr_asprintf(tmp, "%s/tmpfs/filelist.full", bkpinfo->tmpdir);
         if (!does_file_exist(tmp)) {
-            fatal_error
-                ("Cannot find filelist.full, so I cannot count its lines");
+            mr_free(tmp);
+            fatal_error ("Cannot find filelist.full, so I cannot count its lines");
         }
     }
@@ -571 +562 @@
             }
         }
-        paranoid_free(ntapedev);
+        mr_free(ntapedev);
         mr_asprintf(tape_device, "%s", bkpinfo->media_device);
     } else {
@@ -586 +577 @@
     } else {
         mr_asprintf(use_gzip_sz, "no");
+    }
+    if (bkpinfo->use_lzma) {
+        mr_asprintf(use_lzma_sz, "yes");
+    } else {
+        mr_asprintf(use_lzma_sz, "no");
     }
     if (bkpinfo->use_star) {
@@ -660 +656 @@
             ch = 'U';
         if (bkpinfo->boot_loader != '\0') {
-            mr_asprintf(tmp, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
-            log_msg(2, tmp);
-            mr_free(tmp);
+            log_msg(2, "User specified boot loader. It is '%c'.", bkpinfo->boot_loader);
         } else {
             bkpinfo->boot_loader = ch;
         }
         if (bkpinfo->boot_device[0] != '\0') {
-            mr_asprintf(tmp, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
-            log_msg(2, tmp);
-            mr_free(tmp);
+            log_msg(2, "User specified boot device. It is '%s'.", bkpinfo->boot_device);
         } else {
             strcpy(bkpinfo->boot_device, bootdev);
@@ -692 +684 @@
         mr_asprintf(bootldr_str, "LILO");
         if (!does_file_exist("/etc/lilo.conf")) {
-            fatal_error
-                ("The de facto standard location for your boot loader's config file is /etc/lilo.conf but I cannot find it there. What is wrong with your Linux distribution?");
+            fatal_error("The de facto standard location for your boot loader's config file is /etc/lilo.conf but I cannot find it there. What is wrong with your Linux distribution?");
         }
     } else if (bkpinfo->boot_loader == 'G') {
         mr_asprintf(bootldr_str, "GRUB");
-        if (!does_file_exist("/boot/grub/menu.lst")
-            && does_file_exist("/boot/grub/grub.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
+        if (!does_file_exist("/boot/grub/menu.lst") && does_file_exist("/boot/grub/grub.conf")) {
+            run_program_and_log_output("ln -sf /boot/grub/grub.conf /boot/grub/menu.lst", 5);
         }
         if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
-            fatal_error
-                ("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
+            fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
         }
         mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version"));
@@ -710 +698 @@
         mr_asprintf(bootldr_str, "ELILO");
         /* BCO: fix it for Debian, Mandrake, ... */
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf",
-                 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf",
-                 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf",
-                 5);
-        }
-        if (!does_file_exist("/etc/elilo.conf")
-            && does_file_exist("/boot/efi/debian/elilo.conf")) {
-            run_program_and_log_output
-                ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf",
-                 5);
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/redhat/elilo.conf")) {
+            run_program_and_log_output("ln -sf /boot/efi/efi/redhat/elilo.conf /etc/elilo.conf", 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/SuSE/elilo.conf")) {
+            run_program_and_log_output("ln -sf /boot/efi/efi/SuSE/elilo.conf /etc/elilo.conf", 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/efi/debian/elilo.conf")) {
+            run_program_and_log_output ("ln -sf /boot/efi/efi/debian/elilo.conf /etc/elilo.conf", 5);
+        }
+        if (!does_file_exist("/etc/elilo.conf") && does_file_exist("/boot/efi/debian/elilo.conf")) {
+            run_program_and_log_output ("ln -sf /boot/efi/debian/elilo.conf /etc/elilo.conf", 5);
         }
         if (!does_file_exist("/etc/elilo.conf")) {
-            fatal_error
-                ("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
+            fatal_error("The de facto mondo standard location for your boot loader's config file is /etc/elilo.conf but I cannot find it there. What is wrong with your Linux distribution? Try finding it under /boot/efi and do 'ln -s /boot/efi/..../elilo.conf /etc/elilo.conf'");
         }
     } else if (bkpinfo->boot_loader == 'R') {
@@ -753 +728 @@
         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);
-    mr_free(tmp);
+    log_to_screen("Your boot loader is %s and it boots from %s", bootldr_str, bkpinfo->boot_device);
+
     if (bootldr_ver != NULL) {
-        mr_asprintf(tmp, "Boot loader version string: %s", bootldr_ver);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("Boot loader version string: %s", bootldr_ver);
     }
 
@@ -799 +771 @@
         fatal_error("Unknown backup_media_type");
     }
-    if (bkpinfo->backup_media_type == usb) {
+
+    if ((bkpinfo->backup_media_type == usb) && (bkpinfo->media_device)) {
         mr_asprintf(tmp2, "--usb %s", bkpinfo->media_device);
     } else {
@@ -808 +781 @@
     if (write_one_liner_data_file(tmp, value)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner backup-media-type",
-                __LINE__);
+        log_msg(1, "%ld: Unable to write one-liner backup-media-type", __LINE__);
     }
     mr_free(value);
@@ -817 +789 @@
     if (write_one_liner_data_file(tmp, bootldr_str)) {
         res++;
-        log_msg(1, "%ld: Unable to write one-liner bootloader.name",
-                __LINE__);
+        log_msg(1, "%ld: Unable to write one-liner bootloader.name", __LINE__);
     }
     mr_free(bootldr_str);
@@ -865 +836 @@
     }
 
-    estimated_total_noof_slices =
-        size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
-    /* add netfs stuff here? */
+    estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+
+    /* TODO: add netfs stuff here? */
     mr_asprintf(command, "mkdir -p %s/images", bkpinfo->scratchdir);
     if (system(command)) {
@@ -873 +844 @@
         log_OS_error("Unable to make images directory");
     }
-    paranoid_free(command);
+    mr_free(command);
     log_msg(1, "lines_in_filelist = %ld", lines_in_filelist);
     update_evalcall_form(3);
@@ -890 +861 @@
             use_lzo_sz,         // parameter #8
             cd_recovery_sz,     // parameter #9
-            bkpinfo->image_devs,    // parameter #10
+            (bkpinfo->image_devs == NULL) ? "\"\"" : bkpinfo->image_devs,   // parameter #10
             broken_bios_sz,     // parameter #11
             last_filelist_number,   // parameter #12 (STRING)
@@ -900 +871 @@
             bkpinfo->internal_tape_block_size,  // parameter #18 (LONG)
             bkpinfo->differential,  // parameter #19 (INT)
-            use_gzip_sz);       // parameter #20 (STRING)
+            use_gzip_sz,        // parameter #19 (STRING)
+            use_lzma_sz,        // parameter #20 (STRING)
+            value,              // parameter #21 (STRING)
+            MONDO_LOGFILE);
 
     mr_free(last_filelist_number);
@@ -906 +880 @@
     mr_free(use_lzo_sz);
     mr_free(use_gzip_sz);
+    mr_free(use_lzma_sz);
     mr_free(use_star_sz);
     mr_free(use_comp_sz);
@@ -913 +888 @@
     mr_free(tape_size_sz);
 
+    /* This parameter is always the last one and optional */
     if (bkpinfo->nonbootable_backup) {
         mr_strcat(command, " NONBOOTABLE");
@@ -929 +905 @@
     if (!res) {
         log_to_screen("Boot+data disks were created OK");
-        mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso",
-                bkpinfo->scratchdir, MINDI_CACHE);
+        mr_asprintf(command, "cp -f %s/images/mindi.iso %s/mondorescue.iso", bkpinfo->scratchdir, MINDI_CACHE);
         log_msg(2, command);
         run_program_and_log_output(command, FALSE);
-        paranoid_free(command);
+        mr_free(command);
 
         if (bkpinfo->nonbootable_backup) {
-            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images",
-                    bkpinfo->tmpdir, bkpinfo->scratchdir);
+            mr_asprintf(command, "cp -f %s/all.tar.gz %s/images", bkpinfo->tmpdir, bkpinfo->scratchdir);
             if (system(command)) {
-                paranoid_free(command);
+                mr_free(command);
                 fatal_error("Unable to create temporary all tarball");
             }
-            paranoid_free(command);
+            mr_free(command);
         }
         /* For USB we already have everything on the key */
@@ -948 +922 @@
             mr_asprintf(command, "rm -rf %s/images", bkpinfo->scratchdir);
             run_program_and_log_output(command, FALSE);
-            paranoid_free(command);
+            mr_free(command);
         } else {
-            mr_asprintf(tmp, "cp -f %s/images/all.tar.gz %s", bkpinfo->scratchdir,
-                bkpinfo->tmpdir);
+            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");
@@ -966 +939 @@
         mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
 
         if (strlen(tmp) > 1) {
@@ -1017 +990 @@
 void *create_afio_files_in_background(void *inbuf)
 {
-    long int archiving_set_no;
-    char *archiving_filelist_fname;
-    char *archiving_afioball_fname;
+    long int archiving_set_no = 0L;
+    char *archiving_filelist_fname = NULL;
+    char *archiving_afioball_fname = NULL;
     char *curr_xattr_list_fname = NULL;
-    char *curr_acl_list_fname;
-
-    char *tmp;
+    char *curr_acl_list_fname = NULL;
+
+    char *tmp = NULL;
     int res = 0, retval = 0;
     int *p_archival_threads_running;
@@ -1031 +1004 @@
     int this_thread_no = g_current_thread_no++;
 
-    malloc_string(curr_xattr_list_fname);
-    malloc_string(curr_acl_list_fname);
-    malloc_string(archiving_filelist_fname);
-    malloc_string(archiving_afioball_fname);
-    malloc_string(tmp);
     p_last_set_archived = (int *) inbuf;
     p_archival_threads_running = (int *) (inbuf + 4);
@@ -1041 +1009 @@
     p_list_of_fileset_flags = (char *) (inbuf + 12);
 
-    sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-            bkpinfo->tmpdir, 0L);
-    for (archiving_set_no = 0L; does_file_exist(archiving_filelist_fname);
-         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                 bkpinfo->tmpdir, archiving_set_no)) {
+    mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
+
+    while (does_file_exist(archiving_filelist_fname)) {
         if (g_exiting) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Execution run aborted (pthread)");
         }
         if (archiving_set_no >= MAX_NOOF_SETS_HERE) {
-            fatal_error
-                ("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
+            mr_free(archiving_filelist_fname);
+            fatal_error("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
         }
         if (!semaphore_p()) {
             log_msg(3, "P sem failed (pid=%d)", (int) getpid());
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1062 +1030 @@
         *p_next_set_to_archive = *p_next_set_to_archive + 1;
         if (!semaphore_v()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
 
         /* backup this set of files */
-        sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
-        sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+        mr_asprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
+        mr_free(archiving_filelist_fname);
+        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
-            log_msg(3,
-                    "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
-                    FORTY_SPACES, getpid(), this_thread_no,
-                    archiving_set_no);
+            log_msg(3, "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
+            mr_free(archiving_afioball_fname);
             break;
         }
 
-        sprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir,
-                archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
+        mr_asprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
-                    getpid(), this_thread_no);
+            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES, getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
@@ -1088 +1052 @@
             log_msg(4, "[%d] - continuing", getpid());
         }
-
-        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
+        mr_free(tmp);
+
+        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
+
         if (g_getfattr) {
-            sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
             get_fattr_list(archiving_filelist_fname, curr_xattr_list_fname);
+            mr_free(curr_xattr_list_fname);
         }
         if (g_getfacl) {
-            sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                bkpinfo->tmpdir, archiving_set_no);
+            mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
             get_acl_list(archiving_filelist_fname, curr_acl_list_fname);
-        }
-
-        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
-        res =
-            archive_this_fileset(archiving_filelist_fname,
-                                 archiving_afioball_fname,
-                                 archiving_set_no);
+            mr_free(curr_acl_list_fname);
+        }
+
+        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
+        res = archive_this_fileset(archiving_filelist_fname, archiving_afioball_fname, archiving_set_no);
+        mr_free(archiving_afioball_fname);
+
         retval += res;
 
         if (res) {
-            sprintf(tmp,
-                    "Errors occurred while archiving set %ld. Please review logs.",
-                    archiving_set_no);
-            log_to_screen(tmp);
-        }
+            log_to_screen("Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
+        }
+
         if (!semaphore_p()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1127 +1089 @@
 
         if (!semaphore_v()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
-        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
+        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(), this_thread_no, archiving_set_no);
         archiving_set_no++;
-    }
+
+        mr_free(archiving_filelist_fname);
+        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+    }
+    mr_free(archiving_filelist_fname);
+
     if (!semaphore_p()) {
         fatal_error("Cannot get semaphore P");
@@ -1140 +1107 @@
         fatal_error("Cannot get semaphore V");
     }
-    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
-            this_thread_no);
-    paranoid_free(archiving_filelist_fname);
-    paranoid_free(archiving_afioball_fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
-    paranoid_free(tmp);
+    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(), this_thread_no);
     pthread_exit(NULL);
 }
@@ -1228 +1189 @@
 
     /*@ buffers *********************************** */
-    char *command, *tmpfile, *data_disks_file;
+    char *command = NULL;
+    char *tmpfile = NULL;
+    char *data_disks_file = NULL;
 
     assert(bkpinfo != NULL);
-    malloc_string(command);
-    malloc_string(tmpfile);
-    malloc_string(data_disks_file);
-    sprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
-
-    snprintf(g_serial_string, MAX_STR_LEN - 8, "%s",
-             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"));
+    mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
+
+    snprintf(g_serial_string, MAX_STR_LEN - 8, "%s", 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"));
     strip_spaces(g_serial_string);
     strcat(g_serial_string, "...word.");
@@ -1245 +1202 @@
     assert(strlen(g_serial_string) < MAX_STR_LEN);
 
-    sprintf(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__);
     }
+    mr_free(tmpfile);
 
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to archive your data");
@@ -1269 +1227 @@
         }
     }
-
-    sprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir,
-            bkpinfo->netfs_remote_dir, bkpinfo->prefix);
+    mr_free(data_disks_file);
+
+    mr_asprintf(command, "rm -f %s/%s/%s-[1-9]*.iso", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix);
     paranoid_system(command);
+    mr_free(command);
+
     wipe_archives(bkpinfo->scratchdir);
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -1281 +1241 @@
                                      BLK_START_OF_BACKUP);
     }
-    paranoid_free(command);
-    paranoid_free(tmpfile);
-    paranoid_free(data_disks_file);
     return (retval);
 }
@@ -1356 +1313 @@
 
     /*@ buffers ********************************************** */
-    char *storing_filelist_fname;
-    char *storing_afioball_fname;
+    char *storing_filelist_fname = NULL;
+    char *storing_afioball_fname = NULL;
     char *tmp = NULL;
     char *media_usage_comment = NULL;
@@ -1374 +1331 @@
     assert(bkpinfo != NULL);
     malloc_string(result_str);
-    malloc_string(curr_xattr_list_fname);
-    malloc_string(curr_acl_list_fname);
-    malloc_string(storing_filelist_fname);
-    malloc_string(storing_afioball_fname);
-    transfer_block =
-        malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
-    memset((void *) transfer_block, 0,
-           sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    transfer_block = malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    memset((void *) transfer_block, 0, sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     p_last_set_archived = (int *) transfer_block;
     p_archival_threads_running = (int *) (transfer_block + 4);
     p_next_set_to_archive = (int *) (transfer_block + 8);
     p_list_of_fileset_flags = (char *) (transfer_block + 12);
-    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET),
-           (void *) bkpinfo, sizeof(struct s_bkpinfo));
+    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET), (void *) bkpinfo, sizeof(struct s_bkpinfo));
     pvp = &vp;
     vp = (void *) result_str;
@@ -1399 +1349 @@
                        "Please wait. This may take a couple of hours.",
                        "Working...",
-                       get_last_filelist_number() + 1);
+                       (long)get_last_filelist_number() + 1L);
 
     log_msg(5, "We're gonna party like it's your birthday.");
@@ -1438 +1388 @@
             if (!get_bit_N_of_array
                 (p_list_of_fileset_flags, storing_set_no)) {
-            misc_counter_that_is_not_important =
-                (misc_counter_that_is_not_important + 1) % 5;
+            misc_counter_that_is_not_important = (misc_counter_that_is_not_important + 1) % 5;
             /* BCO the media_usage_comment is not really initialized there !
             if (!misc_counter_that_is_not_important) {
@@ -1446 +1395 @@
             */
             sleep(1);
-            } else
+            } else {
                 // store set N
-            {
-                sprintf(storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
-                sprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
+                mr_asprintf(storing_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
+                mr_asprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
                 if (g_getfattr) {
-                    sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
                 if (g_getfacl) {
-                    sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                        bkpinfo->tmpdir, storing_set_no);
+                    mr_asprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, storing_set_no);
                 }
 
@@ -1470 +1414 @@
                     sleep(5);
                 }
-                mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
                 /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
                 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
                     register_in_tape_catalog(fileset, storing_set_no, -1,
                                          storing_afioball_fname);
-                    maintain_collection_of_recent_archives(bkpinfo->tmpdir,
-                                                       storing_afioball_fname);
+                    maintain_collection_of_recent_archives(bkpinfo->tmpdir, storing_afioball_fname);
                     log_it("Writing EXAT files");
                     res +=
@@ -1510 +1452 @@
                 retval += res;
                 g_current_progress++;
+                mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
                 update_progress_form(media_usage_comment);
                 mr_free(media_usage_comment);
                 if (res) {
-                    mr_asprintf(tmp, "Failed to add archive %ld's files to CD dir\n",
-                        storing_set_no);
-                    log_to_screen(tmp);
-                    paranoid_free(tmp);
-                    fatal_error
-                        ("Is your hard disk full? If not, please send the author the logfile.");
+                    log_to_screen("Failed to add archive %ld's files to CD dir\n", storing_set_no);
+                    fatal_error("Is your hard disk full? If not, please send the author the logfile.");
                 }
                 storing_set_no++;
                 //      sleep(2);
+                if (g_getfacl) {
+                    mr_free(curr_acl_list_fname);
+                }
+                if (g_getfattr) {
+                    mr_free(curr_xattr_list_fname);
+                }
+                mr_free(storing_filelist_fname);
+                mr_free(storing_afioball_fname);
         }
     }
@@ -1540 +1487 @@
     }
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     paranoid_free(transfer_block);
     paranoid_free(result_str);
-    paranoid_free(storing_filelist_fname);
-    paranoid_free(storing_afioball_fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
     return (retval);
 }
@@ -1598 +1541 @@
     mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
     if (chdir(bkpinfo->scratchdir)) {
         // FIXME
@@ -1608 +1551 @@
     log_msg(1, message_to_screen);
 
-    mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
+    if (bkpinfo->media_device) {
+        mr_asprintf(tmp1, "%s1", bkpinfo->media_device);
+    } else {
+        mr_asprintf(tmp1, "");
+    }
     if (is_this_device_mounted(tmp1)) {
         log_msg(1, "USB device mounted. Remounting it at the right place");
         mr_asprintf(tmp, "umount %s", tmp1);
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
-    }
-    paranoid_free(tmp1);
+        mr_free(tmp);
+    }
+    mr_free(tmp1);
 
     log_msg(1, "Mounting USB device.");
@@ -1621 +1568 @@
     mr_asprintf(tmp, "mkdir -p %s", tmp1);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
+
 
     /* Mindi always create one single parition on the USB dev */
     mr_asprintf(tmp, "mount %s1 %s", bkpinfo->media_device, tmp1);
     run_program_and_log_output(tmp, FALSE);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (bkpinfo->nonbootable_backup) {
@@ -1642 +1590 @@
         }
         log_to_screen(result_sz);
-        paranoid_free(result_sz);
-        paranoid_free(tmp);
+        mr_free(result_sz);
+        mr_free(tmp);
         retval += res;
 
@@ -1649 +1597 @@
         mr_asprintf(tmp,"mkdir %s/archive", bkpinfo->scratchdir); 
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
     paranoid_free(message_to_screen);
@@ -1657 +1605 @@
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, FALSE);
-        paranoid_free(tmp);
+        mr_free(tmp);
     }
 
@@ -1695 +1643 @@
 
     /*@ buffers ****************************************** */
-    char *tmp;
+    char *tmp = NULL;
+    char *tmp2 = NULL;
     char *old_pwd;
     char *result_sz = NULL;
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
-    char *fnam;
-    char *tmp2;
-    char *tmp3;
+    char *fnam = NULL;
+    char *tmp3 = NULL;
     char *isofs_cmd = NULL;
     char *full_isofs_cmd = NULL;
@@ -1710 +1658 @@
     malloc_string(old_pwd);
     malloc_string(fnam);
-    tmp = malloc(1200);
-    tmp2 = malloc(1200);
-    tmp3 = malloc(1200);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
 
-    sprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
-    sprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
+    /* Copy the files needed by isolinux in the right dir */
+    mr_asprintf(tmp, "%s/isolinux.bin", bkpinfo->scratchdir);
+    mr_asprintf(tmp2, "%s/isolinux.bin", bkpinfo->tmpdir);
     if (does_file_exist(tmp)) {
-        sprintf(tmp3, "cp -f %s %s", tmp, tmp2);
+        mr_asprintf(tmp3, "cp -f %s %s", tmp, tmp2);
         paranoid_system(tmp3);
+        mr_free(tmp3);
     }
     if (!does_file_exist(tmp) && does_file_exist(tmp2)) {
-        sprintf(tmp3, "cp -f %s %s", tmp2, tmp);
+        mr_asprintf(tmp3, "cp -f %s %s", tmp2, tmp);
         paranoid_system(tmp3);
-    }
-    free(tmp2);
-    free(tmp3);
-    tmp2 = NULL;
-    tmp3 = NULL;
+        mr_free(tmp3);
+    }
+    mr_free(tmp2);
+    mr_free(tmp3);
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
         popup_and_OK("Please insert new media and press Enter.");
     }
 
-    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s",
-            bkpinfo->scratchdir, destfile);
+    log_msg(2, "make_iso_fs --- scratchdir=%s --- destfile=%s", bkpinfo->scratchdir, destfile);
     tmp2 = getcwd(old_pwd, MAX_STR_LEN - 1);
-    sprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
+    if (! tmp2) {
+        //FIXME
+    }
+    mr_asprintf(tmp, "chmod 700 %s", bkpinfo->scratchdir);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     if (chdir(bkpinfo->scratchdir)) {
         // FIXME
@@ -1744 +1694 @@
 
     if (bkpinfo->call_before_iso[0] != '\0') {
-        mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d",
-                g_current_media_number);
-        res =
-            eval_call_to_make_ISO(bkpinfo->call_before_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        mr_asprintf(message_to_screen, "Running pre-ISO call for CD#%d", g_current_media_number);
+        res = eval_call_to_make_ISO(bkpinfo->call_before_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -1763 +1709 @@
     if (bkpinfo->call_make_iso[0] != '\0') {
         log_msg(2, "bkpinfo->call_make_iso = %s", bkpinfo->call_make_iso);
-        sprintf(tmp, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         mr_asprintf(message_to_screen, "Making an ISO (%s #%d)", mds, g_current_media_number);
@@ -1774 +1719 @@
         } else {
             res =
-                eval_call_to_make_ISO(bkpinfo->call_make_iso,
-                                      bkpinfo->scratchdir,
-                                      g_current_media_number,
-                                      MONDO_LOGFILE, message_to_screen);
+                eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
             if (res) {
                 log_to_screen("%s...failed to write", message_to_screen);
             } else {
                 log_to_screen("%s...OK", message_to_screen);
-                sprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
+                mr_asprintf(tmp, "tail -n10 %s | grep -F ':-('", MONDO_LOGFILE);
                 if (!run_program_and_log_output(tmp, 1)) {
                     log_to_screen
                         ("Despite nonfatal errors, growisofs confirms the write was successful.");
                 }
+                mr_free(tmp);
             }
             retval += res;
 #ifdef DVDRWFORMAT
-            sprintf(tmp,
-                    "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'",
-                    MONDO_LOGFILE);
+            mr_asprintf(tmp, "tail -n8 %s | grep 'blank=full.*dvd-compat.*DAO'", MONDO_LOGFILE);
             if (g_backup_media_type == dvd
                 && (res || !run_program_and_log_output(tmp, 1))) {
@@ -1800 +1741 @@
                 /* reset error counter before trying to blank DVD */
                 retval -= res;
-                paranoid_system("sync");
+                sync();
                 pause_for_N_seconds(5, "Letting DVD drive settle");
 
@@ -1810 +1751 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
+                if (bkpinfo->media_device) {
+                    mr_asprintf(sz_blank_disk, "dvd+rw-format -force %s", bkpinfo->media_device);
+                } else {
+                    mr_asprintf(sz_blank_disk, "dvd+rw-format");
+                }
                 log_msg(3, "sz_blank_disk = '%s'", sz_blank_disk);
-                res =
-                    run_external_binary_with_percentage_indicator_NEW
-                    ("Blanking DVD disk", sz_blank_disk);
+                res = run_external_binary_with_percentage_indicator_NEW("Blanking DVD disk", sz_blank_disk);
                 if (res) {
-                    log_to_screen
-                        ("Warning - format failed. (Was it a DVD-R?) Sleeping for 5 seconds to take a breath...");
-                    pause_for_N_seconds(5,
-                                        "Letting DVD drive settle... and trying again.");
-                    res =
-                        run_external_binary_with_percentage_indicator_NEW
-                        ("Blanking DVD disk", sz_blank_disk);
+                    log_to_screen("Warning - format failed. (Was it a DVD-R?) Sleeping for 5 seconds to take a breath...");
+                    pause_for_N_seconds(5, "Letting DVD drive settle... and trying again.");
+                    res = run_external_binary_with_percentage_indicator_NEW("Blanking DVD disk", sz_blank_disk);
                     if (res) {
                         log_to_screen("Format failed a second time.");
@@ -1838 +1777 @@
                 }
                 pause_for_N_seconds(5, "Letting DVD drive settle");
-                res =
-                    eval_call_to_make_ISO(bkpinfo->call_make_iso,
-                                          bkpinfo->scratchdir,
-                                          g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                res = eval_call_to_make_ISO(bkpinfo->call_make_iso, bkpinfo->scratchdir, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 retval += res;
                 if (!bkpinfo->please_dont_eject) {
@@ -1856 +1790 @@
                 }
             }
+            mr_free(tmp);
 #endif
             if (g_backup_media_type == dvd && !bkpinfo->please_dont_eject) {
@@ -1876 +1811 @@
             log_msg(1, "Making nonbootable backup");
             mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
-            res = eval_call_to_make_ISO(full_isofs_cmd,
-                                      destfile, g_current_media_number,
-                                      MONDO_LOGFILE, message_to_screen);
+            res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
             mr_free(full_isofs_cmd);
         } else {
@@ -1888 +1821 @@
 
 
-            log_msg(1, "make_cd_use_lilo is actually %d",
-                    bkpinfo->make_cd_use_lilo);
+            log_msg(1, "make_cd_use_lilo is actually %d", bkpinfo->make_cd_use_lilo);
             if (bkpinfo->make_cd_use_lilo) {
                 log_msg(1, "make_cd_use_lilo = TRUE");
@@ -1895 +1827 @@
                 log_msg(1, "IA64 --> elilo");
                 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_ELILO);
-                res = eval_call_to_make_ISO(full_isofs_cmd,
-                                            destfile,
-                                            g_current_media_number,
-                                            MONDO_LOGFILE,
-                                            message_to_screen);
+                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 mr_free(full_isofs_cmd);
 #else
                 log_msg(1, "Non-ia64 --> lilo");
                 mr_asprintf(full_isofs_cmd, "%s%s-b images/mindi-bootroot.2880.img -c boot.cat -o '_ISO_' -J -V _CD#_ .",isofs_cmd,MONDO_MKISOFS);
-                res =
-                    // FIXME: fixed boot size probably wrong. lilo to be removed
-                    eval_call_to_make_ISO(full_isofs_cmd,
-                                          destfile, g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                // FIXME: fixed boot size probably wrong. lilo to be removed
+                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 mr_free(full_isofs_cmd);
 #endif
@@ -1916 +1840 @@
                 log_msg(1, "Isolinux");
                 mr_asprintf(full_isofs_cmd, "%s%s-o '_ISO_' -V _CD#_ .",isofs_cmd,MONDO_MKISOFS_REGULAR_SYSLINUX);
-                res =
-                    eval_call_to_make_ISO(full_isofs_cmd,
-                                          destfile, g_current_media_number,
-                                          MONDO_LOGFILE,
-                                          message_to_screen);
+                res = eval_call_to_make_ISO(full_isofs_cmd, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
                 mr_free(full_isofs_cmd);
             }
@@ -1940 +1860 @@
         || bkpinfo->backup_media_type == cdrw) {
         if (is_this_device_mounted(bkpinfo->media_device)) {
-            log_msg(2,
-                    "Warning - %s mounted. I'm unmounting it before I burn to it.",
-                    bkpinfo->media_device);
-            sprintf(tmp, "umount %s", bkpinfo->media_device);
+            log_msg(2, "Warning - %s mounted. I'm unmounting it before I burn to it.", bkpinfo->media_device);
+            mr_asprintf(tmp, "umount %s", bkpinfo->media_device);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
     }
@@ -1954 +1873 @@
         mr_free(mds);
         pause_and_ask_for_cdr(2, &cd_is_mountable);
-        res =
-            eval_call_to_make_ISO(bkpinfo->call_burn_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        res = eval_call_to_make_ISO(bkpinfo->call_burn_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -1973 +1889 @@
         mr_asprintf(message_to_screen, "Running post-ISO call (%s #%d)", mds, g_current_media_number);
         mr_free(mds);
-        res =
-            eval_call_to_make_ISO(bkpinfo->call_after_iso,
-                                  destfile, g_current_media_number,
-                                  MONDO_LOGFILE, message_to_screen);
+        res = eval_call_to_make_ISO(bkpinfo->call_after_iso, destfile, g_current_media_number, MONDO_LOGFILE, message_to_screen);
         if (res) {
             mr_strcat(message_to_screen, "...failed");
@@ -2044 +1957 @@
 
     /*@ pointers ******************************************* */
-    FILE *fin;
+    FILE *fin = NULL;
     char *p;
     char *q;
@@ -2050 +1963 @@
     /*@ buffers ******************************************** */
     char *tmp = NULL;
-    char *bigfile_fname;
+    char *bigfile_fname = NULL;
     char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
@@ -2086 +1999 @@
     log_to_screen(tmp);
     noof_biggie_files = count_lines_in_file(biggielist_fname);
-    open_progress_form("Backing up big files", tmp,
-                       "Please wait. This may take some time.", "",
-                       estimated_total_noof_slices);
-    paranoid_free(tmp);
+    open_progress_form("Backing up big files", tmp, "Please wait. This may take some time.", "", estimated_total_noof_slices);
+    mr_free(tmp);
 
     if (!(fin = fopen(biggielist_fname, "r"))) {
@@ -2121 +2032 @@
             log_msg(2, "bigfile_fname = %s", bigfile_fname);
             use_ntfsprog = FALSE;
-            if (!strncmp(bigfile_fname, "/dev/", 5)
-                && is_dev_an_NTFS_dev(bigfile_fname)) {
+            if (!strncmp(bigfile_fname, "/dev/", 5) && is_dev_an_NTFS_dev(bigfile_fname)) {
                 use_ntfsprog = TRUE;
-                log_msg(2,
-                        "Calling ntfsclone in background because %s is an NTFS partition",
-                        bigfile_fname);
-                mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir,
-                        (int) (random() % 32768),
-                        (int) (random() % 32768));
+                log_msg(2, "Calling ntfsclone in background because %s is an NTFS partition", bigfile_fname);
+                mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
                 mkfifo(sz_devfile, 0x770);
                 ntfsprog_fifo = sz_devfile;
@@ -2137 +2043 @@
                     fatal_error("Fork failure");
                 case 0:
-                    log_msg(2,
-                            "CHILD - fip - calling feed_into_ntfsprog(%s, %s)",
-                            bigfile_fname, sz_devfile);
+                    log_msg(2, "CHILD - fip - calling feed_into_ntfsprog(%s, %s)", bigfile_fname, sz_devfile);
                     res = feed_into_ntfsprog(bigfile_fname, sz_devfile);
                     /* BCO/BERLIOS Does the child need to unalocate memory as well ?
-                    paranoid_free(bigfile_fname);
+                    mr_free(bigfile_fname);
                     mr_free(sz_devfile);
                     */
@@ -2148 +2052 @@
                     break;
                 default:
-                    log_msg(2,
-                            "feed_into_ntfsprog() called in background --- pid=%ld",
-                            (long int) (pid));
+                    log_msg(2, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
                 }
             }
@@ -2160 +2062 @@
             // Whether partition or biggiefile, just do your thang :-)
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream(biggie_fsize, bigfile_fname,
-                                             use_ntfsprog ?
-                                             BLK_START_A_PIHBIGGIE :
-                                             BLK_START_A_NORMBIGGIE);
-            }
-            res =
-                slice_up_file_etc(bigfile_fname,
-                                  ntfsprog_fifo, biggie_file_number,
-                                  noof_biggie_files, use_ntfsprog);
+                write_header_block_to_stream(biggie_fsize, bigfile_fname, use_ntfsprog ?  BLK_START_A_PIHBIGGIE : BLK_START_A_NORMBIGGIE);
+            }
+            res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
 
             /* Free it here as ntfsprog_fifo is not used anymore */
@@ -2197 +2093 @@
             }
         }
-#ifndef _XWIN
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
             newtRefresh();
         }
-#endif
-        paranoid_free(tmp);
-    }
+        mr_free(tmp);
+    }
+    mr_free(bigfile_fname);
+
     log_msg(1, "Finished backing up bigfiles");
     log_msg(1, "estimated slices = %ld; actual slices = %ld",
@@ -2210 +2106 @@
     close_progress_form();
     paranoid_fclose(fin);
-    paranoid_free(bigfile_fname);
     return (retval);
 }
@@ -2271 +2166 @@
         retval += res;
         if (res) {
-            mr_asprintf(tmp, "Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
-            log_to_screen(tmp);
-            mr_free(tmp);
-        }
-
-        mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
+            log_to_screen("Errors occurred while archiving set %ld. Perhaps your live filesystem changed?", curr_set_no);
+        }
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -2319 +2210 @@
         retval += res;
         g_current_progress++;
+
+        mr_asprintf(media_usage_comment, "%s", percent_media_full_comment());
         update_progress_form(media_usage_comment);
         mr_free(media_usage_comment);
 
         if (res) {
-            mr_asprintf(tmp, "Failed to add archive %ld's files to CD dir\n", curr_set_no);
-            log_to_screen(tmp);
-            mr_free(tmp);
-            fatal_error
-                ("Is your hard disk is full? If not, please send the author the logfile.");
+            log_to_screen("Failed to add archive %ld's files to CD dir\n", curr_set_no);
+            fatal_error("Is your hard disk is full? If not, please send the author the logfile.");
         }
         mr_free(curr_filelist_fname);
@@ -2428 +2318 @@
     }
 
-    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir,
-            biggielist);
+    mr_asprintf(command, "cp %s/biggielist.txt %s", bkpinfo->tmpdir, biggielist);
     paranoid_system(command);
     mr_free(command);
@@ -2443 +2332 @@
     if (g_getfattr) {
         get_fattr_list(biggielist, xattr_fname);
-        mr_asprintf(command, "cp %s %s/archives/", xattr_fname,
-            bkpinfo->scratchdir);
+        mr_asprintf(command, "cp %s %s/archives/", xattr_fname, bkpinfo->scratchdir);
         paranoid_system(command);
         mr_free(command);
@@ -2733 +2621 @@
     /*@ buffers ********************************************* */
     char *tmp = NULL;
-    char *cdrom_dev;
-    char *cdrw_dev;
+    char *cdrom_dev = NULL;
+    char *cdrw_dev = NULL;
     char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
@@ -2740 +2628 @@
     int attempt_to_mount_returned_this = 999;
     char *mtpt = NULL;
-    char *szcdno;
-    char *szserfname;
-    char *szunmount;
+    char *szcdno = NULL;
+    char *szserfname = NULL;
+    char *szunmount = NULL;
     char *mds = NULL;
 
     malloc_string(cdrom_dev);
     malloc_string(cdrw_dev);
-    malloc_string(szcdno);
-    malloc_string(szserfname);
-    malloc_string(szunmount);
-    malloc_string(mtpt);
 
     mds = media_descriptor_string(g_backup_media_type);
-    mr_asprintf(tmp, "I am about to burn %s #%d", mds, g_current_media_number);
+    log_to_screen("I am about to burn %s #%d", mds, g_current_media_number);
     mr_free(mds);
-    log_to_screen(tmp);
-    mr_free(tmp);
     if (g_current_media_number < ask_for_one_if_more_than_this) {
         return;
     }
     log_to_screen("Scanning CD-ROM drive...");
-    sprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
+    mr_asprintf(mtpt, "%s/cd.mtpt", bkpinfo->tmpdir);
     make_hole_for_dir(mtpt);
 
@@ -2767 +2649 @@
     ok_go_ahead_burn_it = TRUE;
     if (!find_cdrom_device(cdrom_dev, FALSE)) {
-/* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
-      log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
-      retract_CD_tray_and_defeat_autorun();
-*/
+        /* When enabled, it made CD eject-and-retract when wrong CD inserted.. Weird
+        log_msg(2, "paafcd: Retracting CD-ROM drive if possible" );
+        retract_CD_tray_and_defeat_autorun();
+        */
         mr_asprintf(tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
-        sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
-        sprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
-        sprintf(szunmount, "umount %s", mtpt);
+        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;
         mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
@@ -2781 +2663 @@
         attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
         mr_free(tmp);
+
         if (attempt_to_mount_returned_this) {
             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.");
-            /*
-               if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE))
-               {
-               ok_go_ahead_burn_it = FALSE;
-               log_to_screen("There isn't a writable CD/DVD in the drive.");
-               }
-               else
-               {
-               log_to_screen("Confirmed. There is a blank CD/DVD in the drive.");
-               }
-             */
-        } else if (!does_file_exist(szcdno)
-                   || !does_file_exist(szserfname)) {
+        } else if (!does_file_exist(szcdno) || !does_file_exist(szserfname)) {
             mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen
-                ("%s has data on it but it's probably not a Mondo CD.", mds);
+            log_to_screen("%s has data on it but it's probably not a Mondo CD.", mds);
             mr_free(mds);
         } else {
@@ -2809 +2679 @@
             mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
-            mr_asprintf(our_serial_str, "%s",
-                   call_program_and_get_last_line_of_output(tmp));
+            mr_asprintf(our_serial_str, "%s", call_program_and_get_last_line_of_output(tmp));
             mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
         }
+        mr_free(szcdno);
+        mr_free(szserfname);
+
         run_program_and_log_output(szunmount, 1);
+        mr_free(szunmount);
+
         log_msg(2, "paafcd: cd_number = %d", cd_number);
-        log_msg(2, "our serial str = %s; g_serial_string = %s",
-                our_serial_str, g_serial_string);
+        log_msg(2, "our serial str = %s; g_serial_string = %s", our_serial_str, g_serial_string);
         if (cd_number > 0 && !strcmp(our_serial_str, g_serial_string)) {
             mds = media_descriptor_string(g_backup_media_type);
@@ -2849 +2722 @@
         }
         mds = media_descriptor_string(g_backup_media_type);
-        mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", 
-                mds, g_current_media_number, mds);
+        mr_asprintf(tmp, "I am about to burn %s #%d of the backup set. Please insert %s and press Enter.", mds, g_current_media_number, mds);
         mr_free(mds);
 
@@ -2861 +2733 @@
 
     mds = media_descriptor_string(g_backup_media_type);
-    log_msg(2,
-            "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
+    log_msg(2, "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
 
     log_to_screen("Proceeding w/ %s in drive.", mds);
@@ -2869 +2740 @@
     paranoid_free(cdrom_dev);
     paranoid_free(cdrw_dev);
-    paranoid_free(mtpt);
-    paranoid_free(szcdno);
-    paranoid_free(szserfname);
-    paranoid_free(szunmount);
+    mr_free(mtpt);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -2882 +2750 @@
 
 }
-
-
-
-
-
-
 
 
@@ -2917 +2779 @@
 
 /* @} - end of utilityGroup */
-
-
-
-
-
-
 
 
@@ -2945 +2801 @@
  */
 int
-slice_up_file_etc(char *biggie_filename,
-                  char *ntfsprog_fifo, long biggie_file_number,
-                  long noof_biggie_files, bool use_ntfsprog)
-{
+slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
 
     /*@ buffers ************************************************** */
     char *tmp = NULL;
-    char *checksum_line, *command;
-    char *tempblock;
+    char *checksum_line = NULL;
+    char *command = NULL;
+    char *tempblock = NULL;
     char *curr_slice_fname_uncompressed = NULL;
     char *curr_slice_fname_compressed = NULL;
     char *file_to_archive = NULL;
-    char *file_to_openin;
+    char *file_to_openin = NULL;
     /*@ pointers ************************************************** */
-    char *pB;
-    FILE *fin = NULL, *fout = NULL;
+    char *pB = NULL;
+    FILE *fin = NULL;
+    FILE *fout = NULL;
 
     /*@ bool ****************************************************** */
@@ -2966 +2821 @@
 
     /*@ long ****************************************************** */
-    size_t blksize = 0;
-    long slice_num = 0;
-    long i;
-    long optimal_set_size;
-    bool should_I_compress_slices;
+    size_t blksize = (size_t)0;
+    long slice_num = 0L;
+    long i = 0L;
+    bool should_I_compress_slices = TRUE;
     char *suffix = NULL;                // for compressed slices
 
@@ -2983 +2837 @@
     /*@ structures ************************************************** */
     struct s_filename_and_lstat_info biggiestruct;
-//  struct stat statbuf;
 
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(biggie_filename);
-    malloc_string(checksum_line);
 
     biggiestruct.for_backward_compatibility = '\n';
     biggiestruct.use_ntfsprog = use_ntfsprog;
-    optimal_set_size = bkpinfo->optimal_set_size;
-    if (is_this_file_compressed(biggie_filename)
-        || bkpinfo->compression_level == 0) {
+    if (is_this_file_compressed(biggie_filename) || bkpinfo->compression_level == 0) {
         mr_asprintf(suffix, "%s", "");
-        //      log_it("%s is indeed compressed :-)", filename);
         should_I_compress_slices = FALSE;
     } else {
@@ -3002 +2851 @@
     }
 
-    if (optimal_set_size < 999) {
+    if (bkpinfo->optimal_set_size < 999L) {
         fatal_error("bkpinfo->optimal_set_size is insanely small");
     }
+
     if (ntfsprog_fifo) {
         file_to_openin = ntfsprog_fifo;
-        strcpy(checksum_line, "IGNORE");
-        log_msg(2,
-                "Not calculating checksum for %s: it would take too long",
-                biggie_filename);
+        mr_asprintf(checksum_line, "IGNORE");
+        log_msg(2, "Not calculating checksum for %s: it would take too long", biggie_filename);
         if ( !find_home_of_exe("ntfsresize")) {
             fatal_error("ntfsresize not found");
@@ -3020 +2868 @@
         log_it("res of it = %s", tmp); 
         totallength = (off_t)atoll(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else {
         file_to_openin = biggie_filename;
@@ -3034 +2882 @@
         }
         mr_free(command);
-        tmp = fgets(checksum_line, MAX_STR_LEN, fin);
+        mr_getline(checksum_line, fin);
         pclose(fin);
         totallength = length_of_file (biggie_filename);
@@ -3048 +2896 @@
     }
     strcpy(biggiestruct.checksum, checksum_line);
+    mr_free(checksum_line);
 
     mr_asprintf(tmp, "%s", slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
@@ -3053 +2902 @@
     if (fout == NULL) {
         log_msg(1, "Unable to open and write to %s\n", tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         mr_free(suffix);
         return (1);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     res = fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
@@ -3063 +2912 @@
         paranoid_fclose(fout);
     }
-    log_msg(1, "Opening in %s; slicing it and writing to CD/tape",
-            file_to_openin);
+    log_msg(1, "Opening in %s; slicing it and writing to CD/tape", file_to_openin);
     if (!(fin = fopen(file_to_openin, "r"))) {
         log_OS_error("Unable to openin biggie_filename");
-        mr_asprintf(tmp, "Cannot archive bigfile '%s': not found", biggie_filename);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
-
-        paranoid_free(checksum_line);
+        log_to_screen("Cannot archive bigfile '%s': not found", biggie_filename);
+
         mr_free(suffix);
         return (1);
@@ -3094 +2939 @@
         mr_asprintf(tmp, "%s", percent_media_full_comment());
         update_progress_form(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {
@@ -3101 +2946 @@
             return (1);
         }
-        if ((i == bkpinfo->optimal_set_size / 256)
-            && (totalread < 1.1 * totallength)) {
-            for (i = 0; i < bkpinfo->optimal_set_size / 256; i++) {
+        if ((i == bkpinfo->optimal_set_size / 256) && (totalread < 1.1 * totallength)) {
+            for (i = 0L; i < bkpinfo->optimal_set_size / 256; i++) {
                 blksize = fread(tempblock, 1, 256 * 1024, fin);
                 if (blksize > 0) {
@@ -3112 +2956 @@
                 }
             }
+            mr_free(tempblock);
         } else {
-            i = 0;
+            i = 0L;
         }
         paranoid_fclose(fout);
-        if (i > 0)              // length_of_file (curr_slice_fname_uncompressed)
+        if (i > 0L)             // length_of_file (curr_slice_fname_uncompressed)
         {
             if (!does_file_exist(curr_slice_fname_uncompressed)) {
-                log_msg(2,
-                        "Warning - '%s' doesn't exist. How can I compress slice?",
-                        curr_slice_fname_uncompressed);
+                log_msg(2, "Warning - '%s' doesn't exist. How can I compress slice?", curr_slice_fname_uncompressed);
             }
             if (should_I_compress_slices && bkpinfo->compression_level > 0) {
@@ -3141 +2984 @@
                 log_msg(2, "Failed to compress the slice");
             }
-            if (bkpinfo->use_lzo
-                && strcmp(curr_slice_fname_compressed,
-                          curr_slice_fname_uncompressed)) {
+            if (bkpinfo->use_lzo && strcmp(curr_slice_fname_compressed, curr_slice_fname_uncompressed)) {
                 unlink(curr_slice_fname_uncompressed);
             }
@@ -3149 +2990 @@
                 mr_asprintf(tmp, "Problem with slice # %ld", slice_num);
             } else {
-                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1,
-                        slice_num);
-            }
-#ifndef _XWIN
+                mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
+            }
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -3159 +2998 @@
                 log_msg(2, tmp);
             }
-#else
-            log_msg(2, tmp);
-#endif
-            paranoid_free(tmp);
+            mr_free(tmp);
 
             mr_asprintf(file_to_archive, "%s", curr_slice_fname_compressed);
@@ -3178 +3014 @@
 
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-            register_in_tape_catalog(biggieslice, biggie_file_number,
-                                     slice_num, file_to_archive);
-            maintain_collection_of_recent_archives(bkpinfo->tmpdir,
-                                                   file_to_archive);
+            register_in_tape_catalog(biggieslice, biggie_file_number, slice_num, file_to_archive);
+            maintain_collection_of_recent_archives(bkpinfo->tmpdir, file_to_archive);
             res = move_files_to_stream(file_to_archive, NULL);
         } else {
@@ -3190 +3024 @@
         retval += res;
         if (res) {
-            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);
-            fatal_error
-                ("Hard disk full. You should have bought a bigger one.");
-        }
-    }
-    mr_free(tempblock);
+            log_to_screen("Failed to add slice %ld of bigfile %ld to scratchdir", slice_num, biggie_file_number + 1);
+            fatal_error("Hard disk full. You should have bought a bigger one.");
+        }
+    }
     mr_free(suffix);
     paranoid_fclose(fin);
@@ -3207 +3037 @@
     }
     log_msg(1, tmp);
-    paranoid_free(tmp);
-
-    paranoid_free(checksum_line);
+    mr_free(tmp);
+
     return (retval);
 }
@@ -3288 +3117 @@
     log_msg(2, tmp);
     center_string(tmp, 80);
-#ifndef _XWIN
     if (!g_text_mode) {
         newtPushHelpLine(tmp);
     }
-#endif
     res = write_iso_and_go_on(TRUE);
-#ifndef _XWIN
     if (!g_text_mode) {
         newtPopHelpLine();
     }
-#endif
     log_msg(2, "Returning from writing final ISO (res=%d)", res);
     paranoid_free(tmp);
@@ -3327 +3152 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
-    char *cdno_fname;
-    char *lastcd_fname;
-    char *isofile;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *cdno_fname = NULL;
+    char *lastcd_fname = NULL;
+    char *isofile = NULL;
     char *mds = NULL;
 
@@ -3341 +3167 @@
 
     malloc_string(tmp);
-    malloc_string(cdno_fname);
-    malloc_string(lastcd_fname);
-    malloc_string(isofile);
 
     assert(bkpinfo != NULL);
@@ -3357 +3180 @@
     /* label the ISO with its number */
 
-    sprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
+    mr_asprintf(cdno_fname, "%s/archives/THIS-CD-NUMBER", bkpinfo->scratchdir);
     fout = fopen(cdno_fname, "w");
+    mr_free(cdno_fname);
+
     fprintf(fout, "%d", g_current_media_number);
     paranoid_fclose(fout);
 
-    sprintf(tmp, "cp -f %s/autorun %s/", g_mondo_home,
-            bkpinfo->scratchdir);
-    if (run_program_and_log_output(tmp, FALSE)) {
+    mr_asprintf(tmp1, "cp -f %s/autorun %s/", g_mondo_home, bkpinfo->scratchdir);
+    if (run_program_and_log_output(tmp1, FALSE)) {
         log_msg(2, "Warning - unable to copy autorun to scratchdir");
     }
+    mr_free(tmp1);
 
     /* last CD or not? Label accordingly */
-    sprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
+    mr_asprintf(lastcd_fname, "%s/archives/NOT-THE-LAST", bkpinfo->scratchdir);
     if (last_cd) {
         unlink(lastcd_fname);
@@ -3380 +3205 @@
         paranoid_fclose(fout);
     }
+    mr_free(lastcd_fname);
+
     if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) {
-        sprintf(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);
-        log_to_screen(tmp);
-    }
-    sprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
+        log_to_screen("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);
+    }
+    mr_asprintf(isofile, "%s/%s/%s-%d.iso", bkpinfo->isodir,
             bkpinfo->netfs_remote_dir, bkpinfo->prefix,
             g_current_media_number);
@@ -3402 +3225 @@
             {
                 log_msg(3, "*Sigh* Mike, I hate your computer.");
+                // if it can't be found then force pausing
                 bkpinfo->manual_cd_tray = TRUE;
-            }                   // if it can't be found then force pausing
-            else {
+            } else {
                 log_msg(3, "Great. Found Mike's CD-ROM drive.");
             }
@@ -3410 +3233 @@
         if (bkpinfo->verify_data && !res) {
             mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen
-                ("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
+            log_to_screen("Please reboot from the 1st %s in Compare Mode, as a precaution.", mds);
             mr_free(mds);
             if (chdir("/")) {
@@ -3428 +3250 @@
         } else {
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            sprintf(tmp, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
+            mr_asprintf(tmp1, "Failed to create %s #%d. Retry?", mds, g_current_media_number);
             mr_free(mds);
-            res = ask_me_yes_or_no(tmp);
+            res = ask_me_yes_or_no(tmp1);
+            mr_free(tmp1);
+
             if (!res) {
                 if (ask_me_yes_or_no("Abort the backup?")) {
@@ -3443 +3267 @@
         }
     }
+    mr_free(isofile);
+
     g_current_media_number++;
     wipe_archives(bkpinfo->scratchdir);
-    sprintf(tmp, "rm -Rf %s/images/*gz %s/images/*data*img",
-            bkpinfo->scratchdir, bkpinfo->scratchdir);
-    if (system(tmp)) {
-        log_msg
-            (2,
-             "Error occurred when I tried to delete the redundant IMGs and GZs");
-    }
+    mr_asprintf(tmp1, "rm -Rf %s/images/*gz %s/images/*data*img", bkpinfo->scratchdir, bkpinfo->scratchdir);
+    if (system(tmp1)) {
+        log_msg(2, "Error occurred when I tried to delete the redundant IMGs and GZs");
+    }
+    mr_free(tmp1);
 
     if (last_cd) {
@@ -3461 +3285 @@
     bkpinfo->verify_data = orig_vfy_flag_val;
     paranoid_free(tmp);
-    paranoid_free(cdno_fname);
-    paranoid_free(lastcd_fname);
-    paranoid_free(isofile);
     return (0);
 }
@@ -3532 +3353 @@
             if (res) {
                 mds = media_descriptor_string(bkpinfo->backup_media_type);
-                mr_asprintf(tmp, "Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
+                log_to_screen("Warnings/errors were reported while checking %s #%d", mds, g_current_media_number);
                 mr_free(mds);
-                log_to_screen(tmp);
-                mr_free(tmp);
 
             }

branches/3.2/mondo/src/common/libmondo-cli.c

@@ -97 +97 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(tmp, "-%c %s", i, flag_val[i]);
-            log_msg(3, tmp);
-            mr_free(tmp);
+            log_msg(3, "-%c %s", i, flag_val[i]);
         }
     }
@@ -150 +148 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+    char *tmp2 = NULL;
     char *psz = NULL;
     char *p = NULL;
@@ -208 +207 @@
             log_msg(1, "Using star instead of afio");
         } else {
-            fatal_error
-                ("Neither afio nor star is installed. Please install at least one.");
+            fatal_error("Neither afio nor star is installed. Please install at least one.");
         }
     }
@@ -219 +217 @@
         }
         if (!find_home_of_exe("star")) {
-            fatal_error
-                ("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
+            fatal_error("Please install 'star' RPM or tarball if you are going to use -R. Thanks.");
         }
     }
@@ -234 +231 @@
 
     if (flag_set['I']) {
-        if (bkpinfo->include_paths[0] == '-') {
+        if (bkpinfo->include_paths && bkpinfo->include_paths[0] == '-') {
             retval++;
             log_to_screen("Please supply a sensible value with '-I'\n");
@@ -268 +265 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
         mr_make_devlist_from_pathlist(flag_val['I'], 'I');
         log_msg(4, "Finished with the -I option");
     }
 
-    if (g_kernel_version >= 2.6 && !flag_set['d']
-        && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
-        fatal_error
-            ("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
+    if (g_kernel_version >= 2.6 && !flag_set['d'] && (flag_set['c'] || flag_set['w']) && (! bkpinfo->restore_data)) {
+        fatal_error("If you are using the 2.6.x kernel, please specify the CD-R(W) device.");
     }
 
@@ -283 +278 @@
         if (flag_set['I']) {
             retval++;
-            log_to_screen
-                ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
+            log_to_screen("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
         }
         bkpinfo->make_filelist = FALSE;
-        strcpy(bkpinfo->include_paths, flag_val['J']);
+        mr_asprintf(bkpinfo->include_paths, "%s", flag_val['J']);
     }
 
     if ((flag_set['c'] || flag_set['w'] || flag_set['C'] || flag_set['r']) && (! bkpinfo->restore_data)) {
-        if (!flag_set['r'] && g_kernel_version <= 2.5
-            && strstr(flag_val['d'], "/dev/")) {
-            fatal_error
-                ("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
-        }
-        if (flag_set['r'] && g_kernel_version <= 2.5
-            && !strstr(flag_val['d'], "/dev/")) {
-            fatal_error
-                ("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
+        if (!flag_set['r'] && g_kernel_version <= 2.5 && strstr(flag_val['d'], "/dev/")) {
+            fatal_error("Please don't give a /dev entry. Give a SCSI node for the parameter of the -d flag.");
+        }
+        if (flag_set['r'] && g_kernel_version <= 2.5 && !strstr(flag_val['d'], "/dev/")) {
+            fatal_error("Please give a /dev entry, not a SCSI node, as the parameter of the -d flag.");
         }
         if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
-            log_to_screen
-                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
-        }
-
-        if (system("which cdrecord > /dev/null 2> /dev/null")
-            && system("which dvdrecord > /dev/null 2> /dev/null")) {
-            fatal_error
-                ("Please install dvdrecord/cdrecord and try again.");
+            log_to_screen("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
+        }
+
+        if (system("which cdrecord > /dev/null 2> /dev/null") && system("which dvdrecord > /dev/null 2> /dev/null")) {
+            fatal_error("Please install dvdrecord/cdrecord and try again.");
         }
         if (flag_set['C']) {
             bkpinfo->cdrw_speed = atoi(flag_val['C']);
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
+                fatal_error("You specified a silly speed for a CD-R[W] drive");
             }
             if (!flag_set['L']) {
-                log_to_screen
-                    ("You must use -L with -C. Therefore I am setting it for you.");
+                log_to_screen("You must use -L with -C. Therefore I am setting it for you.");
                 flag_set['L'] = 1;
                 flag_val['L'][0] = '\0';
@@ -326 +311 @@
             log_msg(3, "flag_val['c'] = %s", flag_val['c']);
             log_msg(3, "flag_val['w'] = %s", flag_val['w']);
-//    log_msg(3, "flag_set['r'] = %i", flag_set['r'] );
             if (flag_set['c']) {
                 bkpinfo->cdrw_speed = atoi(flag_val['c']);
@@ -336 +320 @@
 
             if (bkpinfo->cdrw_speed < 1) {
-                fatal_error
-                    ("You specified a silly speed for a CD-R[W] drive");
+                fatal_error("You specified a silly speed for a CD-R[W] drive");
             }
         }
@@ -345 +328 @@
         log_it("Hmm! No tape drive specified. Let's see what we can do.");
         if (find_tape_device_and_size(flag_val['d'], tmp)) {
-            fatal_error
-                ("Tape device not specified. I couldn't find it either.");
+            fatal_error("Tape device not specified. I couldn't find it either.");
         }
         flag_set['d'] = TRUE;
-        sprintf(tmp,
-                "You didn't specify a tape streamer device. I'm assuming %s",
-                flag_val['d']);
-        log_to_screen(tmp);
+        log_to_screen("You didn't specify a tape streamer device. I'm assuming %s", flag_val['d']);
     }
 
@@ -358 +337 @@
     {
         if (! flag_set['d']) {
-            fatal_error
-                ("You need to specify a device file with -d for bootable USB device usage");
+            fatal_error("You need to specify a device file with -d for bootable USB device usage");
         }
         if ((!flag_set['s']) && (! bkpinfo->restore_data)) {
@@ -369 +347 @@
     {
         if (flag_set['m']) {
-            fatal_error
-                ("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
+            fatal_error("Manual CD tray (-m) not yet supported in conjunction w/ DVD drives. Drop -m.");
         }
         if (!flag_set['d']) {
@@ -379 +356 @@
         }
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if (! bkpinfo->restore_data) {
             if (!find_home_of_exe("growisofs")) {
-                fatal_error
-                    ("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install growisofs (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!find_home_of_exe("dvd+rw-format")) {
-                fatal_error
-                    ("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
+                fatal_error("Please install dvd+rw-format (probably part of dvd+rw-tools). If you want DVD support, you need it.");
             }
             if (!flag_set['s']) {
                 sprintf(flag_val['s'], "%d", DEFAULT_DVD_DISK_SIZE);    // 4.7 salesman's GB = 4.482 real GB = 4582 MB
                 strcat(flag_val['s'], "m");
-                log_to_screen
-                    ("You did not specify a size (-s) for DVD. I'm guessing %s.",
-                    flag_val['s']);
+                log_to_screen("You did not specify a size (-s) for DVD. I'm guessing %s.", flag_val['s']);
                 flag_set['s'] = 1;
             }
         }
-/*
-      if (flag_set['Z']) {
-      bkpinfo->blank_dvd_first = TRUE;
-      }
-*/
     }
 
     if (flag_set['t'] || flag_set['u']) {   /* tape size */
         if (strchr(flag_val['d'], ',')) {
-            fatal_error
-                ("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
+            fatal_error("Please don't give a SCSI node. Give a _device_, preferably a /dev entry, for the parameter of the -d flag.");
         }
         if ((flag_set['O']) && (! bkpinfo->restore_data)) {
             if (flag_set['s']) {
                 if (flag_set['t']) {
-                    fatal_error
-                        ("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
+                    fatal_error("For the moment, please don't specify a tape size. Mondo should handle end-of-tape gracefully anyway.");
                 }
                 if (process_the_s_switch(flag_val['s'])) {
@@ -440 +405 @@
 
     if (flag_set['n']) {
-        strncpy(bkpinfo->netfs_mount, flag_val['n'], MAX_STR_LEN);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", flag_val['n']);
         if (!flag_set['d']) {
-            strncpy(bkpinfo->netfs_remote_dir, "/", MAX_STR_LEN);
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "/");
         }
         /* test for protocol */
@@ -473 +440 @@
         /* Store the 2 values */
         /*  using memmove instead of strcpy as per #584 */
-        memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); 
+        /* memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); */
+        bkpinfo->netfs_mount = p;
 
         /* test if we specified a user */
@@ -479 +447 @@
         if (p != NULL) {
             /* User found. Store the 2 values */
+            bkpinfo->netfs_user = bkpinfo->netfs_mount;
             p++;
             /* new netfs mount */
-            strcpy(tmp,p);
+            mr_asprintf(bkpinfo->netfs_mount, "%s", p);
+            /* now that user is computed, create the right value by removing end of string */
             p--;
             *p = '\0';
-            mr_asprintf(q,"%s",bkpinfo->netfs_mount);
-            bkpinfo->netfs_user = q;
-            strcpy(bkpinfo->netfs_mount,tmp);
-        }
-        sprintf(tmp, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
-                bkpinfo->netfs_mount);
-        strncpy(bkpinfo->isodir,
-                call_program_and_get_last_line_of_output(tmp),
-                MAX_STR_LEN / 4);
+        }
+        mr_asprintf(tmp1, "mount | grep -E \"^[a-z]*#*[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+        strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4);
+        mr_free(tmp1);
+
         if (strlen(bkpinfo->isodir) < 3) {
             log_to_screen("Network share is not mounted. Trying to mount it for you.\n");
             if (bkpinfo->netfs_user) {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    sprintf(tmp, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "sshfs %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    sprintf(tmp, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
+                    mr_asprintf(tmp1, "mount -t cifs %s -o user=%s", bkpinfo->netfs_mount, bkpinfo->netfs_user);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    sprintf(tmp, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount %s@%s", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -508 +474 @@
             } else {
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
-                    sprintf(tmp, "sshfs %s", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "sshfs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "smbfs")) {
-                    sprintf(tmp, "mount -t cifs %s", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount -t cifs %s", bkpinfo->netfs_mount);
                 } else if (strstr(bkpinfo->netfs_proto, "nfs")) {
-                    sprintf(tmp, "mount %s", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount %s", bkpinfo->netfs_mount);
                 } else {
                     log_to_screen("Protocol %s not supported yet for network backups.\n", bkpinfo->netfs_proto);
@@ -518 +484 @@
                 }
             }
-            if (system(tmp)) {
+            i = system(tmp1);
+            mr_free(tmp1);
+
+            if (i) {
                 log_to_screen("Unable to mount Network share %s. Please mount manually.\n", bkpinfo->netfs_mount);
                 retval++;
             } else {
                 if (bkpinfo->netfs_user) {
-                    sprintf(tmp, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user,
-                        bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount | grep -E \"^[%s@]*%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_user, bkpinfo->netfs_mount);
                 } else {
-                    sprintf(tmp, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
+                    mr_asprintf(tmp1, "mount | grep -E \"^%s[/]* .*\" | cut -d' ' -f3", bkpinfo->netfs_mount);
                 }
-                strncpy(bkpinfo->isodir,
-                        call_program_and_get_last_line_of_output(tmp),
-                        MAX_STR_LEN / 4);
+                strncpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(tmp), MAX_STR_LEN / 4);
                 if (strlen(bkpinfo->isodir) < 3) {
                     retval++;
@@ -624 +590 @@
             }
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         mr_make_devlist_from_pathlist(flag_val['E'], 'E');
@@ -668 +634 @@
         log_msg(1, "Internal tape block size is now %ld bytes", itbs);
         if (itbs % 512 != 0 || itbs < 256 || itbs > 1024L * 1024) {
-            fatal_error
-                ("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
+            fatal_error("Are you nuts? Silly, your internal tape block size is. Abort, I shall.");
         }
         bkpinfo->internal_tape_block_size = itbs;
@@ -678 +643 @@
 //      bkpinfo->differential = atoi (flag_val['D']);
         if ((bkpinfo->differential < 1) || (bkpinfo->differential > 9)) {
-            fatal_error
-                ("The D option should be between 1 and 9 inclusive");
+            fatal_error("The D option should be between 1 and 9 inclusive");
         }
     }
@@ -702 +666 @@
             && !does_file_exist(bkpinfo->kernel_path)) {
             retval++;
-            sprintf(tmp,
-                    "You specified kernel '%s', which does not exist\n",
-                    bkpinfo->kernel_path);
-            log_to_screen(tmp);
+            log_to_screen("You specified kernel '%s', which does not exist\n", bkpinfo->kernel_path);
         }
     }
@@ -723 +684 @@
             }
         } else if (flag_set['n']) {
-            strncpy(bkpinfo->netfs_remote_dir, flag_val['d'], MAX_STR_LEN);
+            mr_free(bkpinfo->netfs_remote_dir);
+            mr_asprintf(bkpinfo->netfs_remote_dir, "%s", flag_val['d']);
         } else {                /* backup device (if tape/CD-R/CD-RW) */
             strncpy(bkpinfo->media_device, flag_val['d'], MAX_STR_LEN / 4);
@@ -732 +694 @@
         mr_asprintf(tmp1,"%s/%s/.dummy.txt", bkpinfo->isodir,bkpinfo->netfs_remote_dir);
         if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
-            sprintf(tmp, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
+            mr_asprintf(tmp2, "su - %s -c \"echo hi > %s\"", bkpinfo->netfs_user, tmp1);
         } else {
-            sprintf(tmp, "echo hi > %s", tmp1);
-        }
-        if (run_program_and_log_output(tmp, 2)) {
-            retval++;
-            sprintf(tmp,
-                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
-                    bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
-            log_to_screen(tmp);
+            mr_asprintf(tmp2, "echo hi > %s", tmp1);
+        }
+        i = run_program_and_log_output(tmp2, 2);
+        mr_free(tmp2);
+
+        if (i) {
+            retval++;
+            log_to_screen("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n", bkpinfo->netfs_remote_dir, bkpinfo->netfs_mount);
         }
         unlink(tmp1);
-        paranoid_free(tmp1);
-    }
-
-    if (!flag_set['d']
-        && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
+        mr_free(tmp1);
+    }
+
+    if (!flag_set['d'] && (flag_set['c'] || flag_set['w'] || flag_set['C'])) {
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
@@ -769 +730 @@
         retval++;
         log_to_screen("Please specify the backup device/directory.\n");
-        fatal_error
-            ("You didn't use -d to specify the backup device/directory.");
+        fatal_error("You didn't use -d to specify the backup device/directory.");
     }
 
@@ -781 +741 @@
     if (flag_set['S']) {
         setup_scratchdir(flag_val['S']);
-        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->scratchdir);
-        if (run_program_and_log_output(tmp, 1)) {
-            retval++;
+        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp1, 1)) {
+            retval++;
+            mr_free(tmp1);
             log_to_screen("Please specify a scratchdir which I can write to. :)");
             fatal_error("I cannot write to the scratchdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
-        if (run_program_and_log_output(tmp, 1)) {
-            retval++;
+        mr_free(tmp1);
+
+        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->scratchdir, bkpinfo->scratchdir);
+        if (run_program_and_log_output(tmp1, 1)) {
+            retval++;
+            mr_free(tmp1);
             log_to_screen("Please don't specify a SAMBA or VFAT or NFS scratchdir.");
             fatal_error("I cannot write to the scratchdir you specified.");
         }
+        mr_free(tmp1);
     }
 
     if (flag_set['T']) {
         setup_tmpdir(flag_val['T']);
-        sprintf(tmp, "touch %s/.foo.dat", bkpinfo->tmpdir);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(tmp1, "touch %s/.foo.dat", bkpinfo->tmpdir);
+        i = run_program_and_log_output(tmp1, 1);
+        mr_free(tmp1);
+
+        if (i) {
             retval++;
             log_to_screen("Please specify a tempdir which I can write to. :)");
             fatal_error("I cannot write to the tempdir you specified.");
         }
-        sprintf(tmp, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
-        if (run_program_and_log_output(tmp, 1)) {
+        mr_asprintf(tmp1, "ln -sf %s/.foo.dat %s/.bar.dat", bkpinfo->tmpdir, bkpinfo->tmpdir);
+        i = run_program_and_log_output(tmp1, 1);
+        mr_free(tmp1);
+
+        if (i) {
             retval++;
             log_to_screen("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
@@ -833 +804 @@
 #  endif
 #endif
-        if (!strchr
-            (BOOT_LOADER_CHARS,
-             (bkpinfo->boot_loader = flag_val['l'][0]))) {
-            log_msg(1, "%c? WTF is %c? I need G, L, E or R.",
-                    bkpinfo->boot_loader, bkpinfo->boot_loader);
-            fatal_error
-                ("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
+        if (!strchr(BOOT_LOADER_CHARS, (bkpinfo->boot_loader = flag_val['l'][0]))) {
+            log_msg(1, "%c? What is %c? I need G, L, E or R.", bkpinfo->boot_loader, bkpinfo->boot_loader);
+            fatal_error("Please specify GRUB, LILO, ELILO  or RAW with the -l switch");
         }
 #undef BOOT_LOADER_CHARS
@@ -845 +812 @@
 
     if (flag_set['f']) {
-        strncpy(bkpinfo->boot_device,
-                resolve_softlinks_to_get_to_actual_device_file(flag_val
-                                                               ['f']),
-                MAX_STR_LEN / 4);
+        strncpy(bkpinfo->boot_device, resolve_softlinks_to_get_to_actual_device_file(flag_val['f']),MAX_STR_LEN / 4);
     }
 
@@ -866 +830 @@
         if (run_program_and_log_output("which lzop", 2)) {
             retval++;
-            log_to_screen
-                ("Please install LZOP. You can't use '-L' until you do.\n");
+            log_to_screen("Please install LZOP. You can't use '-L' until you do.\n");
         }
     }
@@ -880 +843 @@
         if (run_program_and_log_output("which gzip", 2)) {
             retval++;
-            log_to_screen
-                ("Please install gzip. You can't use '-G' until you do.\n");
+            log_to_screen("Please install gzip. You can't use '-G' until you do.\n");
+        }
+    }
+
+    if ((flag_set['Y']) && (! bkpinfo->restore_data)) {
+        bkpinfo->use_lzma = TRUE;
+        if (run_program_and_log_output("which lzma", 2)) {
+            retval++;
+            log_to_screen("Please install lzma. You can't use '-Y' until you do.\n");
         }
     }
@@ -897 +867 @@
     if ((!is_this_a_valid_disk_format("vfat")) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
-        log_to_screen
-            ("Your kernel appears not to support vfat filesystems. I am therefore");
-        log_to_screen
-            ("using LILO instead of SYSLINUX as the media boot loader.");
+        log_to_screen("Your kernel appears not to support vfat filesystems. I am therefore");
+        log_to_screen("using LILO instead of SYSLINUX as the media boot loader.");
     }
     if ((run_program_and_log_output("which mkfs.vfat", 2)) && (! bkpinfo->restore_data)) {
         bkpinfo->make_cd_use_lilo = TRUE;
 #ifdef __IA32__
-        log_to_screen
-            ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-        log_to_screen
-            ("your boot loader. I shall therefore use LILO instead.");
+        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
+        log_to_screen("your boot loader. I shall therefore use LILO instead.");
 #endif
 #ifdef __IA64__
-        log_to_screen
-            ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
+        log_to_screen("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
         log_to_screen("environment correctly. Please install it.");
         fatal_error("Aborting");
@@ -932 +897 @@
 
     if ((! bkpinfo->restore_data) && (flag_set['Z'])) {
-            fatal_error
-                ("The -Z switch is only valid in restore mode");
+            fatal_error("The -Z switch is only valid in restore mode");
     }
 
@@ -973 +937 @@
  * @return The number of problems with the command line (0 for success).
  */
-int
-retrieve_switches_from_command_line(int argc, char *argv[],
-                                    char flag_val[128][MAX_STR_LEN],
-                                    bool flag_set[128])
+int retrieve_switches_from_command_line(int argc, char *argv[], char flag_val[128][MAX_STR_LEN], bool flag_set[128])
 {
     /*@ ints ** */
     int opt = 0;
-    char *tmp = NULL;
     int i = 0;
     int len;
@@ -994 +954 @@
         flag_set[i] = FALSE;
     }
-    while ((opt =
-            getopt(argc, argv, MONDO_OPTIONS))
-           != -1) {
+    while ((opt = getopt(argc, argv, MONDO_OPTIONS)) != -1) {
         if (opt == '?') {
             bad_switches = TRUE;
-            /*log_it("Invalid option: %c\n",optopt); */
         } else {
             if (flag_set[opt]) {
                 bad_switches = TRUE;
-                mr_asprintf(tmp, "Switch -%c previously defined as %s\n", opt, flag_val[opt]);
-                log_to_screen(tmp);
-                paranoid_free(tmp);
+                log_to_screen("Switch -%c previously defined as %s\n", opt, flag_val[opt]);
             } else {
                 flag_set[opt] = TRUE;
@@ -1019 +974 @@
                         if (strchr(flag_val[opt], '/')
                             && flag_val[opt][0] != '/') {
-                            mr_asprintf(tmp, "-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
-                            log_to_screen(tmp);
-                            paranoid_free(tmp);
+                            log_to_screen("-%c flag --- must be absolute path --- '%s' isn't absolute", opt, flag_val[opt]);
                             bad_switches = TRUE;
                         }
@@ -1032 +985 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        mr_asprintf(tmp, "Invalid arg -- %s\n", argv[i]);
-        log_to_screen(tmp);
-        paranoid_free(tmp);
+        log_to_screen("Invalid arg -- %s\n", argv[i]);
     }
     return (bad_switches);
@@ -1097 +1048 @@
     mr_strcat(tmp, " signal received from OS");
     log_to_screen(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     log_to_screen(tmp2);
-    paranoid_free(tmp2);
+    mr_free(tmp2);
     if (sig == SIGABRT) {
         sleep(10);
@@ -1108 +1059 @@
     free_MR_global_filenames();
 
-    fatal_error
-        ("MondoRescue is terminating in response to a signal from the OS");
+    fatal_error("MondoRescue is terminating in response to a signal from the OS");
     finish(254);                // just in case
 }
@@ -1122 +1072 @@
 void set_signals(int on)
 {
-    int signals[] =
-        { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
+    int signals[] = { SIGTERM, SIGHUP, SIGTRAP, SIGABRT, SIGINT, SIGKILL, SIGSTOP, 0 };
     int i;
 

branches/3.2/mondo/src/common/libmondo-devices-EXT.h

@@ -16 +16 @@
 extern int find_device_in_mountlist(struct mountlist_itself *mountlist,
                                     char *device);
-extern int mount_CDROM_here(char *device, char *mountpoint);
+extern int mount_CDROM_here(char *device, const char *mountpoint);
 extern long long size_of_specific_device_in_mountlist(struct
                                                       mountlist_itself
@@ -57 +57 @@
 extern int inject_device(char *dev);
 extern bool does_nonMS_partition_exist(void);
-extern char *resolve_softlinks_to_get_to_actual_device_file(char
-                                                            *incoming);
+extern char *resolve_softlinks_to_get_to_actual_device_file(char *incoming);
 
 extern void set_g_cdrom_and_g_dvd_to_bkpinfo_value();

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -21 +21 @@
 #include "libmondo-stream-EXT.h"
 
+extern void mr_strip_spaces(char *);
+
 #include <sys/types.h>
 #ifdef __FreeBSD__
@@ -127 +129 @@
 {
     char *tmp = NULL;
-    char *comment;
     bool is_this_a_ramdisk = FALSE;
 
-    malloc_string(comment);
     mr_asprintf(tmp, "%s", where_is_root_mounted());
-    sprintf(comment, "root is mounted at %s\n", tmp);
-    log_msg(0, comment);
-    log_msg(0,
-            "No, Schlomo, that doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().",
-            tmp);
+    log_msg(0, "root is mounted at %s\n", tmp);
+    log_msg(0, "That doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().", tmp);
 
 #ifdef __FreeBSD__
@@ -156 +153 @@
     if (is_this_a_ramdisk) {
         if (!does_file_exist("/THIS-IS-A-RAMDISK")) {
-            log_to_screen
-                ("Using /dev/root is stupid of you but I'll forgive you.");
+            log_to_screen("Using /dev/root is stupid of you but I'll forgive you.");
             is_this_a_ramdisk = FALSE;
         }
@@ -164 +160 @@
         is_this_a_ramdisk = TRUE;
     }
-    paranoid_free(comment);
-    log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
+
+    log_msg(1, "Is this a ramdisk? result = %s", (is_this_a_ramdisk) ? "TRUE" : "FALSE");
     return (is_this_a_ramdisk);
 }
@@ -229 +225 @@
 int eject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res1 = 0, res2 = 0;
 
-    malloc_string(command);
+    if (dev == NULL) {
+        return (1);
+    }
 
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
-        sprintf(command, "mt -f %s offline", dev);
+        mr_asprintf(command, "mt -f %s offline", dev);
         res1 = run_program_and_log_output(command, 1);
+        mr_free(command);
     } else {
         res1 = 0;
@@ -244 +243 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        sprintf(command, "cdcontrol -f %s eject", dev);
+        mr_asprintf(command, "cdcontrol -f %s eject", dev);
     } else {
-        sprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
-                dev);
+        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`", dev);
     }
 #else
-    sprintf(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);
@@ -270 +268 @@
 int inject_device(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int i;
 
-    malloc_string(command);
-
+    if (dev == NULL) {
+        return (1);
+    }
 
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        sprintf(command, "cdcontrol -f %s close", dev);
+        mr_asprintf(command, "cdcontrol -f %s close", dev);
     } else {
-        sprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`",
-                dev);
+        mr_asprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`", dev);
     }
 #else
-    sprintf(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);
 }
@@ -301 +299 @@
 
     /*@ buffers *********************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     bool ret;
 
-    malloc_string(tmp);
     assert_string_is_neither_NULL_nor_zerolength(device);
 
-    sprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
+    mr_asprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
 
     if (system(tmp)) {
@@ -314 +311 @@
         ret = TRUE;
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (ret);
 }
@@ -345 +342 @@
 {
     /*@ buffers **************************************************** */
-    char *program;
-    char *incoming;
+    char *program = NULL;
+    char *incoming = NULL;
     char *searchstr = NULL;
-    char *tmp;
-    char *p;
 
     /*@ ints ******************************************************* */
@@ -356 +351 @@
     /*@ pointers *************************************************** */
     FILE *fin;
-
 
     /*@ end vars *************************************************** */
@@ -362 +356 @@
     assert(partno >= 0 && partno < 999);
 
-    malloc_string(program);
-    malloc_string(incoming);
     malloc_string(searchstr);
-    malloc_string(tmp);
 
 #ifdef __FreeBSD__
     // We assume here that this is running from mondorestore. (It is.)
-    sprintf(program, "ls %s %s >/dev/null 2>&1", drive,
-            build_partition_name(tmp, drive, partno));
-    return system(program);
-#else
-    tmp[0] = '\0';
-#endif
-
-    sprintf(program, "parted2fdisk -l %s 2> /dev/null", drive);
+    mr_asprintf(program, "ls %s %s >/dev/null 2>&1", drive, build_partition_name(tmp, drive, partno));
+    res = system(program);
+    mr_free(program);
+    return(res);
+#endif
+
+    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");
+        mr_free(program);
         return (0);
     }
+    mr_free(program);
+
     (void) build_partition_name(searchstr, drive, partno);
     strcat(searchstr, " ");
-    for (res = 0; !res && (p = fgets(incoming, MAX_STR_LEN - 1, fin));) {
+    for (res = 0, mr_getline(incoming, fin); !res && !feof(fin) ; mr_getline(incoming, fin)) {
         if (strstr(incoming, searchstr)) {
             res = 1;
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
+
     if (pclose(fin)) {
         log_OS_error("Cannot pclose fin");
     }
-    paranoid_free(program);
-    paranoid_free(incoming);
     paranoid_free(searchstr);
-    paranoid_free(tmp);
     return (res);
 }
@@ -413 +406 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
 
     /*@ end vars *************************************************** */
@@ -421 +414 @@
     assert_string_is_neither_NULL_nor_zerolength(str);
 
-    malloc_string(command);
-    sprintf(command,
-            "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
-            dev, str);
+    /* For UEFI detection, this should be extended to count=2 */
+    mr_asprintf(command, "dd if=%s bs=446 count=1 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, str);
     i = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (i) {
         return (FALSE);
@@ -444 +435 @@
 {
     /*@ buffers **************************************************** */
-    char *command;
+    char *command = NULL;
     /*@ end vars *************************************************** */
     int i;
 
-    malloc_string(command);
-    sprintf(command,
-            "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null",
-            dev, n, str);
+    mr_asprintf(command, "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, n, str);
     i = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (i) {
         return (FALSE);
@@ -466 +454 @@
  * Try to mount CD-ROM at @p mountpoint. If the CD-ROM is not found or has
  * not been specified, call find_cdrom_device() to find it.
- * @param bkpinfo The backup information structure. The only field used is @c bkpinfo->media_device.
  * @param mountpoint Where to mount the CD-ROM.
  * @return 0 for success, nonzero for failure.
  * @see mount_CDROM_here
  */
-int find_and_mount_actual_cd(char *mountpoint)
-{
+int find_and_mount_actual_cd(char *mountpoint) {
+
     /*@ buffers ***************************************************** */
 
     /*@ int's  ****************************************************** */
     int res;
-    char *dev;
+    char *dev = NULL;
 
     /*@ end vars **************************************************** */
@@ -532 +519 @@
 {
     /*@ buffers ************************ */
-    char *comment;
     char *tmp = NULL;
     char *cdr_exe = NULL;
-    char *command;
-
-    malloc_string(comment);
-    malloc_string(command);
+    char *command = NULL;
+
     if (g_cdrw_drive_is_here[0]) {
         strcpy(cdrw_device, g_cdrw_drive_is_here);
         log_msg(3, "Been there, done that. Returning %s", cdrw_device);
-        paranoid_free(comment);
-        paranoid_free(command);
         return (0);
     }
     if (g_backup_media_type == dvd) {
-        log_msg(1,
-                "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
-        paranoid_free(comment);
-        paranoid_free(command);
+        log_msg(1, "This is dumb. You're calling find_cdrw_device() but you're backing up to DVD. WTF?");
         return (1);
     }
@@ -560 +539 @@
     }
     if (find_home_of_exe(cdr_exe)) {
-        sprintf(command,
-                "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1",
-                cdr_exe);
+        mr_asprintf(command, "%s -scanbus 2> /dev/null | tr -s '\t' ' ' | grep \"[0-9]*,[0-9]*,[0-9]*\" | grep -v \"[0-9]*) \\*\" | grep -E '[D|C][V|D]' | cut -d' ' -f2 | head -n1", cdr_exe);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(command);
     }
     if ((tmp == NULL) || (strlen(tmp) < 2)) {
-        paranoid_free(comment);
         mr_free(tmp);
         mr_free(cdr_exe);
-        paranoid_free(command);
         return 1;
     } else {
         strcpy(cdrw_device, tmp);
-        sprintf(comment, "Found CDRW device - %s", cdrw_device);
-        log_it(comment);
+        log_it("Found CDRW device - %s", cdrw_device);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
-        paranoid_free(comment);
         mr_free(tmp);
         mr_free(cdr_exe);
-        paranoid_free(command);
         return (0);
     }
 }
-
-
 
 
@@ -609 +580 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp;
+    char *tmp = NULL;
     char *tmp1 = NULL;
     char *cdr_exe = NULL;
     char *phrase_one;
-    char *phrase_two;
-    char *command;
-    char *dvd_last_resort;
-    char *mountpoint;
+    char *phrase_two = NULL;
+    char *command = NULL;
+#ifndef __FreeBSD__
+    char *dvd_last_resort = NULL;
+#endif
+    char *mountpoint = NULL;
     static char the_last_place_i_found_it[MAX_STR_LEN] = "";
 
@@ -622 +595 @@
     malloc_string(tmp);
     malloc_string(phrase_one);
-    malloc_string(phrase_two);
-    malloc_string(command);
-    malloc_string(dvd_last_resort);
     malloc_string(mountpoint);
 
     output[0] = '\0';
     phrase_one[0] = '\0';
-    phrase_two[0] = '\0';
-    dvd_last_resort[0] = '\0';
 
     /*@ end vars **************************************************** */
@@ -642 +610 @@
     if (the_last_place_i_found_it[0] != '\0' && !try_to_mount) {
         strcpy(output, the_last_place_i_found_it);
-        log_msg(3,
-                "find_cdrom_device() --- returning last found location - '%s'",
-                output);
+        log_msg(3, "find_cdrom_device() --- returning last found location - '%s'", output);
         retval = 0;
         goto end_of_find_cdrom_device;
@@ -671 +637 @@
     }
 
-    sprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
+    mr_asprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
     fin = popen(command, "r");
     if (!fin) {
@@ -677 +643 @@
         log_OS_error("Cannot popen command");
         mr_free(cdr_exe);
+        mr_free(command);
         return (1);
     }
+    mr_free(command);
+
     for (tmp1 = fgets(tmp, MAX_STR_LEN, fin); !feof(fin) && (tmp1 != NULL);
          tmp1 = fgets(tmp, MAX_STR_LEN, fin)) {
@@ -696 +665 @@
                         }
                         *q = '\0';
-                        strcpy(phrase_two, p);
+                        mr_asprintf(phrase_two, "%s", p);
                     }
                 }
@@ -705 +674 @@
 
 #ifndef __FreeBSD__
-    if (strlen(phrase_two) == 0) {
+    if (!phrase_two || strlen(phrase_two) == 0) {
         log_msg(4, "Not running phase two. String is empty.");
     } else {
-        sprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
+        mr_asprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
         fin = popen(command, "r");
+        mr_free(command);
+
         if (!fin) {
             log_msg(4, "Cannot run 2nd command - non-fatal, fortunately");
@@ -721 +692 @@
                         *p = '\0';
                         if (strstr(tmp, "DVD")) {
-                            sprintf(dvd_last_resort, "/dev/%s", tmp);
-                            log_msg(4,
-                                    "Ignoring '%s' because it's a DVD drive",
-                                    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 {
                             sprintf(output, "/dev/%s", tmp);
@@ -775 +745 @@
 #else
     if (!found_it && strlen(dvd_last_resort) > 0) {
-        log_msg(4, "Well, I'll use the DVD - %s - as a last resort",
-                dvd_last_resort);
+        log_msg(4, "Well, I'll use the DVD - %s - as a last resort", dvd_last_resort);
         strcpy(output, dvd_last_resort);
         found_it = TRUE;
     }
     if (found_it) {
-        sprintf(tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null",
-                strrchr(output, '/') + 1);
+        sprintf(tmp, "grep \"%s=ide-scsi\" /proc/cmdline &> /dev/null", strrchr(output, '/') + 1);
         if (system(tmp) == 0) {
-            log_msg(4,
-                    "%s is not right. It's being SCSI-emulated. Continuing.",
-                    output);
+            log_msg(4, "%s is not right. It's being SCSI-emulated. Continuing.", output);
             found_it = FALSE;
             output[0] = '\0';
@@ -852 +818 @@
                 found_it = FALSE;
             } else {
-                sprintf(command, "umount %s", output);
+                mr_asprintf(command, "umount %s", output);
                 paranoid_system(command);
+                mr_free(command);
+
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
@@ -872 +840 @@
     }
 
-    sprintf(command,
-            "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2",
-            cdr_exe, g_cdrw_drive_is_here);
+    mr_asprintf(command, "%s -scanbus | grep \"[0-9],[0-9],[0-9]\" | grep -E \"[D|C][V|D]\" | grep -n \"\" | grep \"%s\" | cut -d':' -f2", cdr_exe, g_cdrw_drive_is_here);
+
     log_msg(1, "command=%s", command);
     mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output(command));
+    mr_free(command);
+
     if (strlen(tmp1) > 0) {
         strcpy(output, tmp1);
@@ -888 +857 @@
 
   end_of_find_cdrom_device:
+    mr_free(cdr_exe);
+    mr_free(phrase_two);
+    mr_free(dvd_last_resort);
+
     paranoid_free(tmp);
-    mr_free(cdr_exe);
     paranoid_free(phrase_one);
-    paranoid_free(phrase_two);
-    paranoid_free(command);
-    paranoid_free(dvd_last_resort);
     paranoid_free(mountpoint);
     return (retval);
@@ -899 +868 @@
 
 
-
-
-
 int find_dvd_device(char *output, bool try_to_mount)
 {
-    char *command;
     char *tmp;
     int retval = 0, devno = -1;
-
-    malloc_string(command);
-    malloc_string(tmp);
 
     if (g_dvd_drive_is_here[0]) {
@@ -917 +879 @@
     }
 
-    sprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
+    malloc_string(tmp);
+    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("dvdrecord -scanbus 2> /dev/null | grep -E '\)\ \'' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
     log_msg(5, "tmp = '%s'", tmp);
-    if (!tmp[0])
-        sprintf(tmp, "%s", call_program_and_get_last_line_of_output
-                ("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1")
-            );
+    if (!tmp[0]) {
+        mr_free(tmp);
+        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("cdrecord -scanbus 2> /dev/null | grep \)\ \' | grep -n '' | grep -E '[D|C][V|D]' | cut -d':' -f1"));
+    }
     if (tmp[0]) {
         devno = atoi(tmp) - 1;
     }
+    mr_free(tmp);
+
     if (devno >= 0) {
         retval = 0;
@@ -936 +901 @@
     }
 
-    if (try_to_mount) {
-        log_msg(1, "Ignoring the fact that try_to_mount==TRUE");
-    }
     return (retval);
 }
@@ -1053 +1015 @@
 {
     char *good_formats = NULL;
-    char *command;
-    char *format_sz;
+    char *command = NULL;
+    char *format_sz = NULL;
     char *p;
 
@@ -1060 +1022 @@
     int retval;
     malloc_string(good_formats);
-    malloc_string(command);
-    malloc_string(format_sz);
 
     assert_string_is_neither_NULL_nor_zerolength(format);
 
-    sprintf(format_sz, "%s ", format);
+    mr_asprintf(format_sz, "%s ", format);
 
 #ifdef __FreeBSD__
-    sprintf(command,
-            "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
+    mr_asprintf(command, "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    sprintf(command,
-            "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
+    mr_asprintf(command, "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
 #endif
 
     pin = popen(command, "r");
+    mr_free(command);
+
     if (!pin) {
         log_OS_error("Unable to read good formats");
@@ -1094 +1054 @@
     }
     paranoid_free(good_formats);
-    paranoid_free(command);
-    paranoid_free(format_sz);
+    mr_free(format_sz);
+
     return (retval);
 }
@@ -1114 +1074 @@
 
     /*@ buffers ***************************************************** */
-    char *incoming;
+    char *incoming = NULL;
     char *device_with_tab = NULL;
     char *device_with_space = NULL;
@@ -1128 +1088 @@
     /*@ end vars **************************************************** */
 
-    malloc_string(incoming);
-    assert(device_raw != NULL);
-//  assert_string_is_neither_NULL_nor_zerolength(device_raw);
+    if (device_raw == NULL) {
+        return(FALSE);
+    }
+
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1153 +1114 @@
         return(FALSE);
     }
-    for (tmp = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (tmp != NULL);
-         tmp = fgets(incoming, MAX_STR_LEN - 1, fin)) {
-        if (strstr(incoming, device_with_space) //> incoming
-            || strstr(incoming, device_with_tab))   // > incoming)
-        {
+
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+        if (strstr(incoming, device_with_space) || strstr(incoming, device_with_tab)) {
             paranoid_pclose(fin);
-            paranoid_free(incoming);
+            mr_free(incoming);
             return(TRUE);
         }
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     mr_free(device_with_tab);
     paranoid_pclose(fin);
@@ -1172 +1133 @@
     }
     mr_free(tmp);
-    paranoid_free(incoming);
     return(retval);
 }
@@ -1189 +1149 @@
     char command[MAX_STR_LEN];
     int vndev = 2;
-    if (atoi
-        (call_program_and_get_last_line_of_output
-         ("/sbin/sysctl -n kern.osreldate")) < 500000) {
+    if (atoi(call_program_and_get_last_line_of_output("/sbin/sysctl -n kern.osreldate")) < 500000) {
         do {
             sprintf(mddevice, "vn%ic", vndev++);
@@ -1223 +1181 @@
 int kick_vn(char *dname)
 {
-    char command[MAX_STR_LEN];
+    char *command = NULL;
+    int res = 0;
 
     if (strncmp(dname, "/dev/", 5) == 0) {
@@ -1229 +1188 @@
     }
 
-    if (atoi
-        (call_program_and_get_last_line_of_output
-         ("/sbin/sysctl -n kern.osreldate")) < 500000) {
-        sprintf(command, "vnconfig -d %s", dname);
-        return system(command);
+    if (atoi(call_program_and_get_last_line_of_output("/sbin/sysctl -n kern.osreldate")) < 500000) {
+        mr_asprintf(command, "vnconfig -d %s", dname);
     } else {
-        sprintf(command, "mdconfig -d -u %s", dname);
-        return system(command);
-    }
-     /*NOTREACHED*/ return 255;
+        mr_asprintf(command, "mdconfig -d -u %s", dname);
+    }
+    res = system(command);
+    mr_free(command);
+    return(res);
 }
 #endif
@@ -1252 +1209 @@
 {
     /*@ buffer ****************************************************** */
-    char *command;
+    char *command = NULL;
     int retval;
 
-    malloc_string(command);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
@@ -1263 +1219 @@
         return(1);
     }
-    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device,
-            mountpoint);
+    log_msg(4, "(mount_USB_here --- device=%s, mountpoint=%s", device, mountpoint);
 
 #ifdef __FreeBSD__
-    sprintf(command, "mount_vfat %s %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(command, "mount_vfat %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
 
 #else
-    sprintf(command, "mount %s -t vfat %s 2>> %s",
-            device, mountpoint, MONDO_LOGFILE);
+    mr_asprintf(command, "mount %s -t vfat %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
 #endif
 
@@ -1278 +1231 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-
-    paranoid_free(command);
+    mr_free(command);
+
     return (retval);
 }
@@ -1289 +1242 @@
  * @return 0 for success, nonzero for failure.
  */
-int mount_CDROM_here(char *device, char *mountpoint)
+int mount_CDROM_here(char *device, const char *mountpoint)
 {
     /*@ buffer ****************************************************** */
@@ -1327 +1280 @@
 
     }
-    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device,
-            mountpoint);
+    log_msg(4, "(mount_CDROM_here --- device=%s, mountpoint=%s", device, mountpoint);
     /*@ end vars *************************************************** */
 
@@ -1345 +1297 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-    paranoid_free(command);
+    mr_free(command);
 
     return (retval);
@@ -1362 +1314 @@
 int mount_media()
 {
-char *mount_cmd;
+char *mount_cmd = NULL;
 char *mountdir = NULL;
 int i, res;
 #ifdef __FreeBSD__
-char mdd[32];
-char *mddev = mdd;
-#endif
-
-malloc_string(mount_cmd);
-assert(bkpinfo != NULL);
-
-    if (bkpinfo->backup_media_type == tape
-        || bkpinfo->backup_media_type == udev) {
+    char mdd[32];
+    char *mddev = mdd;
+#endif
+
+    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
         log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
-        paranoid_free(mount_cmd);
         return 0;
     }
@@ -1382 +1329 @@
     if (!run_program_and_log_output("mount | grep -F " MNT_CDROM, FALSE)) {
         log_msg(2, "mount_media() - media already mounted. Fair enough.");
-        paranoid_free(mount_cmd);
         return (0);
     }
@@ -1389 +1335 @@
         log_msg(2, "Mounting for Network thingy");
         log_msg(2, "isodir = %s", bkpinfo->isodir);
-        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/"))
-            && am_I_in_disaster_recovery_mode()) {
+        if ((!bkpinfo->isodir[0] || !strcmp(bkpinfo->isodir, "/")) && am_I_in_disaster_recovery_mode()) {
             strcpy(bkpinfo->isodir, "/tmp/isodir");
             log_msg(1, "isodir is being set to %s", bkpinfo->isodir);
         }
 #ifdef __FreeBSD__
-        sprintf(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->netfs_remote_dir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
-        sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        mr_free(mount_cmd);
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        sprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            bkpinfo->isodir, bkpinfo->netfs_remote_dir,
-            bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s/%s/%s-%d.iso -t iso9660 -o loop,ro %s", bkpinfo->isodir, bkpinfo->netfs_remote_dir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
 
@@ -1412 +1357 @@
         }
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "%s/%s-%d.iso", mountdir,
-            bkpinfo->prefix, g_current_media_number);
+        mr_asprintf(mount_cmd, "%s/%s-%d.iso", mountdir, bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        mr_free(mount_cmd);
+
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        sprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s",
-            mountdir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", mountdir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
 #endif
         mr_free(mountdir);
     } else if (bkpinfo->backup_media_type == usb) {
-        sprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
     } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
-        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
-        MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
 #else
-        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
-        bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     } else {
@@ -1441 +1384 @@
 
 #ifdef __FreeBSD__
-    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
-        MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
 #else
-    sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
-        bkpinfo->media_device, MNT_CDROM);
+        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
 #endif
     }
@@ -1457 +1398 @@
             log_msg(2, "Failed to mount device.");
             sleep(5);
-            run_program_and_log_output("sync", FALSE);
-        }
-    }
+            sync();
+        }
+    }
+    mr_free(mount_cmd);
 
     if (res) {
@@ -1466 +1408 @@
         log_msg(2, "Mounted media drive OK");
     }
-    paranoid_free(mount_cmd);
     return (res);
 }
@@ -1496 +1437 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp;
+    char *tmp = NULL;
     char *mds = NULL;
-    char *request;
+    char *request = NULL;
 
     assert(bkpinfo != NULL);
@@ -1510 +1451 @@
         return;
     }
-    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso
-        || bkpinfo->backup_media_type == netfs) {
+    mr_asprintf(tmp, "mkdir -p " MNT_CDROM);
+    run_program_and_log_output(tmp, 5);
+    mr_free(tmp);
+
+    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == netfs) {
         g_ISO_restore_mode = TRUE;
     }
-    malloc_string(tmp);
-    malloc_string(request);
-    sprintf(tmp, "mkdir -p " MNT_CDROM);
-    run_program_and_log_output(tmp, 5);
     if ((res = what_number_cd_is_this()) != cd_number_i_want) {
-        log_msg(3, "Currently, we hold %d but we want %d", res,
-                cd_number_i_want);
+        log_msg(3, "Currently, we hold %d but we want %d", res, cd_number_i_want);
 
         /* Now we need to umount the current media to have the next mounted after */
@@ -1529 +1468 @@
 
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        sprintf(tmp, "Insisting on %s #%d", mds, cd_number_i_want);
-        sprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
+        log_msg(3, "Insisting on %s #%d", mds, cd_number_i_want);
+        mr_asprintf(request, "Please insert %s #%d and press Enter.", mds, cd_number_i_want);
         mr_free(mds);
-        log_msg(3, tmp);
+
         while (what_number_cd_is_this() != cd_number_i_want) {
-            paranoid_system("sync");
+            sync();
             if (is_this_device_mounted(MNT_CDROM)) {
                 res =
@@ -1556 +1495 @@
                 inject_device(bkpinfo->media_device);
             }
-            paranoid_system("sync");
-        }
+            sync();
+        }
+        mr_free(request);
+
         log_msg(1, "Thankyou. Proceeding...");
         g_current_media_number = cd_number_i_want;
     }
-    paranoid_free(tmp);
-    paranoid_free(request);
 }
 
@@ -1676 +1615 @@
     log_msg(5, "Running: %s", command);
     mr_asprintf(mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-    paranoid_free(command);
+    mr_free(command);
 
     mount_cnt = atoi(mounted_file_system);
     log_msg (5, "mount_cnt: %d", mount_cnt);
-    paranoid_free(mounted_file_system);
+    mr_free(mounted_file_system);
 
     for (i=mount_cnt; i > 0; i--) {
@@ -1686 +1625 @@
         log_msg(5, "Running: %s", command);
         mr_asprintf(mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
 
         log_msg (5, "mounted_file_system: %s", mounted_file_system);
         if ((token = mr_strtok(mounted_file_system, token_chars, &lastpos)) == NULL) {
             log_msg (4, "Could not get the list of mounted file systems");
-            paranoid_free(mounted_file_system);
+            mr_free(mounted_file_system);
             mr_free(token);
             return (1);
@@ -1719 +1658 @@
         mr_free(mounted_file_system);
     }
-    /********
-    * DSFptr = DSF_Head;
-    * while (DSFptr != NULL) {
-    * printf ("Dev: %s  MP: %s  Check: %d\n", DSFptr->device, DSFptr->mount_point, DSFptr->check);
-    * DSFptr = DSFptr->next;
-    * }
-    ********/
     return (0);
 }
@@ -1773 +1705 @@
     log_msg(5, "  Executing: %s", command);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-    paranoid_free(command);
+    mr_free(command);
 
     log_msg(5, "  Return value: %s", tmp);
     c = atoi(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (!c) {
@@ -1799 +1731 @@
     log_msg(5, "Executing: %s", command);
     mr_asprintf(partition_list, "%s", call_program_and_get_last_line_of_output(command));
-    paranoid_free(command);
+    mr_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
     if (!strlen(partition_list)) {
@@ -1862 +1794 @@
         log_msg(4, "Processing partition: %s", partitions[i]);
         /* See if it's swap. If it is, ignore it. */
-        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", 
-          ndsf, partitions[i]);
+        mr_asprintf(command, "parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]);
         log_msg(5, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+
         log_msg(5, "  Return value: %s", tmp);
         c = strlen(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
+
         if (c) {
             log_msg(4, "It's swap. Ignoring partition %s", partitions[i]); 
             continue;
         } 
+
         /* It's not swap. See if we can find the mount point from the mount command. */
         mr_asprintf(command, "mount 2>/dev/null | awk '{if((NF>0)&&($1==\"%s\")){print $3}}'", partitions[i]);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+
         if (strlen(tmp)) {
             log_msg(4, "  %s is mounted: %s", partitions[i], tmp);
             if ((DSFptr = find_mount_point_in_list(tmp)) == NULL) {
                 log_msg (4, "Can't find mount point %s in mounted file systems list", tmp);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (1);
             }
             DSFptr->check = 1;
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
+
         /* It's not swap and it's not mounted. See if it's LVM */
         log_msg(4, "  It's not mounted. Checking to see if it's LVM...");
+
         /* Check for LVM */
         mr_asprintf(command, "pvdisplay -c %s 2> /dev/null", partitions[i]);
         log_msg(5, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+
         if (strlen(tmp)) {
             log_msg(4, "Found an LVM partition at %s. Find the VG it's in...", partitions[i]);
@@ -1903 +1841 @@
             log_msg(5, "  Running: %s", command);
             strcpy(VG, call_program_and_get_last_line_of_output(command));
-            paranoid_free(command);
+            mr_free(command);
+
             log_msg(4, "  Volume Group: %s", VG);
             if (strlen(VG)) {
@@ -1911 +1850 @@
                 log_msg(5, "  Running: %s", command);
                 mr_asprintf(mount_list, "%s", call_program_and_get_last_line_of_output(command));
-                paranoid_free(command);
+                mr_free(command);
+
                 log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
                 lastpos = 0;
@@ -1918 +1858 @@
                     if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
                         log_msg (4, "Can't find mount point %s in mounted file systems list", token);
-                        paranoid_free(tmp);
+                        mr_free(tmp);
                         mr_free(token);
                         return (1);
@@ -1929 +1869 @@
                  * any of the Logical Volumes on the Volume Group.
                  *******/
-                paranoid_free(mount_list);
+                mr_free(mount_list);
 
                 mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
                 log_msg (5, "Running: %s", command);
                 mr_asprintf(mount_list, "%s", call_program_and_get_last_line_of_output(command));
-                paranoid_free(command);
+                mr_free(command);
                 log_msg(4, "  Software raid device list: %s", mount_list);
                 lastpos = 0;
@@ -1940 +1880 @@
                     mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG);
                     log_msg (5, "Running: %s", command);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-                    paranoid_free(command);
+                    mr_free(command);
                     log_msg(4, "Number of Software raid device: %s", tmp);
                     if (atoi(tmp)) {
@@ -1948 +1888 @@
                         if ((DSFptr = find_device_in_list(token)) == NULL) {
                             log_msg (4, "Can't find device %s in mounted file systems list", token);
-                            paranoid_free(tmp);
+                            mr_free(tmp);
                             mr_free(token);
                             return (1);
@@ -1959 +1899 @@
             } else {
                 log_msg (4, "Error finding Volume Group for partition %s", partitions[i]);
-                paranoid_free(tmp);
+                mr_free(tmp);
                 return (1);
             }
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         } else {
             log_msg (4, "Error finding partition type for the partition %s", partitions[i]);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
+
         /********
          * It's not swap, mounted, or LVM. See if it's used in a software raid device.
@@ -1975 +1916 @@
         log_msg(4, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+
         if (!strlen(tmp)) {
             log_msg(4, "  Partition %s is not used in a non-LVM software raid device", partitions[i]);
-            paranoid_free(tmp);
+            mr_free(tmp);
             continue;
         }
         log_msg (5, "  UUID: %s", tmp);
+
         /* Get the Software raid device list */
         mr_asprintf(command, "%s", "cat /proc/mdstat|grep -iv Personal|awk '{if($0~\"^.*[ ]+:\"){printf(\"/dev/%s \", $1)}}END{print \"\"}'");
         log_msg (5, "  Running: %s", command);
         mr_asprintf(mount_list, "%s", call_program_and_get_last_line_of_output(command));
-        paranoid_free(command);
+        mr_free(command);
+
         log_msg(4, "  Software raid device list: %s", mount_list);
         /* Loop through the software raid device list to see if we can find the partition */
@@ -1993 +1937 @@
             mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
             log_msg(4, "  Running: %s", command);
-            paranoid_free(tmp);
+            mr_free(tmp);
             mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-            paranoid_free(command);
+            mr_free(command);
+
             if (!atoi(tmp)) {
                 log_msg (4,"  Didn't find partition %s in software raid device %s", partitions[i], token);
@@ -2001 +1946 @@
                 if ((DSFptr = find_device_in_list(token)) == NULL) {
                     log_msg (4, "Can't find device %s in mounted file systems list", token);
-                    paranoid_free(tmp);
+                    mr_free(tmp);
                     mr_free(token);
                     return (1);
@@ -2010 +1955 @@
             mr_free(token);
         }
-        paranoid_free(tmp);
-        paranoid_free(mount_list);
+        mr_free(tmp);
+        mr_free(mount_list);
     }
 
@@ -2047 +1992 @@
     return (0);
 }
-
-
-
 
 
@@ -2099 +2041 @@
             log_to_screen("Archiving only the following file systems on %s:", token);
             log_to_screen("==> %s", mounted_on_dsf);
-            strcpy(bkpinfo->include_paths, "/");
+            mr_free(bkpinfo->include_paths);
+            mr_asprintf(bkpinfo->include_paths, "%s", "/");
             if (strlen(not_mounted_on_dsf)) {
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
@@ -2136 +2079 @@
             mr_asprintf(tmp,"|%s|",bkpinfo->include_paths);
             if (strstr(tmp,tmp2) == NULL) {
-                strcat(bkpinfo->include_paths,tmp1);
+                mr_strcat(bkpinfo->include_paths, "%s", tmp1);
             }
             mr_free(tmp1);
@@ -2181 +2124 @@
     char *q = NULL;
     char p[16*MAX_STR_LEN];
-    char *sz_size;
-    char *command;
+    char *sz_size = NULL;
+    char *command = NULL;
     char *compression_type = NULL;
-    char *comment;
-    char *prompt;
+    char *comment = NULL;
     int i;
     FILE *fin;
 
-    malloc_string(sz_size);
-    malloc_string(command);
-    malloc_string(comment);
-    malloc_string(prompt);
     malloc_string(tmp1);
     assert(bkpinfo != NULL);
-    sz_size[0] = '\0';
     bkpinfo->nonbootable_backup = FALSE;
 
@@ -2232 +2169 @@
         setup_scratchdir(tmp);
     }
-    log_msg(3, "media type = %s",
-            bkptype_to_string(bkpinfo->backup_media_type));
+    log_msg(3, "media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
     bkpinfo->cdrw_speed = (bkpinfo->backup_media_type == cdstream) ? 2 : 4;
-    bkpinfo->compression_level =
-        (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
-    bkpinfo->use_lzo =
-        (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
+    bkpinfo->compression_level = (bkpinfo->backup_media_type == cdstream) ? 1 : 5;
+    bkpinfo->use_lzo = (bkpinfo->backup_media_type == cdstream) ? TRUE : FALSE;
     mvaddstr_and_log_it(2, 0, " ");
 
@@ -2253 +2187 @@
         if (archiving_to_media) {
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (ask_me_yes_or_no
-                    ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
-                {
+                if (ask_me_yes_or_no("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) {
                     bkpinfo->manual_cd_tray = TRUE;
                 }
@@ -2263 +2195 @@
                 finish(1);
             }
-            if ((bkpinfo->compression_level =
-                 which_compression_level()) == -1) {
+
+            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            sprintf(comment, "What speed is your %s (re)writer?", mds);
+            mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
             if (bkpinfo->backup_media_type == dvd) {
                 find_dvd_device(bkpinfo->media_device, FALSE);
                 strcpy(tmp1, "1");
-                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 log_msg(1, "Setting to DVD defaults");
             } else {
                 strcpy(bkpinfo->media_device, VANILLA_SCSI_CDROM);
                 strcpy(tmp1, "4");
-                strcpy(sz_size, "650");
+                mr_asprintf(sz_size, "%d", 650);
                 log_msg(1, "Setting to CD defaults");
             }
@@ -2284 +2216 @@
                 if (!popup_and_get_string("Speed", comment, tmp1, 4)) {
                     log_to_screen("User has chosen not to backup the PC");
+                    mr_free(comment);
                     finish(1);
                 }
             }
+            mr_free(comment);
             bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
 
-            sprintf(comment,
-                    "How much data (in Megabytes) will each %s store?", mds);
+            strcpy(tmp1, sz_size);
+            mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
             mr_free(mds);
-            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
+            if (!popup_and_get_string("Size", comment, tmp1, 5)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            mr_asprintf(sz_size, "%s", tmp1);
             bkpinfo->media_size = atoi(sz_size);
+
             if (bkpinfo->media_size <= 0) {
                 log_to_screen("User has chosen not to backup the PC");
@@ -2308 +2244 @@
         if ((bkpinfo->disaster_recovery) && (bkpinfo->backup_media_type != usb)) {
             strcpy(bkpinfo->media_device, "/dev/cdrom");
-            log_msg(2, "CD-ROM device assumed to be at %s",
-                    bkpinfo->media_device);
-        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))
-                   || bkpinfo->backup_media_type == dvd) {
+            log_msg(2, "CD-ROM device assumed to be at %s", bkpinfo->media_device);
+        } else if ((bkpinfo->restore_data && (bkpinfo->backup_media_type != usb))  || bkpinfo->backup_media_type == dvd) {
             if (!bkpinfo->media_device[0]) {
                 strcpy(bkpinfo->media_device, "/dev/cdrom");
             }                   // just for the heck of it :)
-            log_msg(1, "bkpinfo->media_device = %s",
-                    bkpinfo->media_device);
-            if (bkpinfo->backup_media_type == dvd
-                || find_cdrom_device(bkpinfo->media_device, FALSE)) {
-                log_msg(1, "bkpinfo->media_device = %s",
-                        bkpinfo->media_device);
-                sprintf(comment,
-                        "Please specify your %s drive's /dev entry", mds);
-                if (!popup_and_get_string
-                    ("Device?", comment, bkpinfo->media_device,
-                     MAX_STR_LEN / 4)) {
+            log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
+            if (bkpinfo->backup_media_type == dvd || find_cdrom_device(bkpinfo->media_device, FALSE)) {
+                log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
+                mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
+                if (!popup_and_get_string("Device?", comment, bkpinfo->media_device, MAX_STR_LEN / 4)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
@@ -2399 +2327 @@
             } else {
                 if (does_file_exist("/tmp/mondo-restore.cfg")) {
-                    read_cfg_var("/tmp/mondo-restore.cfg", "media-dev",
-                                 bkpinfo->media_device);
+                    read_cfg_var("/tmp/mondo-restore.cfg", "media-dev", bkpinfo->media_device);
                 }
             }
@@ -2455 +2382 @@
                 finish(1);
             }
-            if ((bkpinfo->compression_level =
-                 which_compression_level()) == -1) {
+            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -2468 +2394 @@
         /* Never try to eject a NETFS device */
         bkpinfo->please_dont_eject = TRUE;
+        /*  Force NFS to be the protocol by default */
+        if (bkpinfo->netfs_proto == NULL) {
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
+        }
 
         /* Initiate bkpinfo netfs_mount path from running environment if not already done */
-        if (!bkpinfo->netfs_mount[0]) {
-            strcpy(bkpinfo->netfs_mount,
-                   call_program_and_get_last_line_of_output
-                   ("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        if (!bkpinfo->netfs_mount == NULL) {
+            mr_asprintf(bkpinfo->netfs_mount, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -2484 +2412 @@
                 ("Network shared dir.",
                  "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)",
-                 bkpinfo->netfs_mount, MAX_STR_LEN / 4)) {
+                 p, MAX_STR_LEN / 4)) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
             }
+            mr_free(bkpinfo->netfs_mount);
+            mr_asprintf(bkpinfo->netfs_mount, "%s", p;
             if (!bkpinfo->restore_data) {
                 if ((compression_type = which_compression_type()) == NULL) {
@@ -2493 +2423 @@
                     finish(1);
                 }
-                if ((bkpinfo->compression_level =
-                     which_compression_level()) == -1) {
+
+                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
@@ -2501 +2431 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            strip_spaces(bkpinfo->netfs_mount);
+            mr_strip_spaces(bkpinfo->netfs_mount);
             if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
                 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
@@ -2513 +2443 @@
                 strcpy(tmp1,bkpinfo->netfs_mount);
             }
-            sprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp1);
+            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp1);
             strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output(command));
+            mr_free(command);
 
             if (!bkpinfo->restore_data) {
-                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
-                sprintf(comment,
-                    "How much data (in Megabytes) will each media store?");
-                if (!popup_and_get_string("Size", comment, sz_size, 5)) {
+                mr_sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);   // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                mr_asprintf(comment, "How much data (in Megabytes) will each media store?");
+                strcpy(tmp1, sz_size);
+                mr_free(sz_size);
+                if (!popup_and_get_string("Size", comment, tmp1, 5)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
+                mr_free(comment);
+                mr_asprintf(sz_size, "%s", tmp1);
             } else {
-                strcpy(sz_size, "0");
+                mr_asprintf(sz_size, "0");
             }
             bkpinfo->media_size = atoi(sz_size);
+            mr_free(sz_size);
+
             if (bkpinfo->media_size < 0) {
                 log_to_screen("User has chosen not to backup the PC");
@@ -2533 +2469 @@
             }
         }
-        /*  Force NFS to be the protocol by default */
-        if (bkpinfo->netfs_proto == NULL) {
-            mr_asprintf(bkpinfo->netfs_proto, "nfs");
-        }
         if (bkpinfo->disaster_recovery) {
-            sprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
+            mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
             paranoid_system(command);
+            mr_free(command);
+
         }
         strcpy(tmp1, bkpinfo->netfs_proto);
-        if (!popup_and_get_string
-            ("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",
-             tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -2550 +2482 @@
         mr_free(bkpinfo->netfs_proto);
         mr_asprintf(bkpinfo->netfs_proto, "%s", tmp1);
-        if (!popup_and_get_string
-            ("Network share", "Which remote share should I mount?",
-             bkpinfo->netfs_mount, MAX_STR_LEN)) {
+
+        strcpy(tmp1, bkpinfo->netfs_mount);
+        if (!popup_and_get_string("Network share", "Which remote share should I mount?", tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", tmp1);
 
         if (bkpinfo->netfs_user) {
@@ -2562 +2496 @@
             strcpy(tmp1, "");
         }
-        if (!popup_and_get_string
-            ("Network user", "Which user should I use if any ?",
-             tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -2575 +2507 @@
         /* Initiate bkpinfo isodir path from running environment if mount already done */
         if (is_this_device_mounted(bkpinfo->netfs_mount)) {
-            strcpy(bkpinfo->isodir,
-                   call_program_and_get_last_line_of_output
-                   ("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
+            strcpy(bkpinfo->isodir, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f3 | head -n1"));
         } else {
             sprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
-            sprintf(command, "mkdir -p %s", bkpinfo->isodir);
+            mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
+            mr_free(command);
 
             if (bkpinfo->restore_data) {
@@ -2615 +2546 @@
         }
         if (!is_this_device_mounted(bkpinfo->netfs_mount)) {
-            popup_and_OK
-                ("Please mount that partition before you try to backup to or restore from it.");
+            popup_and_OK("Please mount that partition before you try to backup to or restore from it.");
             finish(1);
         }
@@ -2640 +2570 @@
         log_msg(3, "prefix set to %s", bkpinfo->prefix);
 
-        log_msg(3, "Just set netfs_remote_dir to %s",
-                bkpinfo->netfs_remote_dir);
+        log_msg(3, "Just set netfs_remote_dir to %s", bkpinfo->netfs_remote_dir);
         log_msg(3, "isodir is still %s", bkpinfo->isodir);
         break;
@@ -2659 +2588 @@
                     finish(1);
                 }
-                if ((bkpinfo->compression_level =
-                     which_compression_level()) == -1) {
+                if ((bkpinfo->compression_level = which_compression_level()) == -1) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                sprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                sprintf(tmp1, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
                 if (!popup_and_get_string
                     ("ISO size.",
                      "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s (700) or DVD's (4480) you plan to backup to.",
-                     sz_size, 16)) {
+                     tmp1, 16)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                bkpinfo->media_size = atoi(sz_size);
+                bkpinfo->media_size = atoi(tmp1);
             } else {
                 bkpinfo->media_size = 650;
@@ -2723 +2651 @@
                 finish(1);
             }
-            if (does_string_exist_in_boot_block
-                (bkpinfo->boot_device, "LILO")) {
+            if (does_string_exist_in_boot_block(bkpinfo->boot_device, "LILO")) {
                 i = 'L';
             } else
-                if (does_string_exist_in_boot_block
-                    (bkpinfo->boot_device, "ELILO")) {
+                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "ELILO")) {
                 i = 'E';
             } else
-                if (does_string_exist_in_boot_block
-                    (bkpinfo->boot_device, "GRUB")) {
+                if (does_string_exist_in_boot_block(bkpinfo->boot_device, "GRUB")) {
                 i = 'G';
             } else {
@@ -2739 +2664 @@
 #endif
             if (i == 'U') {
-                if (ask_me_yes_or_no
-                    ("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?"))
-                {
+                if (ask_me_yes_or_no("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")) {
                     i = 'R';    // raw
                 } else {
-                    log_to_screen
-                        ("I cannot find your boot loader. Please run mondoarchive with parameters.");
+                    log_to_screen("I cannot find your boot loader. Please run mondoarchive with parameters.");
                     finish(1);
                 }
@@ -2751 +2673 @@
         }
         bkpinfo->boot_loader = i;
-        strcpy(bkpinfo->include_paths, "/");
+
+        mr_free(bkpinfo->include_paths);
+        strcpy(tmp1, "/");
         if (!popup_and_get_string
             ("Backup paths",
              "Please enter paths (separated by '|') which you want me to backup. The default is '/' (i.e. everything).",
-             bkpinfo->include_paths, MAX_STR_LEN)) {
+             tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
+        mr_asprintf(bkpinfo->include_paths, "%s", tmp1);
+
         tmp = list_of_NETFS_mounts_only();
         if (strlen(tmp) > 2) {
@@ -2815 +2741 @@
         if (ask_me_yes_or_no("Do you want to backup extended attributes?")) {
             if (find_home_of_exe("getfattr")) {
+                mr_free(g_getfattr);
                 mr_asprintf(g_getfattr,"getfattr");
             }
             if (find_home_of_exe("getfacl")) {
+                mr_free(g_getfacl);
                 mr_asprintf(g_getfacl,"getfacl");
             }
@@ -2835 +2763 @@
             strcpy(bkpinfo->zip_exe, "gzip");
             strcpy(bkpinfo->zip_suffix, "gz");
-        //} else if (strcmp(compression_type,"lzma") == 0) {
+        } else if (strcmp(compression_type,"lzma") == 0) {
             //strcpy(bkpinfo->zip_exe, "xy");
             //strcpy(bkpinfo->zip_suffix, "xy");
@@ -2849 +2777 @@
             ("Will you want to verify your backups after Mondo has created them?");
 
-#ifndef __FreeBSD__
-        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."))
-#endif
-        {
-            strcpy(bkpinfo->kernel_path, "FAILSAFE");
-        }
-
         if (!ask_me_yes_or_no
             ("Are you sure you want to proceed? Hit 'no' to abort.")) {
@@ -2875 +2795 @@
 #else
     if (bkpinfo->backup_media_type == netfs) {
-        log_msg(3, "I think the Remote mount is mounted at %s",
-                bkpinfo->isodir);
+        log_msg(3, "I think the Remote mount is mounted at %s", bkpinfo->isodir);
     }
     log_it("isodir = %s", bkpinfo->isodir);
-    log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    if (bkpinfo->netfs_mount) {
+        log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    }
+    if (bkpinfo->netfs_user) {
+        log_it("netfs_user = '%s'", bkpinfo->netfs_user);
+    }
     if (bkpinfo->netfs_proto) {
         log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
-    }
-    if (bkpinfo->netfs_user) {
-        log_it("netfs_user = '%s'", bkpinfo->netfs_user);
     }
 #endif
@@ -2891 +2812 @@
     log_it("media size = %ld", bkpinfo->media_size);
     log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
-    log_it("prefix = %s", bkpinfo->prefix);
+    if (bkpinfo->prefix) {
+        log_it("prefix = %s", bkpinfo->prefix);
+    }
     log_it("compression = %ld", bkpinfo->compression_level);
     log_it("exclude_path = %s", bkpinfo->exclude_paths);
@@ -2897 +2820 @@
 
     /* Handle devices passed in bkpinfo and print result */
-    /*  the mr_make_devlist_from_pathlist function appends 
-     *  to the *_paths variables so copy before */
+    /*  the mr_make_devlist_from_pathlist function appends
+    /*  to the *_paths variables so copy before */
     mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
     mr_make_devlist_from_pathlist(bkpinfo->include_paths, 'I');
@@ -2904 +2827 @@
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);
     log_it("tmpdir = '%s'", bkpinfo->tmpdir);
-    log_it("image_devs = '%s'", bkpinfo->image_devs);
-    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
-           bkpinfo->boot_loader);
+    if (bkpinfo->image_devs) {
+        log_it("image_devs = '%s'", bkpinfo->image_devs);
+    }
+    log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device, bkpinfo->boot_loader);
     if (bkpinfo->media_size < 0) {
         if (archiving_to_media) {
@@ -2917 +2841 @@
     paranoid_free(sz_size);
     paranoid_free(tmp1);
-    paranoid_free(command);
-    paranoid_free(comment);
-    paranoid_free(prompt);
     return (0);
 }
@@ -3170 +3091 @@
 
     malloc_string(current_drive);
+
+    /* UEFI is not supported here - but should be managed as a BIOS/UEFI option not a Boot Loader one per se */
 
 #ifdef __IA64__

branches/3.2/mondo/src/common/libmondo-fifo.c

@@ -85 +85 @@
     wise_upper_limit = (am_I_in_disaster_recovery_mode()? 8 : 32);
     wise_lower_limit = 1;       // wise_upper_limit/2 + 1;
-    paranoid_system("sync");
+    sync();
     for (bufsize = wise_upper_limit, res = -1;
          res != 0 && bufsize >= wise_lower_limit; bufsize--) {
-        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');
+        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);
         mr_free(tmp);
@@ -96 +94 @@
     if (!res) {
         bufsize++;
-        mr_asprintf(tmp, "Negotiated max buffer of %d MB ", bufsize);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen(tmp, "Negotiated max buffer of %d MB ", bufsize);
     } else {
         bufsize = 0;
@@ -166 +162 @@
         return;
     }
-    paranoid_system("sync");
+    sync();
     mr_asprintf(command, "ps %s | grep -F \"%s\" | grep -Fv grep | awk '{print $2;}' | grep -v PID | head -1", ps_options, g_sz_call_to_buffer);
     log_msg(2, "kill_buffer() --- command = %s", command);

branches/3.2/mondo/src/common/libmondo-filelist.c

@@ -86 +86 @@
 
     /*@ pointers ********************** */
-    char *ptr;
+    char *ptr = NULL;
     FILE *fout;
 
@@ -116 +116 @@
     mr_free(tempfile);
 
-    log_it(bkpinfo->image_devs);
-
-    ptr = bkpinfo->image_devs;
-
-    malloc_string(dev);
-    while (ptr && *ptr) {
-        strcpy(dev, ptr);
-        log_it("Examining imagedev %s", dev);
-        for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
-        dev[i] = '\0';
-        if (!strlen(dev)) {
-            continue;
-        }
-        fprintf(fout, "%s\n", dev);
-        log_it("Adding '%s' to biggielist", dev);
-        if ((ptr = strchr(ptr, ' '))) {
-            ptr++;
+    if (bkpinfo->image_devs) {
+        log_it("image_devs : %s", bkpinfo->image_devs);
+
+        ptr = bkpinfo->image_devs;
+
+        while (ptr && *ptr) {
+            mr_asprintf(dev, "%s", ptr);
+            log_it("Examining imagedev %s", dev);
+            for (i = 0; i < (int) strlen(dev) && dev[i] != ' '; i++);
+            dev[i] = '\0';
+            if (!strlen(dev)) {
+                mr_free(dev);
+                continue;
+            }
+            fprintf(fout, "%s\n", dev);
+            log_it("Adding '%s' to biggielist", dev);
+            if ((ptr = strchr(ptr, ' '))) {
+                ptr++;
+            }
+            mr_free(dev);
         }
     }
@@ -138 +141 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
 
-    paranoid_free(dev);
     return (retval);
 }
@@ -158 +160 @@
 
     mr_asprintf(tmp_fname, "%s/sortfile", bkpinfo->tmpdir);
-
     mr_asprintf(command, "sort %s > %s 2>> %s", orig_fname, tmp_fname, MONDO_LOGFILE);
     retval = system(command);
@@ -331 +332 @@
 
     if (curr_set_no == 0) {
-        mr_asprintf(tmp, "Only one fileset. Fine.");
+        log_msg(1, "Only one fileset. Fine.");
     } else {
-        mr_asprintf(tmp, "Filelist divided into %ld sets", curr_set_no + 1);
-    }
-    log_msg(1, tmp);
-    mr_free(tmp);
+        log_msg(1, "Filelist divided into %ld sets", curr_set_no + 1);
+    }
     close_evalcall_form();
     /* This is to work around an obscure bug in Newt; open a form, close it,
@@ -342 +341 @@
        then update_progress_form() won't show the "time taken / time remaining"
        line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
-#ifndef _XWIN
     if (!g_text_mode) {
         open_progress_form("", "", "", "", 100);
@@ -349 +347 @@
         newtPopWindow();
     }
-#endif
     return (err ? 0 : curr_set_no + 1);
 }
@@ -410 +407 @@
 int call_exe_and_pipe_output_to_fd(char *syscall, FILE * pout)
 {
-    FILE *pattr;
-    char *tmp;
-    char *p;
+    FILE *pattr = NULL;
+    char *tmp = NULL;
 
     pattr = popen(syscall, "r");
@@ -424 +420 @@
         return (2);
     }
-    malloc_string(tmp);
-    for (p = fgets(tmp, MAX_STR_LEN, pattr); !feof(pattr) && (p != NULL);
-         p = fgets(tmp, MAX_STR_LEN, pattr)) {
+    for (mr_getline(tmp, pattr); !feof(pattr); mr_getline(tmp, pattr)) {
         fputs(tmp, pout);
-    }
+        mr_free(tmp);
+    }
+    mr_free(tmp);
     paranoid_pclose(pattr);
-    paranoid_free(tmp);
     return (0);
 }
@@ -439 +434 @@
                  char *auxlist_fname)
 {
-    FILE *fin;
-    FILE *pout;
+    FILE *fin = NULL;
+    FILE *pout = NULL;
     char *pout_command = NULL;
-    char *syscall;
-    char *file_to_analyze;
+    char *syscall = NULL;
+    char *file_to_analyze = NULL;
     char *strtmp = NULL;
     char *tmp = NULL;
-    char *p = NULL;
     int i;
 
@@ -462 +456 @@
     mr_free(pout_command);
 
-    malloc_string(file_to_analyze);
-    for (p = fgets(file_to_analyze, MAX_STR_LEN, fin); !feof(fin) && (p != NULL);
-         p = fgets(file_to_analyze, MAX_STR_LEN, fin)) {
+    for (mr_getline(file_to_analyze, fin); !feof(fin); mr_getline(file_to_analyze, fin)) {
         i = strlen(file_to_analyze);
         if (i > 0 && file_to_analyze[i - 1] < 32) {
@@ -472 +464 @@
         tmp = mr_stresc(file_to_analyze, "'", '\\', '\'');
         mr_asprintf(syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);    // " MONDO_LOGFILE);
-        paranoid_free(tmp);
+        mr_free(tmp);
         log_msg(20,"calling %s\n",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
-        paranoid_free(syscall);
-    }
+        mr_free(syscall);
+        mr_free(file_to_analyze);
+    }
+    mr_free(file_to_analyze);
     paranoid_fclose(fin);
     paranoid_pclose(pout);
-    paranoid_free(file_to_analyze);
     return (0);
 }
@@ -522 +515 @@
     char *syscall_pin = NULL;
     char *syscall_pout = NULL;
-    char *incoming;
-    char *current_subset_file, *current_master_file;
+    char *incoming = NULL;
+    char *current_subset_file = NULL;
+    char *current_master_file = NULL;
     char *masklist = NULL;
     int retval = 0;
     int i;
-    char *p, *q, *r;
+    char *p, *q;
     char *tmp = NULL;
     FILE *pin, *pout, *faclin;
 
-    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist,
-            original_exat_fname, executable);
+    log_msg(1, "set_EXAT_list(%s, %s, %s)", orig_msklist, original_exat_fname, executable);
     if (!orig_msklist || !orig_msklist[0]
         || !does_file_exist(orig_msklist)) {
@@ -552 +545 @@
     }
     if (length_of_file(original_exat_fname) <= 0) {
-        log_msg(1,
-                "original_exat_fname %s is empty or missing, so no need to set EXAT list",
-                original_exat_fname);
+        log_msg(1, "original_exat_fname %s is empty or missing, so no need to set EXAT list", original_exat_fname);
         return (0);
     }
-    malloc_string(incoming);
-    malloc_string(current_subset_file);
-    malloc_string(current_master_file);
     mr_asprintf(masklist, "%s/masklist", bkpinfo->tmpdir);
     mr_asprintf(command, "cp -f %s %s", orig_msklist, masklist);
@@ -566 +554 @@
 
     sort_file(masklist);
-    current_subset_file[0] = current_master_file[0] = '\0';
 
     mr_asprintf(syscall_pout, "%s --restore - 2>> %s", executable, MONDO_LOGFILE);
@@ -599 +586 @@
 //  printf("Hi there. Starting the loop\n");
 
-    r = fgets(current_subset_file, MAX_STR_LEN, faclin);
-    r = fgets(incoming, MAX_STR_LEN, pin);
-    while (!feof(pin) && !feof(faclin) && (r != NULL)) {
-//      printf("incoming = %s", incoming);
-
-        strcpy(current_master_file, incoming + 8);
+    mr_getline(current_subset_file, faclin);
+    mr_getline(incoming, pin);
+    while (!feof(pin) && !feof(faclin)) {
+        mr_asprintf(current_master_file, "%s", incoming + 8);
 
         p = current_subset_file;
@@ -632 +617 @@
         if (i < 0) {            // read another subset file in.
             log_msg(my_depth, "Reading next subset line in\n\n");
-            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
+            mr_free(current_subset_file);
+            mr_getline(current_subset_file, faclin);
             continue;
         }
@@ -639 +625 @@
             fputs(incoming, pout);
         }
-        r = fgets(incoming, MAX_STR_LEN, pin);
+        mr_free(incoming);
+        mr_getline(incoming, pin);
         if (!i) {
             log_msg(my_depth, "Copying master %s", q);
         }
-//      if (!i) { printf("Match --- %s\n", q); }
 
         while (!feof(pin) && strncmp(incoming, "# file: ", 8)) {
             if (!i) {
-
-//    printf("%s", incoming);
-
                 fputs(incoming, pout);
             }
-            r = fgets(incoming, MAX_STR_LEN, pin);
+            mr_free(incoming);
+            mr_getline(incoming, pin);
         }
         if (!i) {
-            r = fgets(current_subset_file, MAX_STR_LEN, faclin);
-        }
-    }
-    while (!feof(pin)) {
-        r = fgets(incoming, MAX_STR_LEN, pin);
-    }
+            mr_free(current_subset_file);
+            mr_getline(current_subset_file, faclin);
+        }
+        mr_free(current_master_file);
+    }
+    mr_free(current_subset_file);
+    mr_free(incoming);
     fclose(faclin);
     pclose(pin);
     pclose(pout);
 
-//  printf("OK, loop is done\n");
-
     unlink(masklist);
     mr_free(masklist);
 
-    paranoid_free(current_subset_file);
-    paranoid_free(current_master_file);
-    paranoid_free(incoming);
     return (retval);
 }
@@ -770 +750 @@
     noof_chars = strlen(string_to_add) + 1; /* we include the '\0' */
 
-/* walk across tree if necessary */
+    /* walk across tree if necessary */
     node = startnode;
     char_to_add = string_to_add[0];
@@ -779 +759 @@
     }
 
-/* walk down tree if appropriate */
+    /* walk down tree if appropriate */
     if (node->down != NULL && node->ch == char_to_add) {
         log_msg(7, "depth=%d char=%c --- going DOWN", depth, char_to_add);
@@ -793 +773 @@
     }
 
-/* add here */
+    /* add here */
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
         log_to_screen("failed to malloc");
@@ -864 +844 @@
     /*@ buffers **************************************************** */
     char *command_to_open_fname = NULL;
-    char fname[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
+    char *fname = NULL;
+    char *tmp = NULL;
     char *tmp1 = NULL;
     int pos_in_fname;
@@ -911 +891 @@
 
     open_evalcall_form("Loading filelist from disk");
-    for (tmp1 = fgets(fname, MAX_STR_LEN, pin); !feof(pin);
-         tmp1 = fgets(fname, MAX_STR_LEN, pin)) {
-        if (((fname[strlen(fname) - 1] == 13) || (fname[strlen(fname) - 1] == 10)) && (strlen(fname) > 0)) {
+    for (mr_getline(fname, pin); !feof(pin); mr_getline(fname, pin)) {
+        if ((strlen(fname) > 0) && (fname[strlen(fname) - 1] == 13 || fname[strlen(fname) - 1] == 10)) {
             fname[strlen(fname) - 1] = '\0';
         }
-//      strip_spaces (fname);
         if (!strlen(fname)) {
+            mr_free(fname);
             continue;
         }
@@ -924 +903 @@
                 continue;
             }
-            strcpy(tmp, fname);
+            mr_asprintf(tmp, "%s", fname);
             tmp[pos_in_fname] = '\0';
             if (strlen(tmp)) {
                 add_string_at_node(filelist, tmp);
             }
+            mr_free(tmp);
         }
         add_string_at_node(filelist, fname);
+
         if (!(++lino % 1111)) {
             percentage = (int) (lino * 100 / lines_in_filelist);
             update_evalcall_form(percentage);
         }
-    }
+        mr_free(fname);
+    }
+    mr_free(fname);
+
     paranoid_pclose(pin);
     close_evalcall_form();
@@ -1297 +1281 @@
 
 
-
-
 /**
  * Number of entries in the skeleton filelist.
@@ -1314 +1296 @@
  * @bug Return value should be @c void.
  */
-int open_and_list_dir(char *dir1, char *sth, FILE * fout,
-                      time_t time_of_last_full_backup)
-{
+int open_and_list_dir(char *dir1, char *sth, FILE * fout, time_t time_of_last_full_backup) {
+
     const char delims[] = "|";
 
@@ -1323 +1304 @@
     struct stat statbuf;
     char *new;
-    char *tmp;
+    char *tmp = NULL;
     char *dir = NULL;
     static int percentage = 0;
-    char *skip_these;
+    char *skip_these = NULL;
     char *new_with_pipe;
     char *strtmp = NULL;
     char *token = NULL;
     char *find_excludes = NULL;
-    static char *name_of_evalcall_form;
+    char *name_of_evalcall_form = NULL;
+    char *find_skeleton_marker = NULL;
     int i;
     int lastpos = 0;
@@ -1338 +1320 @@
     static int counter = 0;
     static int uberctr = 0;
-    static char *find_skeleton_marker;
-    static long skeleton_lino = 0;
-    static time_t last_time = 0;
+    static long skeleton_lino = 0L;
+    static time_t last_time = (time_t)0;
     time_t this_time;
 
@@ -1355 +1336 @@
 
     if (!depth) {
-        malloc_string(name_of_evalcall_form);
-        malloc_string(find_skeleton_marker);
         while((token = mr_strtok(sth, delims, &lastpos)) != NULL) {
           mr_strcat(find_excludes," -path %s -prune -o", token);
@@ -1375 +1354 @@
         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, g_skeleton_filelist);
 #endif
-        paranoid_free(find_excludes);
+        mr_free(find_excludes);
+
         log_msg(5, "find command = %s", strtmp);
         paranoid_system(strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
+
         mr_asprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
-        g_skeleton_entries =
-            1 + atol(call_program_and_get_last_line_of_output(tmp));
-        paranoid_free(tmp);
-        sprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
+        g_skeleton_entries = 1 + atol(call_program_and_get_last_line_of_output(tmp));
+        mr_free(tmp);
+
+        mr_asprintf(name_of_evalcall_form, "Making catalog of %s", dir1);
         open_evalcall_form(name_of_evalcall_form);
-        find_skeleton_marker[0] = '\0';
+        mr_free(name_of_evalcall_form);
+
         skeleton_lino = 1;
         log_msg(5, "entries = %ld", g_skeleton_entries);
@@ -1391 +1373 @@
     } else if (depth <= MAX_SKEL_DEPTH) // update evalcall form if appropriate
     {
-        sprintf(find_skeleton_marker,
-                "grep -Fv '%s' %s > %s.new 2> /dev/null", dir,
-                g_skeleton_filelist, g_skeleton_filelist);
-//    log_msg(0, "fsm = %s", find_skeleton_marker);
+        mr_asprintf(find_skeleton_marker, "grep -Fv '%s' %s > %s.new 2> /dev/null", dir, g_skeleton_filelist, g_skeleton_filelist);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-//        log_msg(5, "Found %s", dir);
-//        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
-            sprintf(find_skeleton_marker, "mv -f %s.new %s",
-                    g_skeleton_filelist, g_skeleton_filelist);
-//        log_msg(6, "fsm = %s", find_skeleton_marker);
+            mr_free(find_skeleton_marker);
+
+            mr_asprintf(find_skeleton_marker, "mv -f %s.new %s", g_skeleton_filelist, g_skeleton_filelist);
             paranoid_system(find_skeleton_marker);
             time(&this_time);
             if (this_time != last_time) {
                 last_time = this_time;
-#ifndef _XWIN
                 if (!g_text_mode) {
                     int cols, rows;
@@ -1415 +1391 @@
                     mr_free(tmp);
                 }
-#endif
                 update_evalcall_form(percentage);
             }
         }
+        mr_free(find_skeleton_marker);
     }
 
@@ -1430 +1406 @@
         mr_asprintf(tmp,"opendir %s", dir1);
         log_OS_error(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
     } else if (strstr(skip_these, new_with_pipe)) {
         log_msg(10, "Found dir ***%s**** excluded", dir1);
@@ -1444 +1420 @@
                 mr_asprintf(new,"%s%s",dir1,dit->d_name);
             }
-            paranoid_free(new_with_pipe);
+            mr_free(new_with_pipe);
             mr_asprintf(new_with_pipe, "|%s|", new);
             if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
                 log_msg(10, "Found child dir ***%s**** excluded", new);
-                paranoid_free(new_with_pipe);
+                mr_free(new_with_pipe);
             } else {
-                paranoid_free(new_with_pipe);
+                mr_free(new_with_pipe);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
                         && S_ISDIR(statbuf.st_mode)) {
                         log_msg(10, "Found child dir ***%s**** parsed", new);
-                        open_and_list_dir(new, skip_these, fout,
-                                          time_of_last_full_backup);
+                        open_and_list_dir(new, skip_these, fout, time_of_last_full_backup);
                     } else {
-                        if (time_of_last_full_backup == 0
-                            || time_of_last_full_backup <
-                            statbuf.st_ctime) {
+                        if (time_of_last_full_backup == 0 || time_of_last_full_backup < statbuf.st_ctime) {
                             log_msg(10, "Found child file ***%s**** parsed", new);
                             fprintf(fout, "%s\n", new);
@@ -1468 +1441 @@
                                 uberctr++;
                                 mr_asprintf(tmp, " %c ", special_dot_char(uberctr));
-#ifndef _XWIN
                                 if (!g_text_mode) {
-                                    newtDrawRootText(77, g_noof_rows - 3,
-                                                     tmp);
+                                    newtDrawRootText(77, g_noof_rows - 3, tmp);
                                     newtRefresh();
                                 }
-#endif
-                                paranoid_free(tmp);
+                                mr_free(tmp);
                             }
                         }
@@ -1481 +1451 @@
                 }
             }
-            paranoid_free(new);
-        }
-    }
-    paranoid_free(new_with_pipe);
-    paranoid_free(skip_these);
+            mr_free(new);
+        }
+    }
+    mr_free(new_with_pipe);
+    mr_free(skip_these);
     mr_free(dir);
 
@@ -1496 +1466 @@
     if (!depth) {
         close_evalcall_form();
-        paranoid_free(name_of_evalcall_form);
-        paranoid_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
@@ -1525 +1493 @@
     char *p, *q;
     char *sz_datefile;
-    char *sz_filelist, *tmp;
+    char *sz_filelist;
     char *exclude_paths = NULL;
     FILE *fout;
@@ -1534 +1502 @@
     char *tmp2 = NULL;
 
-    malloc_string(tmp);
-    malloc_string(g_skeleton_filelist);
     mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
-        fatal_error
-            ("Please supply either include_paths or userdef_filelist");
-    }
-// make hole for filelist
+        fatal_error("Please supply either include_paths or userdef_filelist");
+    }
+    // make hole for filelist
     mr_asprintf(command, "mkdir -p %s/archives", scratchdir);
     paranoid_system(command);
@@ -1557 +1522 @@
         // backup last known good datefile just in case :)
         if (does_file_exist(sz_datefile)) {
-            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile,
-                    sz_datefile);
+            mr_asprintf(command, "mv -f %s %s.aborted", sz_datefile, sz_datefile);
             paranoid_system(command);
             mr_free(command);
@@ -1567 +1531 @@
                                   ("date +%s"));
     } else if (lstat(sz_datefile, &statbuf)) {
-        log_msg(2,
-                "Warning - unable to find date of previous backup. Full backup instead.");
+        log_msg(2, "Warning - unable to find date of previous backup. Full backup instead.");
         differential = 0;
         time_of_last_full_backup = 0;
@@ -1579 +1542 @@
 // use user-specified filelist (if specified)
     if (userdef_filelist) {
-        log_msg(1,
-                "Using the user-specified filelist - %s - instead of calculating one",
-                userdef_filelist);
+        log_msg(1, "Using the user-specified filelist - %s - instead of calculating one", userdef_filelist);
         mr_asprintf(command, "cp -f %s %s", userdef_filelist, sz_filelist);
         if (run_program_and_log_output(command, 3)) {
@@ -1589 +1550 @@
         mr_free(command);
     } else {
-        log_msg(2, "include_paths = '%s'", include_paths);
+        if (include_paths) {
+            log_msg(2, "include_paths = '%s'", include_paths);
+        }
         log_msg(1, "Calculating filelist");
         mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
@@ -1597 +1560 @@
             log_msg(2, "Found windows FS: %s",tmp2);
             mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
-            paranoid_free(tmp2);
+            mr_free(tmp2);
             mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
             log_msg(2, "Found windows files: %s",tmp2);
         }
-        paranoid_free(tmp1);
+        mr_free(tmp1);
 
         mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/run|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
@@ -1607 +1570 @@
             mr_strcat(exclude_paths,"|%s",excp);
         }
-        paranoid_free(tmp2);
+        mr_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2,
-                "Generating skeleton filelist so that we can track our progress");
-        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
+        log_msg(2, "Generating skeleton filelist so that we can track our progress");
+        mr_asprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(g_skeleton_filelist);
+
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
         log_msg(2, "Opening out filelist to %s", sz_filelist);