Changeset 3191 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c

Timestamp:

Sep 25, 2013, 8:55:45 AM (11 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 !

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (112 diffs)

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__