Changeset 3192 in MondoRescue for branches/3.0/mondo/src/common/libmondo-devices.c

Timestamp:

Sep 25, 2013, 9:03:25 AM (11 years ago)

Author:

Bruno Cornec

Message:

• revert r3188 & r3189 as I started to work on branch 3.0 before deciding it was much better to do it in 3.2. This will allow some small maintenance work on 3.0 if needed, while pushing all the rest to 3.2 and providing early access to it.

File:

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

branches/3.0/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__
@@ -129 +127 @@
 {
     char *tmp = NULL;
+    char *comment;
     bool is_this_a_ramdisk = FALSE;
 
+    malloc_string(comment);
     mr_asprintf(tmp, "%s", where_is_root_mounted());
-    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);
+    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);
 
 #ifdef __FreeBSD__
@@ -153 +156 @@
     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;
         }
@@ -160 +164 @@
         is_this_a_ramdisk = TRUE;
     }
-
-    log_msg(1, "Is this a ramdisk? result = %s", (is_this_a_ramdisk) ? "TRUE" : "FALSE");
+    paranoid_free(comment);
+    log_msg(1, "Is this a ramdisk? result = %d", is_this_a_ramdisk);
     return (is_this_a_ramdisk);
 }
@@ -225 +229 @@
 int eject_device(char *dev)
 {
-    char *command = NULL;
+    char *command;
     int res1 = 0, res2 = 0;
 
-    if (dev == NULL) {
-        return (1);
-    }
+    malloc_string(command);
 
     if (IS_THIS_A_STREAMING_BACKUP(g_backup_media_type)
         && g_backup_media_type != udev) {
-        mr_asprintf(command, "mt -f %s offline", dev);
+        sprintf(command, "mt -f %s offline", dev);
         res1 = run_program_and_log_output(command, 1);
-        mr_free(command);
     } else {
         res1 = 0;
@@ -243 +244 @@
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        mr_asprintf(command, "cdcontrol -f %s eject", dev);
+        sprintf(command, "cdcontrol -f %s eject", dev);
     } else {
-        mr_asprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`", dev);
+        sprintf(command, "camcontrol eject `echo %s | sed 's|/dev/||'`",
+                dev);
     }
 #else
-    mr_asprintf(command, "eject %s", dev);
+    sprintf(command, "eject %s", dev);
 #endif
 
     log_msg(3, "Ejecting %s", dev);
     res2 = run_program_and_log_output(command, 1);
-    mr_free(command);
+    paranoid_free(command);
     if (res1 && res2) {
         return (1);
@@ -268 +270 @@
 int inject_device(char *dev)
 {
-    char *command = NULL;
+    char *command;
     int i;
 
-    if (dev == NULL) {
-        return (1);
-    }
+    malloc_string(command);
+
 
 #ifdef __FreeBSD__
     if (strstr(dev, "acd")) {
-        mr_asprintf(command, "cdcontrol -f %s close", dev);
+        sprintf(command, "cdcontrol -f %s close", dev);
     } else {
-        mr_asprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`", dev);
+        sprintf(command, "camcontrol load `echo %s | sed 's|/dev/||'`",
+                dev);
     }
 #else
-    mr_asprintf(command, "eject -t %s", dev);
+    sprintf(command, "eject -t %s", dev);
 #endif
     i = run_program_and_log_output(command, FALSE);
-    mr_free(command);
+    paranoid_free(command);
     return (i);
 }
@@ -299 +301 @@
 
     /*@ buffers *********************************************************** */
-    char *tmp = NULL;
+    char *tmp;
     bool ret;
 
+    malloc_string(tmp);
     assert_string_is_neither_NULL_nor_zerolength(device);
 
-    mr_asprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
+    sprintf(tmp, "ls %s > /dev/null 2> /dev/null", device);
 
     if (system(tmp)) {
@@ -311 +314 @@
         ret = TRUE;
     }
-    mr_free(tmp);
+    paranoid_free(tmp);
     return (ret);
 }
@@ -342 +345 @@
 {
     /*@ buffers **************************************************** */
-    char *program = NULL;
-    char *incoming = NULL;
+    char *program;
+    char *incoming;
     char *searchstr = NULL;
+    char *tmp;
+    char *p;
 
     /*@ ints ******************************************************* */
@@ -351 +356 @@
     /*@ pointers *************************************************** */
     FILE *fin;
+
 
     /*@ end vars *************************************************** */
@@ -356 +362 @@
     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.)
-    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);
+    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);
     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, mr_getline(incoming, fin); !res && !feof(fin) ; mr_getline(incoming, fin)) {
+    for (res = 0; !res && (p = fgets(incoming, MAX_STR_LEN - 1, 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);
 }
@@ -406 +413 @@
 {
     /*@ buffers **************************************************** */
-    char *command = NULL;
+    char *command;
 
     /*@ end vars *************************************************** */
@@ -414 +421 @@
     assert_string_is_neither_NULL_nor_zerolength(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);
+    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);
     i = system(command);
-    mr_free(command);
+    paranoid_free(command);
     if (i) {
         return (FALSE);
@@ -435 +444 @@
 {
     /*@ buffers **************************************************** */
-    char *command = NULL;
+    char *command;
     /*@ end vars *************************************************** */
     int i;
 
-    mr_asprintf(command, "dd if=%s bs=512 count=%i 2> /dev/null | strings | grep \"%s\" > /dev/null 2> /dev/null", dev, n, str);
+    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);
     i = system(command);
-    mr_free(command);
+    paranoid_free(command);
     if (i) {
         return (FALSE);
@@ -454 +466 @@
  * 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 = NULL;
+    char *dev;
 
     /*@ end vars **************************************************** */
@@ -519 +532 @@
 {
     /*@ buffers ************************ */
+    char *comment;
     char *tmp = NULL;
     char *cdr_exe = NULL;
-    char *command = NULL;
-
+    char *command;
+
+    malloc_string(comment);
+    malloc_string(command);
     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?");
+        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);
         return (1);
     }
@@ -539 +560 @@
     }
     if (find_home_of_exe(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);
+        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(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);
-        log_it("Found CDRW device - %s", cdrw_device);
+        sprintf(comment, "Found CDRW device - %s", cdrw_device);
+        log_it(comment);
         strcpy(g_cdrw_drive_is_here, cdrw_device);
+        paranoid_free(comment);
         mr_free(tmp);
         mr_free(cdr_exe);
+        paranoid_free(command);
         return (0);
     }
 }
+
+
 
 
@@ -580 +609 @@
 
     /*@ buffers ***************************************************** */
-    char *tmp = NULL;
+    char *tmp;
     char *tmp1 = NULL;
     char *cdr_exe = NULL;
     char *phrase_one;
-    char *phrase_two = NULL;
-    char *command = NULL;
-#ifndef __FreeBSD__
-    char *dvd_last_resort = NULL;
-#endif
-    char *mountpoint = NULL;
+    char *phrase_two;
+    char *command;
+    char *dvd_last_resort;
+    char *mountpoint;
     static char the_last_place_i_found_it[MAX_STR_LEN] = "";
 
@@ -595 +622 @@
     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 **************************************************** */
@@ -610 +642 @@
     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;
@@ -637 +671 @@
     }
 
-    mr_asprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
+    sprintf(command, "%s -scanbus 2> /dev/null", cdr_exe);
     fin = popen(command, "r");
     if (!fin) {
@@ -643 +677 @@
         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)) {
@@ -665 +696 @@
                         }
                         *q = '\0';
-                        mr_asprintf(phrase_two, "%s", p);
+                        strcpy(phrase_two, p);
                     }
                 }
@@ -674 +705 @@
 
 #ifndef __FreeBSD__
-    if (!phrase_two || strlen(phrase_two) == 0) {
+    if (strlen(phrase_two) == 0) {
         log_msg(4, "Not running phase two. String is empty.");
     } else {
-        mr_asprintf(command, "dmesg | grep \"%s\" 2> /dev/null", phrase_two);
+        sprintf(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");
@@ -692 +721 @@
                         *p = '\0';
                         if (strstr(tmp, "DVD")) {
-                            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);
+                            sprintf(dvd_last_resort, "/dev/%s", tmp);
+                            log_msg(4,
+                                    "Ignoring '%s' because it's a DVD drive",
+                                    tmp);
                         } else {
                             sprintf(output, "/dev/%s", tmp);
@@ -745 +775 @@
 #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';
@@ -818 +852 @@
                 found_it = FALSE;
             } else {
-                mr_asprintf(command, "umount %s", output);
+                sprintf(command, "umount %s", output);
                 paranoid_system(command);
-                mr_free(command);
-
                 log_msg(4, "I'm confident the Mondo CD is in %s", output);
             }
@@ -840 +872 @@
     }
 
-    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);
-
+    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);
     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);
@@ -857 +888 @@
 
   end_of_find_cdrom_device:
+    paranoid_free(tmp);
     mr_free(cdr_exe);
-    mr_free(phrase_two);
-    mr_free(dvd_last_resort);
-
-    paranoid_free(tmp);
     paranoid_free(phrase_one);
+    paranoid_free(phrase_two);
+    paranoid_free(command);
+    paranoid_free(dvd_last_resort);
     paranoid_free(mountpoint);
     return (retval);
@@ -868 +899 @@
 
 
+
+
+
 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]) {
@@ -879 +917 @@
     }
 
-    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"));
+    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"));
     log_msg(5, "tmp = '%s'", tmp);
-    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])
+        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]) {
         devno = atoi(tmp) - 1;
     }
-    mr_free(tmp);
-
     if (devno >= 0) {
         retval = 0;
@@ -901 +936 @@
     }
 
+    if (try_to_mount) {
+        log_msg(1, "Ignoring the fact that try_to_mount==TRUE");
+    }
     return (retval);
 }
@@ -1015 +1053 @@
 {
     char *good_formats = NULL;
-    char *command = NULL;
-    char *format_sz = NULL;
+    char *command;
+    char *format_sz;
     char *p;
 
@@ -1022 +1060 @@
     int retval;
     malloc_string(good_formats);
+    malloc_string(command);
+    malloc_string(format_sz);
 
     assert_string_is_neither_NULL_nor_zerolength(format);
 
-    mr_asprintf(format_sz, "%s ", format);
+    sprintf(format_sz, "%s ", format);
 
 #ifdef __FreeBSD__
-    mr_asprintf(command, "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
+    sprintf(command,
+            "lsvfs | tr -s '\t' ' ' | grep -v Filesys | grep -v -- -- | cut -d' ' -f1 | tr -s '\n' ' '");
 #else
-    mr_asprintf(command, "grep -v nodev /proc/filesystems | tr -s '\t' ' ' | cut -d' ' -f2 | tr -s '\n' ' '");
+    sprintf(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");
@@ -1054 +1094 @@
     }
     paranoid_free(good_formats);
-    mr_free(format_sz);
-
+    paranoid_free(command);
+    paranoid_free(format_sz);
     return (retval);
 }
@@ -1074 +1114 @@
 
     /*@ buffers ***************************************************** */
-    char *incoming = NULL;
+    char *incoming;
     char *device_with_tab = NULL;
     char *device_with_space = NULL;
@@ -1088 +1128 @@
     /*@ end vars **************************************************** */
 
-    if (device_raw == NULL) {
-        return(FALSE);
-    }
-
+    malloc_string(incoming);
+    assert(device_raw != NULL);
+//  assert_string_is_neither_NULL_nor_zerolength(device_raw);
     if (device_raw[0] != '/' && !strstr(device_raw, ":/")) {
         log_msg(1, "%s needs to have a '/' prefixed - I'll do it",
@@ -1114 +1153 @@
         return(FALSE);
     }
-
-    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
-        if (strstr(incoming, device_with_space) || strstr(incoming, device_with_tab)) {
+    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)
+        {
             paranoid_pclose(fin);
-            mr_free(incoming);
+            paranoid_free(incoming);
             return(TRUE);
         }
-        mr_free(incoming);
-    }
-    mr_free(incoming);
+    }
     mr_free(device_with_tab);
     paranoid_pclose(fin);
@@ -1133 +1172 @@
     }
     mr_free(tmp);
+    paranoid_free(incoming);
     return(retval);
 }
@@ -1149 +1189 @@
     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++);
@@ -1181 +1223 @@
 int kick_vn(char *dname)
 {
-    char *command = NULL;
-    int res = 0;
+    char command[MAX_STR_LEN];
 
     if (strncmp(dname, "/dev/", 5) == 0) {
@@ -1188 +1229 @@
     }
 
-    if (atoi(call_program_and_get_last_line_of_output("/sbin/sysctl -n kern.osreldate")) < 500000) {
-        mr_asprintf(command, "vnconfig -d %s", dname);
+    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);
     } else {
-        mr_asprintf(command, "mdconfig -d -u %s", dname);
-    }
-    res = system(command);
-    mr_free(command);
-    return(res);
+        sprintf(command, "mdconfig -d -u %s", dname);
+        return system(command);
+    }
+     /*NOTREACHED*/ return 255;
 }
 #endif
@@ -1209 +1252 @@
 {
     /*@ buffer ****************************************************** */
-    char *command = NULL;
+    char *command;
     int retval;
 
+    malloc_string(command);
     assert_string_is_neither_NULL_nor_zerolength(device);
     assert_string_is_neither_NULL_nor_zerolength(mountpoint);
@@ -1219 +1263 @@
         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__
-    mr_asprintf(command, "mount_vfat %s %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
+    sprintf(command, "mount_vfat %s %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
 
 #else
-    mr_asprintf(command, "mount %s -t vfat %s 2>> %s", device, mountpoint, MONDO_LOGFILE);
+    sprintf(command, "mount %s -t vfat %s 2>> %s",
+            device, mountpoint, MONDO_LOGFILE);
 #endif
 
@@ -1231 +1278 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-    mr_free(command);
-
+
+    paranoid_free(command);
     return (retval);
 }
@@ -1242 +1289 @@
  * @return 0 for success, nonzero for failure.
  */
-int mount_CDROM_here(char *device, const char *mountpoint)
+int mount_CDROM_here(char *device, char *mountpoint)
 {
     /*@ buffer ****************************************************** */
@@ -1280 +1327 @@
 
     }
-    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 *************************************************** */
 
@@ -1297 +1345 @@
     retval = system(command);
     log_msg(1, "system(%s) returned %d", command, retval);
-    mr_free(command);
+    paranoid_free(command);
 
     return (retval);
@@ -1314 +1362 @@
 int mount_media()
 {
-char *mount_cmd = NULL;
+char *mount_cmd;
 char *mountdir = NULL;
 int i, res;
 #ifdef __FreeBSD__
-    char mdd[32];
-    char *mddev = mdd;
-#endif
-
-    if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
+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) {
         log_msg(8, "Tape/udev. Therefore, no need to mount a media.");
+        paranoid_free(mount_cmd);
         return 0;
     }
@@ -1329 +1382 @@
     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);
     }
@@ -1335 +1389 @@
         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__
-        mr_asprintf(mount_cmd, "/mnt/isodir/%s/%s/%s-%d.iso", bkpinfo->isodir,
+        sprintf(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);
-        mr_free(mount_cmd);
-
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
+        sprintf(mount_cmd, "mount_cd9660 -r %s " MNT_CDROM, mddev);
 #else
-        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);
+        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);
 #endif
 
@@ -1357 +1412 @@
         }
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "%s/%s-%d.iso", mountdir, bkpinfo->prefix, g_current_media_number);
+        sprintf(mount_cmd, "%s/%s-%d.iso", mountdir,
+            bkpinfo->prefix, g_current_media_number);
         mddev = make_vn(mount_cmd);
-        mr_free(mount_cmd);
-
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", mddev, MNT_CDROM);
 #else
-        mr_asprintf(mount_cmd, "mount %s/%s-%d.iso -t iso9660 -o loop,ro %s", mountdir, bkpinfo->prefix, g_current_media_number, MNT_CDROM);
+        sprintf(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) {
-        mr_asprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount -t vfat %s %s", bkpinfo->media_device, MNT_CDROM);
     } else if (strstr(bkpinfo->media_device, "/dev/")) {
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        MNT_CDROM);
 #else
-        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+        sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        bkpinfo->media_device, MNT_CDROM);
 #endif
     } else {
@@ -1384 +1441 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device, MNT_CDROM);
+    sprintf(mount_cmd, "mount_cd9660 -r %s %s", bkpinfo->media_device,
+        MNT_CDROM);
 #else
-        mr_asprintf(mount_cmd, "mount %s -t iso9660 -o ro %s", bkpinfo->media_device, MNT_CDROM);
+    sprintf(mount_cmd, "mount %s -t iso9660 -o ro %s",
+        bkpinfo->media_device, MNT_CDROM);
 #endif
     }
@@ -1398 +1457 @@
             log_msg(2, "Failed to mount device.");
             sleep(5);
-            sync();
-        }
-    }
-    mr_free(mount_cmd);
+            run_program_and_log_output("sync", FALSE);
+        }
+    }
 
     if (res) {
@@ -1408 +1466 @@
         log_msg(2, "Mounted media drive OK");
     }
+    paranoid_free(mount_cmd);
     return (res);
 }
@@ -1437 +1496 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp = NULL;
+    char *tmp;
     char *mds = NULL;
-    char *request = NULL;
+    char *request;
 
     assert(bkpinfo != NULL);
@@ -1451 +1510 @@
         return;
     }
-    mr_asprintf(tmp, "mkdir -p " MNT_CDROM);
+    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);
-    mr_free(tmp);
-
-    if (g_ISO_restore_mode || bkpinfo->backup_media_type == iso || bkpinfo->backup_media_type == netfs) {
-        g_ISO_restore_mode = TRUE;
-    }
     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 */
@@ -1468 +1529 @@
 
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        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);
+        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);
         mr_free(mds);
-
+        log_msg(3, tmp);
         while (what_number_cd_is_this() != cd_number_i_want) {
-            sync();
+            paranoid_system("sync");
             if (is_this_device_mounted(MNT_CDROM)) {
                 res =
@@ -1495 +1556 @@
                 inject_device(bkpinfo->media_device);
             }
-            sync();
-        }
-        mr_free(request);
-
+            paranoid_system("sync");
+        }
         log_msg(1, "Thankyou. Proceeding...");
         g_current_media_number = cd_number_i_want;
     }
+    paranoid_free(tmp);
+    paranoid_free(request);
 }
 
@@ -1615 +1676 @@
     log_msg(5, "Running: %s", command);
     mr_asprintf(mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
+    paranoid_free(command);
 
     mount_cnt = atoi(mounted_file_system);
     log_msg (5, "mount_cnt: %d", mount_cnt);
-    mr_free(mounted_file_system);
+    paranoid_free(mounted_file_system);
 
     for (i=mount_cnt; i > 0; i--) {
@@ -1625 +1686 @@
         log_msg(5, "Running: %s", command);
         mr_asprintf(mounted_file_system, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
+        paranoid_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");
-            mr_free(mounted_file_system);
+            paranoid_free(mounted_file_system);
             mr_free(token);
             return (1);
@@ -1658 +1719 @@
         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);
 }
@@ -1705 +1773 @@
     log_msg(5, "  Executing: %s", command);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
+    paranoid_free(command);
 
     log_msg(5, "  Return value: %s", tmp);
     c = atoi(tmp);
-    mr_free(tmp);
+    paranoid_free(tmp);
 
     if (!c) {
@@ -1731 +1799 @@
     log_msg(5, "Executing: %s", command);
     mr_asprintf(partition_list, "%s", call_program_and_get_last_line_of_output(command));
-    mr_free(command);
+    paranoid_free(command);
     log_msg(4, "Partition list for %s: %s", dsf, partition_list);
     if (!strlen(partition_list)) {
@@ -1794 +1862 @@
         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));
-        mr_free(command);
-
+        paranoid_free(command);
         log_msg(5, "  Return value: %s", tmp);
         c = strlen(tmp);
-        mr_free(tmp);
-
+        paranoid_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));
-        mr_free(command);
-
+        paranoid_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);
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (1);
             }
             DSFptr->check = 1;
-            mr_free(tmp);
+            paranoid_free(tmp);
             continue;
         }
-        mr_free(tmp);
-
+        paranoid_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));
-        mr_free(command);
-
+        paranoid_free(command);
         if (strlen(tmp)) {
             log_msg(4, "Found an LVM partition at %s. Find the VG it's in...", partitions[i]);
@@ -1841 +1903 @@
             log_msg(5, "  Running: %s", command);
             strcpy(VG, call_program_and_get_last_line_of_output(command));
-            mr_free(command);
-
+            paranoid_free(command);
             log_msg(4, "  Volume Group: %s", VG);
             if (strlen(VG)) {
@@ -1850 +1911 @@
                 log_msg(5, "  Running: %s", command);
                 mr_asprintf(mount_list, "%s", call_program_and_get_last_line_of_output(command));
-                mr_free(command);
-
+                paranoid_free(command);
                 log_msg(4, "  VG %s mount_list: %s", VG, mount_list);
                 lastpos = 0;
@@ -1858 +1918 @@
                     if ((DSFptr = find_mount_point_in_list(token)) == NULL) {
                         log_msg (4, "Can't find mount point %s in mounted file systems list", token);
-                        mr_free(tmp);
+                        paranoid_free(tmp);
                         mr_free(token);
                         return (1);
@@ -1869 +1929 @@
                  * any of the Logical Volumes on the Volume Group.
                  *******/
-                mr_free(mount_list);
+                paranoid_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));
-                mr_free(command);
+                paranoid_free(command);
                 log_msg(4, "  Software raid device list: %s", mount_list);
                 lastpos = 0;
@@ -1880 +1940 @@
                     mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, VG);
                     log_msg (5, "Running: %s", command);
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-                    mr_free(command);
+                    paranoid_free(command);
                     log_msg(4, "Number of Software raid device: %s", tmp);
                     if (atoi(tmp)) {
@@ -1888 +1948 @@
                         if ((DSFptr = find_device_in_list(token)) == NULL) {
                             log_msg (4, "Can't find device %s in mounted file systems list", token);
-                            mr_free(tmp);
+                            paranoid_free(tmp);
                             mr_free(token);
                             return (1);
@@ -1899 +1959 @@
             } else {
                 log_msg (4, "Error finding Volume Group for partition %s", partitions[i]);
-                mr_free(tmp);
+                paranoid_free(tmp);
                 return (1);
             }
-            mr_free(tmp);
+            paranoid_free(tmp);
             continue;
         } else {
             log_msg (4, "Error finding partition type for the partition %s", partitions[i]);
         }
-        mr_free(tmp);
-
+        paranoid_free(tmp);
         /********
          * It's not swap, mounted, or LVM. See if it's used in a software raid device.
@@ -1916 +1975 @@
         log_msg(4, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-
+        paranoid_free(command);
         if (!strlen(tmp)) {
             log_msg(4, "  Partition %s is not used in a non-LVM software raid device", partitions[i]);
-            mr_free(tmp);
+            paranoid_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));
-        mr_free(command);
-
+        paranoid_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 */
@@ -1937 +1993 @@
             mr_asprintf(command, "mdadm --detail %s 2>/dev/null | grep -c %s", token, tmp);
             log_msg(4, "  Running: %s", command);
-            mr_free(tmp);
+            paranoid_free(tmp);
             mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
-            mr_free(command);
-
+            paranoid_free(command);
             if (!atoi(tmp)) {
                 log_msg (4,"  Didn't find partition %s in software raid device %s", partitions[i], token);
@@ -1946 +2001 @@
                 if ((DSFptr = find_device_in_list(token)) == NULL) {
                     log_msg (4, "Can't find device %s in mounted file systems list", token);
-                    mr_free(tmp);
+                    paranoid_free(tmp);
                     mr_free(token);
                     return (1);
@@ -1955 +2010 @@
             mr_free(token);
         }
-        mr_free(tmp);
-        mr_free(mount_list);
+        paranoid_free(tmp);
+        paranoid_free(mount_list);
     }
 
@@ -1992 +2047 @@
     return (0);
 }
+
+
+
 
 
@@ -2041 +2099 @@
             log_to_screen("Archiving only the following file systems on %s:", token);
             log_to_screen("==> %s", mounted_on_dsf);
-            mr_free(bkpinfo->include_paths);
-            mr_asprintf(bkpinfo->include_paths, "%s", "/");
+            strcpy(bkpinfo->include_paths, "/");
             if (strlen(not_mounted_on_dsf)) {
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -I option: %s", not_mounted_on_dsf);
@@ -2079 +2136 @@
             mr_asprintf(tmp,"|%s|",bkpinfo->include_paths);
             if (strstr(tmp,tmp2) == NULL) {
-                mr_strcat(bkpinfo->include_paths, "%s", tmp1);
+                strcat(bkpinfo->include_paths,tmp1);
             }
             mr_free(tmp1);
@@ -2124 +2181 @@
     char *q = NULL;
     char p[16*MAX_STR_LEN];
-    char *sz_size = NULL;
-    char *command = NULL;
+    char *sz_size;
+    char *command;
     char *compression_type = NULL;
-    char *comment = NULL;
+    char *comment;
+    char *prompt;
     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;
 
@@ -2169 +2232 @@
         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, " ");
 
@@ -2187 +2253 @@
         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;
                 }
@@ -2195 +2263 @@
                 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);
-            mr_asprintf(comment, "What speed is your %s (re)writer?", mds);
+            sprintf(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");
-                mr_asprintf(sz_size, "%d", DEFAULT_DVD_DISK_SIZE);  // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                sprintf(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");
-                mr_asprintf(sz_size, "%d", 650);
+                strcpy(sz_size, "650");
                 log_msg(1, "Setting to CD defaults");
             }
@@ -2216 +2284 @@
                 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 :)
 
-            strcpy(tmp1, sz_size);
-            mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
+            sprintf(comment,
+                    "How much data (in Megabytes) will each %s store?", mds);
             mr_free(mds);
-            if (!popup_and_get_string("Size", comment, tmp1, 5)) {
+            if (!popup_and_get_string("Size", comment, sz_size, 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");
@@ -2244 +2308 @@
         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);
-                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_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_to_screen("User has chosen not to backup the PC");
                     finish(1);
@@ -2327 +2399 @@
             } 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);
                 }
             }
@@ -2382 +2455 @@
                 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);
@@ -2394 +2468 @@
         /* 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 == NULL) {
-            mr_asprintf(bkpinfo->netfs_mount, call_program_and_get_last_line_of_output("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
+        if (!bkpinfo->netfs_mount[0]) {
+            strcpy(bkpinfo->netfs_mount,
+                   call_program_and_get_last_line_of_output
+                   ("mount | grep \":\" | cut -d' ' -f1 | head -n1"));
         }
 #ifdef __FreeBSD__
@@ -2412 +2484 @@
                 ("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.)",
-                 p, MAX_STR_LEN / 4)) {
+                 bkpinfo->netfs_mount, 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) {
@@ -2423 +2493 @@
                     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);
@@ -2431 +2501 @@
             // check whether already mounted - we better remove
             // surrounding spaces and trailing '/' for this
-            mr_strip_spaces(bkpinfo->netfs_mount);
+            strip_spaces(bkpinfo->netfs_mount);
             if (bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] == '/')
                 bkpinfo->netfs_mount[strlen(bkpinfo->netfs_mount) - 1] = '\0';
@@ -2443 +2513 @@
                 strcpy(tmp1,bkpinfo->netfs_mount);
             }
-            mr_asprintf(command, "mount | grep \"%s \" | cut -d' ' -f3", tmp1);
+            sprintf(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) {
-                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)) {
+                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)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                mr_free(comment);
-                mr_asprintf(sz_size, "%s", tmp1);
             } else {
-                mr_asprintf(sz_size, "0");
+                strcpy(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");
@@ -2469 +2533 @@
             }
         }
+        /*  Force NFS to be the protocol by default */
+        if (bkpinfo->netfs_proto == NULL) {
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
+        }
         if (bkpinfo->disaster_recovery) {
-            mr_asprintf(command ,"umount %s/isodir 2> /dev/null", bkpinfo->tmpdir);
+            sprintf(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);
@@ -2482 +2550 @@
         mr_free(bkpinfo->netfs_proto);
         mr_asprintf(bkpinfo->netfs_proto, "%s", tmp1);
-
-        strcpy(tmp1, bkpinfo->netfs_mount);
-        if (!popup_and_get_string("Network share", "Which remote share should I mount?", tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string
+            ("Network share", "Which remote share should I mount?",
+             bkpinfo->netfs_mount, 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) {
@@ -2496 +2562 @@
             strcpy(tmp1, "");
         }
-        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1)) {
+        if (!popup_and_get_string
+            ("Network user", "Which user should I use if any ?",
+             tmp1, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -2507 +2575 @@
         /* 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);
-            mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
+            sprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
-            mr_free(command);
 
             if (bkpinfo->restore_data) {
@@ -2546 +2615 @@
         }
         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);
         }
@@ -2570 +2640 @@
         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;
@@ -2588 +2659 @@
                     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(tmp1, "%d", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4482 MB
+                sprintf(sz_size, "%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.",
-                     tmp1, 16)) {
+                     sz_size, 16)) {
                     log_to_screen("User has chosen not to backup the PC");
                     finish(1);
                 }
-                bkpinfo->media_size = atoi(tmp1);
+                bkpinfo->media_size = atoi(sz_size);
             } else {
                 bkpinfo->media_size = 650;
@@ -2651 +2723 @@
                 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 {
@@ -2664 +2739 @@
 #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);
                 }
@@ -2673 +2751 @@
         }
         bkpinfo->boot_loader = i;
-
-        mr_free(bkpinfo->include_paths);
-        strcpy(tmp1, "/");
+        strcpy(bkpinfo->include_paths, "/");
         if (!popup_and_get_string
             ("Backup paths",
              "Please enter paths (separated by '|') which you want me to backup. The default is '/' (i.e. everything).",
-             tmp1, MAX_STR_LEN)) {
+             bkpinfo->include_paths, 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) {
@@ -2741 +2815 @@
         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");
             }
@@ -2763 +2835 @@
             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");
@@ -2777 +2849 @@
             ("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.")) {
@@ -2795 +2875 @@
 #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);
-    if (bkpinfo->netfs_mount) {
-        log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    log_it("netfs_mount = '%s'", bkpinfo->netfs_mount);
+    if (bkpinfo->netfs_proto) {
+        log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
     }
     if (bkpinfo->netfs_user) {
         log_it("netfs_user = '%s'", bkpinfo->netfs_user);
-    }
-    if (bkpinfo->netfs_proto) {
-        log_it("netfs_proto = '%s'", bkpinfo->netfs_proto);
     }
 #endif
@@ -2812 +2891 @@
     log_it("media size = %ld", bkpinfo->media_size);
     log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
-    if (bkpinfo->prefix) {
-        log_it("prefix = %s", bkpinfo->prefix);
-    }
+    log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
     log_it("exclude_path = %s", bkpinfo->exclude_paths);
@@ -2820 +2897 @@
 
     /* 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');
@@ -2827 +2904 @@
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);
     log_it("tmpdir = '%s'", bkpinfo->tmpdir);
-    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);
+    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) {
@@ -2841 +2917 @@
     paranoid_free(sz_size);
     paranoid_free(tmp1);
+    paranoid_free(command);
+    paranoid_free(comment);
+    paranoid_free(prompt);
     return (0);
 }
@@ -3091 +3170 @@
 
     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__