Changeset 3193 in MondoRescue

Timestamp:

Sep 29, 2013, 9:31:34 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Finish with backports from 3.1 for now. Still some work to do, but we will now make that version compile and work again and serve as a base

so the gettext patch can be added

Location:

branches

Files:

• 3.1/mondo/src/include/mr_str.h (modified) (1 diff)
• 3.1/mondo/src/include/my-stuff.h (modified) (1 diff)
• 3.1/mondo/src/lib/mr_str.c (modified) (9 diffs)
• 3.1/mondo/src/mondoarchive/mondoarchive.c (modified) (5 diffs)
• 3.1/mondo/src/mondorestore/mondo-prep.c (modified) (16 diffs)
• 3.1/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (10 diffs)
• 3.1/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (12 diffs)
• 3.1/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (23 diffs)
• 3.1/mondo/src/mondorestore/mondoprep.h (modified) (1 diff)
• 3.1/mondo/src/mondorestore/mondorestore.c (modified) (6 diffs)
• 3.2/mondo/src/include/mr_str.h (modified) (1 diff)
• 3.2/mondo/src/include/my-stuff.h (modified) (3 diffs)
• 3.2/mondo/src/lib/mr_str.c (modified) (2 diffs)
• 3.2/mondo/src/mondoarchive/mondoarchive.c (modified) (18 diffs)
• 3.2/mondo/src/mondoarchive/mondoarchive.h (modified) (1 diff)
• 3.2/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (30 diffs)
• 3.2/mondo/src/mondorestore/mondo-rstr-newt.c (modified) (87 diffs)
• 3.2/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (96 diffs)
• 3.2/mondo/src/mondorestore/mondorestore.c (modified) (114 diffs)
• 3.2/mondo/src/mondorestore/mr-externs.h (modified) (2 diffs)

branches/3.1/mondo/src/include/mr_str.h

@@ -16 +16 @@
 
 extern char *mr_strtok(char *instr, const char *delims, int *lastpos);
-extern char *mr_stresc(char *instr, char *toesc, const char escchr);
-extern char *mr_date(void);
+extern char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr);
+extern inline char *mr_date(void);
 extern void mr_strip_spaces(char *in_out);
 extern void mr_strip_char(char *in_out, char *caracs);

branches/3.1/mondo/src/include/my-stuff.h

@@ -339 +339 @@
 #define ARCH_THREADS 2          ///< The number of simultaneous threads running afio in the background.
 #define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
+#define FORTY_SPACES "                                         "    ///< 40 spaces.
 #define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
 #define MONDO_MNTLISTCHG "/tmp/mountlist.changed"

branches/3.1/mondo/src/lib/mr_str.c

@@ -12 +12 @@
 
 #include "mr_mem.h"
+
+// to get bool type
+#define _MY_STUFF_H_
+#include "my-stuff.h"
  
 /**
@@ -66 +70 @@
  * @note this function allocates memory that needs to be freed by caller
  **/
-char *mr_stresc(char *instr, char *toesc, const char escchr) {
+char *mr_stresc(char *instr, char *toesc, const char escchr, const char specialchr) {
     char *inptr = NULL;
     char *retstr = NULL;
@@ -72 +76 @@
     char *escptr = NULL;
     int cnt = 0;
+    bool found = FALSE;
 
     inptr = instr;
-
     // Count how many characters need escaping.
     while (*inptr != '\0') {
@@ -82 +86 @@
                 // Found it, skip the rest.
                 cnt++;
+                // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
+                if (*inptr == specialchr) {
+                    cnt += 2;
+                }
                 break;
             }
@@ -88 +96 @@
         inptr++;
     }
+
     inptr = instr;
-
     retstr = (char *) mr_malloc(strlen(inptr) + cnt + 1);
     retptr = retstr;
@@ -99 +107 @@
             if (*inptr == *escptr) {
                 // Found it, skip the rest.
-                *retptr = escchr;
-                retptr++;
+                // if specialchar (' or ") then replace it with '\'' or "\"" so adds 2 chars
+                if (*inptr == specialchr) {
+                    *retptr = specialchr;
+                    retptr++;
+                    *retptr = escchr;
+                    retptr++;
+                    found = TRUE;
+                } else {
+                    *retptr = escchr;
+                    retptr++;
+                }
                 break;
             }
@@ -108 +125 @@
         retptr++;
         inptr++;
+        if (found) {
+            // finish to put the remaining specialchr
+            *retptr = specialchr;
+            retptr++;
+            found = FALSE;
+        }
     }
     *retptr = '\0';
@@ -114 +137 @@
 }
 
-/**
- * Remove all characters in caracs from begining and end of string @p in_out
- * @param in_out The string to strip char characters from (modified).
+/* Return a string containing the date */
+char *mr_date(void) {
+    
+    time_t tcurr;
+
+    tcurr = time(NULL);
+    return(ctime(&tcurr));
+}
+
+/* Return an allocated string containing the date
+char *mr_date(void) {
+    
+    time_t tcurr;
+    char *tmp = NULL;
+
+    tcurr = time(NULL);
+    mr_asprintf(tmp, "%s", ctime(&tcurr));
+    mr_chomp(tmp);
+    return(tmp);
+}
  */
-void mr_strip_char(char *in_out, char *caracs) {
-    int i = 0;
-    int j = 0;
-    int length = 0;
-
-    if (caracs == NULL) {
-        return;
-    }
-    if (in_out == NULL) {
-        return;
-    }
-    length = (int)strlen(in_out);
-
-    /* Skip initial caracs */
-    for (i = 0; index(caracs, in_out[i]) != NULL && i < length ; i++);
-
-    /* Shift the string to the begining if needed */
-    if (i != 0) {
-        for (j = 0; i < length ; i++, j++) {
-            in_out[j] = in_out[i];
-        }
-        /* Erase the end of the string if needed */
-        j++;
-        in_out[j] = '\0';
-    }
-
-    /* Skip final spaces and special chars */
-    for (i = (int)strlen(in_out) - 1; i >= 0  && index(caracs, in_out[i]) != NULL; i--);
-
-    /* The string now ends after that char */
-    i++;
-    in_out[i] = '\0';
-}
 
 /**
@@ -158 +165 @@
  */
 void mr_strip_spaces(char *in_out) {
-
-    int i;
-    char *tmp = NULL;
-
-    mr_asprintf(tmp, "");
-
-    /* Build the string of char to avoid: ctrl char up to space*/
-    for (i = 0; i <= ' '; i++) {
-        mr_strcat(tmp, "%c", i);
-    }
-    
-    mr_strip_char(in_out, tmp);
-    mr_free(tmp);
-}
+    int i = 0;
+    int j = 0;
+    size_t length;
+
+    if (in_out == NULL) {
+        return;
+    }
+    length = strlen(in_out);
+
+    /* Skip initial spaces and special chars */
+    for (i = 0; in_out[i] <= ' ' && i < (int)length ; i++);
+    /* Shift the string to the begining if needed */
+    if (i != 0) {
+        for (j = 0; i < (int)length ; i++, j++) {
+            in_out[j] = in_out[i];
+        }
+        /* Erase the end of the string if needed */
+        j++;
+        in_out[j] = '\0';
+    }
+
+    /* Skip final spaces and special chars */
+    for (i = (int)strlen(in_out) - 1; i >= 0  && in_out[i] <= ' '; i--);
+
+    /* The string now ends after that char */
+    i++;
+    in_out[i] = '\0';
+}
+
 
 /*
  * Remove '\n' char from both sides of @p in_out.
  * @param in_out The string to strip characters from (modified).
- */
+
 void mr_chomp(char *in_out) {
 
     mr_strip_char(in_out, "\n");
 }
-
-/* Return an allocated string containing the date */
-char *mr_date(void) {
-    
-    time_t tcurr;
-    char *tmp = NULL;
-
-    tcurr = time(NULL);
-    mr_asprintf(tmp, "%s", ctime(&tcurr));
-    mr_chomp(tmp);
-    return(tmp);
-}
-
-
+*/
+
+/**
+ * Remove all characters in caracs from begining and end of string @p in_out
+ * @param in_out The string to strip char characters from (modified).
+
+void mr_strip_char(char *in_out, char *caracs) {
+    int i = 0;
+    int j = 0;
+    size_t length = 0;
+
+    if (caracs == NULL) {
+        return;
+    }
+    if (in_out == NULL) {
+        return;
+    }
+    length = strlen(in_out);
+
+    /* Skip initial caracs */
+    for (i = 0; index(caracs, in_out[i]) != NULL && i < (int)length ; i++);
+
+    /* Shift the string to the begining if needed */
+    if (i != 0) {
+        for (j = 0; i < (int)length ; i++, j++) {
+            in_out[j] = in_out[i];
+        }
+        /* Erase the end of the string if needed */
+        j++;
+        in_out[j] = '\0';
+    }
+
+    /* Skip final caracs */
+    for (i = (int)strlen(in_out) - 1; i >= 0  && index(caracs, in_out[i]) != NULL; i--);
+
+    /* The string now ends after that char */
+    i++;
+    in_out[i] = '\0';
+}
+*/
+

branches/3.1/mondo/src/mondoarchive/mondoarchive.c

@@ -37 +37 @@
 extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
+
 extern char *g_magicdev_command;
 
@@ -101 +102 @@
     log_msg(7, "Seven...");
     log_msg(8, "Eight...");
+    printf("See %s for details of backup run.\n", MONDO_LOGFILE);
 }
 
@@ -164 +166 @@
     FILE *fin = NULL;
 
+/* Make sure I'm root; abort if not */
+    if (getuid() != 0) {
+        fprintf(stderr, "Please run as root.\r\n");
+        exit(127);
+    }
+
+/* If -V, -v or --version then echo version no. and quit */
+    if (argc == 2 && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V") || !strcmp(argv[argc - 1], "--version"))) {
+        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
+        exit(0);
+    }
+
+/* Initialize variables */
+
     printf("Initializing...\n");
+
+    init_bkpinfo();
+
+    /* Memory allocation is done in those functions */
+    malloc_libmondo_global_strings();
 
     /* initialize log file with time stamp */
     unlink(MONDO_LOGFILE);
-    tmp = mr_date();
-    log_msg(0, "Time started: %s", tmp);
-    mr_free(tmp);
-
-    init_bkpinfo();
-
-    /* Memory allocation is done in those functions */
-    malloc_libmondo_global_strings();
+    log_msg(0, "Time started: %s", mr_date());
+
     if (argc == 1) {
         g_text_mode = FALSE;
@@ -188 +203 @@
     }
     setup_newt_stuff();
-
-    /* Make sure I'm root; abort if not */
-    if (getuid() != 0) {
-        fatal_error("Please run as root.\n");
-    }
-
-    /* If -V, -v or --version then echo version no. and quit */
-    if (argc == 2 && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V") || !strcmp(argv[argc - 1], "--version"))) {
-        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
-        finish(0);
-    }
-
 
     /* make sure PATH environmental variable allows access to mkfs, fdisk, etc. */
@@ -449 +452 @@
 
     /* finalize log file with time stamp */
-    tmp = mr_date();
-    log_msg(0, "Time finished: %s", tmp);
-    mr_free(tmp);
+    log_msg(0, "Time finished: %s", mr_date());
 
     if (chdir("/tmp")) {

branches/3.1/mondo/src/mondorestore/mondo-prep.c

@@ -43 +43 @@
 extern char *MONDO_LOGFILE;
 
+// FIXME: is it really usefull - maps to /tmp/prep.sh ??
 FILE *g_fprep = NULL;
 extern char *g_mondo_cfg_file;  // where m*ndo-restore.cfg (the config file) is stored
@@ -108 +109 @@
             sync();
             sync();
-            popup_and_OK
-                ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
+            popup_and_OK("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
             paranoid_system("reboot");
         }
     }
-// Still here? Cool!
+    // Still here? Cool!
     log_msg(1, "Cool. I didn't have to wipe anything.");
 }
@@ -218 +218 @@
     }
 
+    // TODO: FIXME
     command = malloc(1024);
 
@@ -390 +391 @@
         }
         mr_asprintf(tmp1, "echo \"%s\" >> /tmp/out.sh", command);
-        if (system(tmp1)) {
-            //FIXME
-        }
+        paranoid_system(tmp1);
         mr_free(tmp1);
         sleep(1);
@@ -515 +514 @@
         }
     }
-    paranoid_free(incoming);
 
     return (0);
@@ -539 +537 @@
     char *level   = NULL;
     char *program = NULL;
-    char *strtmp = NULL;
     char *oldmd = NULL;
 
-  // leave straight away if raidlist is initial or has no entries
-  if (!raidlist || raidlist->entries == 0) {
-    log_msg(1, "No RAID arrays found.");
-    return 1;
-  } else {
-    log_msg(1, "%d RAID arrays found.", raidlist->entries);
-  }
-  // find raidlist entry for requested device
-  for (i = 0; i < raidlist->entries; i++) {
-    if (!strcmp(raidlist->el[i].raid_device, device)) break;
-  }
-  // check whether RAID device was found in raidlist
-  if (i == raidlist->entries) {
-    log_msg(1, "RAID device %s not found in list.", device);
-    return 1;
-  }
-  // create device list from normal disks followed by spare ones
-  mr_asprintf(devices, "%s", raidlist->el[i].data_disks.el[0].device);
-  for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
-    mr_asprintf(strtmp, "%s", devices);
-    mr_free(devices);
-    mr_asprintf(devices, "%s %s", strtmp, raidlist->el[i].data_disks.el[j].device);
-    mr_free(strtmp);
-  }
-  for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
-    mr_asprintf(strtmp, "%s", devices);
-    mr_free(devices);
-    mr_asprintf(devices, "%s %s", strtmp, raidlist->el[i].spare_disks.el[j].device);
-    mr_free(strtmp);
-  }
-  // translate RAID level
-  if (raidlist->el[i].raid_level == -2) {
-    mr_asprintf(level, "multipath");
-  } else if (raidlist->el[i].raid_level == -1) {
-    mr_asprintf(level, "linear");
-  } else {
-    mr_asprintf(level, "raid%d", raidlist->el[i].raid_level);
-  }
-  // create RAID device:
-  // - RAID device, number of devices and devices mandatory
-  // - parity algorithm, chunk size and spare devices optional
-  // - faulty devices ignored
-  // - persistent superblock always used as this is recommended
-
-  mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d %s", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries, oldmd);
-  mr_free(oldmd);
-  if (raidlist->el[i].parity != -1) {
-    mr_asprintf(strtmp, "%s", program);
-    mr_free(program);
-    switch(raidlist->el[i].parity) {
-    case 0:
-      mr_asprintf(program, "%s --parity=%s", strtmp, "la");
-      break;
-    case 1:
-      mr_asprintf(program, "%s --parity=%s", strtmp, "ra");
-      break;
-    case 2:
-      mr_asprintf(program, "%s --parity=%s", strtmp, "ls");
-      break;
-    case 3:
-      mr_asprintf(program, "%s --parity=%s", strtmp, "rs");
-      break;
-    default:
-      fatal_error("Unknown RAID parity algorithm.");
-      break;
-    }
-    mr_free(strtmp);
-  }
-  if (raidlist->el[i].chunk_size != -1) {
-    mr_asprintf(strtmp, "%s", program);
-    mr_free(program);
-    mr_asprintf(program, "%s --chunk=%d", strtmp, raidlist->el[i].chunk_size);
-    mr_free(strtmp);
-  }
-  if (raidlist->el[i].spare_disks.entries > 0) {
-    mr_asprintf(strtmp, "%s", program);
-    mr_free(program);
-    mr_asprintf(program, "%s --spare-devices=%d", strtmp, raidlist->el[i].spare_disks.entries);
-    mr_free(strtmp);
-  }
-  mr_asprintf(strtmp, "%s", program);
-  mr_free(program);
-  mr_asprintf(program, "%s %s", strtmp, devices);
-  mr_free(strtmp);
-  res = run_program_and_log_output(program, 1);
-  mr_free(devices);
-  mr_free(level);
-  mr_free(program);
-  return res;
+    // leave straight away if raidlist is initial or has no entries
+    if (!raidlist || raidlist->entries == 0) {
+      log_msg(1, "No RAID arrays found.");
+      return 1;
+    } else {
+      log_msg(1, "%d RAID arrays found.", raidlist->entries);
+    }
+    // find raidlist entry for requested device
+    for (i = 0; i < raidlist->entries; i++) {
+      if (!strcmp(raidlist->el[i].raid_device, device)) break;
+    }
+    // check whether RAID device was found in raidlist
+    if (i == raidlist->entries) {
+      log_msg(1, "RAID device %s not found in list.", device);
+      return 1;
+    } else {
+      log_msg(1, "RAID device %s found in list (%d).", device, i);
+    }
+
+    // create device list from normal disks followed by spare ones
+    if (raidlist->el[i].data_disks.el[0].device != NULL) {
+        mr_asprintf(devices, "%s", raidlist->el[i].data_disks.el[0].device);
+        log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[0].device);
+    } else {
+        log_msg(1, "Strange, there are entries but no device");
+    }
+    for (j = 1; j < raidlist->el[i].data_disks.entries; j++) {
+      mr_strcat(devices, " %s", raidlist->el[i].data_disks.el[j].device);
+      log_msg(4, "Adding device %s to list", raidlist->el[i].data_disks.el[j].device);
+    }
+    for (j = 0; j < raidlist->el[i].spare_disks.entries; j++) {
+      mr_strcat(devices, " %s", raidlist->el[i].spare_disks.el[j].device);
+      log_msg(4, "Adding spare device %s to list", raidlist->el[i].spare_disks.el[j].device);
+    }
+    log_msg(4, "RAID devices: %s", devices);
+    // translate RAID level
+    if (raidlist->el[i].raid_level == -2) {
+      mr_asprintf(level, "multipath");
+    } else if (raidlist->el[i].raid_level == -1) {
+      mr_asprintf(level, "linear");
+    } else {
+      mr_asprintf(level, "raid%d", raidlist->el[i].raid_level);
+    }
+    // create RAID device:
+    // - RAID device, number of devices and devices mandatory
+    // - parity algorithm, chunk size and spare devices optional
+    // - faulty devices ignored
+    // - persistent superblock always used as this is recommended
+
+    mr_asprintf(program, "mdadm --create --force --run --auto=yes %s --level=%s --raid-devices=%d", raidlist->el[i].raid_device, level, raidlist->el[i].data_disks.entries);
+    mr_free(level);
+    log_msg(4, "cmd built: %s", program);
+    // Restoring the UUID and Version stored at backup time of present
+    for (v = 0; v < raidlist->el[i].additional_vars.entries ; v++ ) {
+        log_msg(4,"Working on additional param #%d (Label: %s)",v,raidlist->el[i].additional_vars.el[v].label);
+        if ((raidlist->el[i].additional_vars.el[v].label != NULL) && (strcmp(raidlist->el[i].additional_vars.el[v].label,"UUID") == 0)) {
+            // We have a UUID to handle
+            if (raidlist->el[i].additional_vars.el[v].value != NULL) {
+                // force its restoration in order to avoid modifying all conf files using it
+                log_it("Managing previous UUID %s", raidlist->el[i].additional_vars.el[v].value);
+                mr_strcat(program, " --uuid %s",raidlist->el[i].additional_vars.el[v].value);
+                continue;
+            } else {
+                log_msg(1,"Unable to manage previous NULL UUID");
+            }
+        }
+        if ((raidlist->el[i].additional_vars.el[v].label != NULL) && (strcmp(raidlist->el[i].additional_vars.el[v].label,"Version") == 0)) {
+            // We have a Version to handle
+            if (raidlist->el[i].additional_vars.el[v].value != NULL) {
+                // force its restoration in order to support all complex boot loader + md format cases
+                // Also see bug #473
+                log_it("Managing previous Version %s", raidlist->el[i].additional_vars.el[v].value);
+                mr_strcat(program, " -e %s",raidlist->el[i].additional_vars.el[v].value);
+                continue;
+            } else {
+                log_msg(1,"Unable to manage previous NULL Version");
+            }
+        }
+    }
+        log_msg(4, "cmd built: %s", program);
+    if (raidlist->el[i].parity != -1) {
+      switch(raidlist->el[i].parity) {
+      case 0:
+        mr_strcat(program, " --parity=%s", "la");
+        break;
+      case 1:
+        mr_strcat(program, " --parity=%s", "ra");
+        break;
+      case 2:
+        mr_strcat(program, " --parity=%s", "ls");
+        break;
+      case 3:
+        mr_strcat(program, " --parity=%s", "rs");
+        break;
+      default:
+        fatal_error("Unknown RAID parity algorithm.");
+        break;
+      }
+    }
+    log_msg(4, "cmd built: %s", program);
+    if (raidlist->el[i].chunk_size != -1) {
+        mr_strcat(program, " --chunk=%d", raidlist->el[i].chunk_size);
+    }
+    if (raidlist->el[i].spare_disks.entries > 0) {
+        mr_strcat(program, " --spare-devices=%d", raidlist->el[i].spare_disks.entries);
+    }
+    log_msg(4, "cmd built: %s", program);
+    mr_strcat(program, " %s", devices);
+    log_msg(2, "RAID device re-created with the following command:\n%s\n", program);
+    if (test == TRUE) {
+        res = run_program_and_log_output(program, 1);
+    } else {
+        // test mode, always returns TRUE without executing the mdadm command
+        res = TRUE;
+    }
+    // free memory
+    mr_free(devices);
+    mr_free(program);
+    return res;
 }
 
@@ -759 +786 @@
         sync();
         sleep(1);
+        if (g_fprep) {
+            fprintf(g_fprep, "%s\n", program);
+        }
 
         log_msg(1, "Making %s", device);
@@ -845 +875 @@
     return (retval);
 }
-
-
-
 
 
@@ -1006 +1033 @@
     if (g_partition_table_locked_up > 0) {
         if (retval > 0 && !interactively) {
-//123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 
+                //123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 
             log_to_screen("Partition table locked up %d times. At least one 'mkfs' (format) command", g_partition_table_locked_up);
             log_to_screen("failed. I think these two events are related. Sometimes, fdisk's ioctl() call");
@@ -1015 +1042 @@
                 sync();
                 sync();
-                if (system("reboot")) {
-                    // FIXME
-                }
+                paranoid_system("reboot");
             }
         } else {
@@ -1558 +1583 @@
 
     if (pout_to_fdisk) {
-        // mark relevant partition as bootable
-        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable "MINDI_CACHE"/mountlist.txt dummy",TRUE);
-        mr_asprintf(tmp, "a\n%s\n", tmp1);
-        mr_free(tmp1);
-
-        fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
-        mr_free(tmp);
-
         // close fdisk
+        fput_string_one_char_at_a_time(pout_to_fdisk, "p\n");
         fput_string_one_char_at_a_time(pout_to_fdisk, "w\n");
-        sync();
         paranoid_pclose(pout_to_fdisk);
         sync();
         log_msg(0,"------------------- fdisk.log looks like this ------------------");
         mr_asprintf(tmp, "cat %s >> %s", FDISK_LOG, MONDO_LOGFILE);
-        if (system(tmp)) {
-            // FIXME
-        }
+        paranoid_system(tmp);
         mr_free(tmp);
 
-        log_msg(0,
-                "------------------- end of fdisk.log... word! ------------------");
+        // mark relevant partition as bootable
+        mr_asprintf(tmp1,"make-me-bootable /tmp/mountlist.txt %s",drivename);
+        call_program_and_get_last_line_of_output(tmp1);
+        mr_free(tmp1);
+        log_msg(0,"------------------- end of fdisk.log...       ------------------");
+        sync();
+
         mr_asprintf(tmp, "tail -n6 %s | grep -F \"16: \"", FDISK_LOG);
         if (!run_program_and_log_output(tmp, 5)) {
@@ -1947 +1967 @@
 #endif
     }
-    log_msg(1, tmp, "Setting %s's type to %s (%s)", partition, format, partcode);
+    log_msg(1, "Setting %s's type to %s (%s)", partition, format, partcode);
     mr_free(partition);
 
@@ -2009 +2029 @@
         }
     }
-
     mr_free(partcode);
+
     return (res);
 }
@@ -2080 +2100 @@
     mr_asprintf(program, "vinum stop -f %s", raid_device);
 #else
-        // use raidstop if it exists, otherwise use mdadm
-        if (run_program_and_log_output("which raidstop", FALSE)) {
+    // use raidstop if it exists, otherwise use mdadm
+    if (run_program_and_log_output("which raidstop", FALSE)) {
         mr_asprintf(program, "mdadm -S %s", raid_device);
     } else {
@@ -2201 +2221 @@
  * @return 0 for success, nonzero for failure.
  */
-char *which_format_command_do_i_need(char *format)
+static char *which_format_command_do_i_need(char *format)
 {
     /** buffers *********************************************************/
@@ -2229 +2249 @@
     } else if (strcmp(format, "ext4") == 0) {
         mr_asprintf(program, "mkfs -t ext4 -F -q");
-    } else if (strcmp(format, "btrfs") == 0) {
-              strcpy(program, "mkfs.btrfs");
     } else if (strcmp(format, "btrfs") == 0) {
               strcpy(program, "mkfs.btrfs");

branches/3.1/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -76 +76 @@
     paranoid_fclose(fin);
 
+
+    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
+    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
     mr_asprintf(checksum, "%s", biggiestruct.checksum);
-    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
-
-    log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
@@ -85 +85 @@
         mr_asprintf(tmp, "Comparing %s", bigfile_fname);
         newtDrawRootText(0, 22, tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
         newtRefresh();
     }
-    if (!checksum[0]) {
+    if (checksum == NULL]) {
         log_msg(2, "Warning - %s has no checksum", bigfile_fname);
     }
     if (!strncmp(bigfile_fname, "/dev/", 5)) {
         log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname);
+        mr_free(checksum);
         mr_free(bigfile_fname);
         return (1);
@@ -104 +105 @@
     mr_asprintf(tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
     paranoid_system(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (i) {
         log_OS_error("Warning - command failed");
+        mr_free(checksum);
+        mr_free(bigfile_fname);
         return (1);
     } else {
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            log_msg(2,
-                    "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            mr_free(checksum);
             mr_free(bigfile_fname);
             return (1);
@@ -135 +138 @@
 
     log_msg(1, tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
 
     if (retval) {
@@ -270 +273 @@
         } else {
             // afio
+            mr_asprintf(tmp, "%s", compressor_exe);
             mr_free(compressor_exe);
-            mr_asprintf(tmp, "%s", compressor_exe);
             mr_asprintf(compressor_exe, "-P %s -Z", tmp);
             mr_free(tmp);
@@ -291 +294 @@
     }
     mr_free(compressor_exe);
-    paranoid_free(archiver_exe);
+    mr_free(archiver_exe);
 
 #undef BUFSIZE
@@ -474 +477 @@
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
-        mr_asprintf(tmp, "%ld files do not match the backup            ", noof_changed_files);
-        log_to_screen(tmp);
-        mr_free(tmp);
+        log_to_screen("%ld files do not match the backup            ", noof_changed_files);
 
         mr_asprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
@@ -525 +526 @@
 
   /**************************************************************************
-   * also deletes tmp/filelist.full & biggielist.txt _and_ tries to     *
+   * also deletes tmp/filelist.full & tmp/biggielist.txt _and_ tries to     *
    * restore them from start of tape, if available                          *
    **************************************************************************/
@@ -653 +654 @@
     }
 
-    mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
 
     mr_free(bkpinfo->media_device);
@@ -711 +711 @@
     }
 
-    mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
     res = verify_tape_backups();
     if (chdir(dir)) {

branches/3.1/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -212 +212 @@
         mr_strip_spaces(size_str);
 
-        strip_spaces(device_str);
+        mr_strip_spaces(device_str);
         if (b_res == bOK) {
             if (device_str[strlen(device_str) - 1] == '/') {
@@ -480 +480 @@
             mr_free(tmp);
             mr_free(prompt);
-            mr_free(prompt);
             return;
         }
@@ -530 +529 @@
 
     assert(raidrec != NULL);
-
-    if (system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null")) {
-        // FIXME
-    }
+    paranoid_system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
     personalities = last_line_of_file("/tmp/raid-personalities.txt");
     mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
@@ -583 +579 @@
     mr_free(tmp);
     mr_free(prompt);
+
     raidrec->raid_level = out;
 #endif
@@ -607 +604 @@
     int pos = 0;
 
-    /** buffers ***********************************************************/
     assert(mountlist != NULL);
     assert(raidlist != NULL);
@@ -931 +927 @@
                 strcpy(g_strings_of_flist_window[i - 1], tmp1);
                 mr_free(tmp1);
+
                 dummybool = g_is_path_selected[i];
                 g_is_path_selected[i] = g_is_path_selected[i - 1];
@@ -1683 +1680 @@
 
     /** buffers ***********************************************************/
-    char title_of_editraidForm_window[MAX_STR_LEN];
+    char *title_of_editraidForm_window = NULL;
 
     /** newt **************************************************************/
@@ -1713 +1710 @@
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct vinum_plex));
-    sprintf(title_of_editraidForm_window, "%s.p%i",
-            raidlist->el[currline].volname, currline2);
+    mr_asprintf(title_of_editraidForm_window, "%s.p%i", raidlist->el[currline].volname, currline2);
     newtPushHelpLine
         ("   Please select a subdisk to edit, or edit this plex's parameters");
     newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
+    mr_free(title_of_editraidForm_window);
+
     for (;;) {
         int i;
@@ -1888 +1886 @@
         strcpy(raidrec->additional_vars.el[lino].value, p);
     }
+    mr_free(header);
+    mr_free(comment);
     mr_free(p);
 }
@@ -1953 +1953 @@
     mr_asprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format", "Size (MB)");
     headerMsg = newtLabel(2, 1, tmp);
+    mr_free(tmp);
+
     flawsLabelA = newtLabel(2, 13, "         ");
     flawsLabelB = newtLabel(2, 14, "         ");
@@ -2044 +2046 @@
     }
     newtFormDestroy(myForm);
-
-    mr_free(flaws_str_A);
-    mr_free(flaws_str_B);
-    mr_free(flaws_str_C);
-    mr_free(tmp);
-
     newtPopWindow();
     newtPopHelpLine();
@@ -2829 +2825 @@
                         disklist->el[currline].index = atoi(sz_res);
                     }
+
                     redraw_disklist(disklist, keylist, partitionsListbox);
                     mr_free(sz_res);

branches/3.1/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -90 +90 @@
     fatal_error("Cannot openin outfname");
 }
-for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
+for (mr_getline(incoming, fin); !feof(fin) && (incoming != NULL); mr_getline(incoming, fin)) {
     mr_strip_spaces(incoming);
 
@@ -140 +140 @@
 }
 if (file[0] == '/' && file[1] == '/') {
-    mr_asprintf(tmp, "%s", file);
-    mr_free(file);
+    tmp = file;
 
     mr_asprintf(file, "%s", tmp + 1);
@@ -174 +173 @@
 * @return 0 for success, nonzero for failure.
 */
-int iso_fiddly_bits(bool nuke_me_please)
-{
-    char *mount_isodir_command = NULL;
-    char *command = NULL;
-    char *mds = NULL;
-    int retval = 0, i;
-    char *isodir_format = NULL;
+int iso_fiddly_bits(bool nuke_me_please) {
+
+char *mount_isodir_command = NULL;
+char *command = NULL;
+char *mds = NULL;
+int retval = 0, i;
+char *isodir_format = NULL;
 
 g_ISO_restore_mode = TRUE;
@@ -305 +304 @@
             mr_strcat(additional_parameters, "-o ro");
         }
+        mr_free(tmp);
+
         tmp = find_home_of_exe("setfattr");
         if (tmp) {
@@ -374 +375 @@
 mr_free(mountpoint);
 
-    return (res);
+return (res);
 }
 /**************************************************************************
@@ -418 +419 @@
             mr_free(tmp);
             res = mount_device(mountlist->el[lino].device, mountlist->el[lino].mountpoint, mountlist->el[lino].format, writeable);
-
             retval += res;
             if (res) {
@@ -660 +660 @@
 assert(bkpinfo != NULL);
 assert(cfgf != NULL);
+log_it("Entering read_cfg_file_into_bkpinfo");
 
 media_specified_by_user = bkpinfo->backup_media_type;   // or 'none', if not specified
@@ -676 +677 @@
         bkpinfo->please_dont_eject = TRUE;
     } else if (!strcmp(value, "iso")) {
-        // Patch by Conor Daly - 2004/07/12
         bkpinfo->backup_media_type = iso;
         if (am_I_in_disaster_recovery_mode()) {
@@ -687 +687 @@
                 bkpinfo->backup_media_type = cdr;
                 run_program_and_log_output("umount -d "MNT_CDROM, 1);
-                log_it
-                    ("Re-jigging configuration AGAIN. CD-R, not ISO.");
+                log_it("Re-jigging configuration AGAIN. CD-R, not ISO.");
             }
         }
@@ -698 +697 @@
             mr_asprintf(bkpinfo->prefix, "%s", STD_PREFIX);
         }
+        log_it("Setting Prefix to %s", bkpinfo->prefix);
     } else if ((!strcmp(value, "netfs")) || (!strcmp(value, "nfs"))) {
         /* Stay compatible with previous versions by allowing nfs as an entry here */
@@ -727 +727 @@
         tmp = call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE);
         if (strstr(tmp, "pxe")) {
-            /* We need to override prefix value in PXE mode as it's 
+            /* We need to override prefix value in PXE mode as it's
             * already done in start-netfs */
             envtmp1 = getenv("imgname");
@@ -754 +754 @@
         mr_free(bkpinfo->media_device);
         mr_asprintf(bkpinfo->media_device, "/dev/cdrom");
-        bkpinfo->media_size[0] = 1999 * 1024;
-        bkpinfo->media_size[1] = 650;   /* good guess */
+        bkpinfo->media_size = 650;  /* good guess */
     } else if (bkpinfo->backup_media_type == usb) {
         envtmp1 = getenv("MRUSBDEV");
@@ -778 +777 @@
         value = read_cfg_var(cfg_file, "media-size");
         if (value != NULL) {
-            bkpinfo->media_size[1] = atol(value);
+            bkpinfo->media_size = atol(value);
             mr_free(value);
         } else {
-            bkpinfo->media_size[1] = 0L;
+            bkpinfo->media_size = 0L;
         }
         log_msg(2, "Backup medium is TAPE --- dev=%s", bkpinfo->media_device);
@@ -787 +786 @@
         mr_free(bkpinfo->media_device);
         mr_asprintf(bkpinfo->media_device, "/dev/cdrom");   /* we don't really need this var */
-        bkpinfo->media_size[0] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
-        bkpinfo->media_size[1] = 1999 * 1024;   /* 650, probably, but we don't need this var anyway */
-        log_msg(2, "Backup medium is CD-R[W]");
+        bkpinfo->media_size = 1999 * 1024;  /* 650, probably, but we don't need this var anyway */
+        log_msg(2, "Backup medium is similar to CD-R[W]");
     }
 } else {
@@ -968 +966 @@
         mr_free(tmp1);
     }
-
 } else if (bkpinfo->backup_media_type == iso) {
     /* Patch by Conor Daly 23-june-2004 
@@ -1044 +1041 @@
     if (! bkpinfo->disaster_recovery) {
         if (bkpinfo->backup_media_type != media_specified_by_user) {
-            log_msg(2,
-                    "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
+            log_msg(2, "bkpinfo->backup_media_type != media_specified_by_user, so I'd better ask :)");
             interactively_obtain_media_parameters_from_user(FALSE);
             media_specified_by_user = bkpinfo->backup_media_type;
@@ -1086 +1082 @@
 int res = 0;
 pid_t pid;
+bool extract_mountlist_stub = FALSE;
 
 assert(bkpinfo != NULL);
@@ -1234 +1231 @@
             popup_and_OK("You'll now be chrooted under your future / partition.\nEdit /etc/mkinitcpio.conf if needed and rebuild your initrd with the kernel preset name e.g.\nmkinitcpio -p kernel26\nThen type exit to finish.\n");
         } else {
-            popup_and_OK("You'll now be chrooted under your future / partition.\nGo under /boot and rebuild your initrd with\nmkinitrd -f -v initrd-2.x.y.img 2.x.y e.g.\nThen type exit to finish.");
+            popup_and_OK("You'll now be chrooted under your future / partition.\nGo under /boot and rebuild your init(rd|ramfs) with\nmkinitrd -f -v initrd-2.x.y.img 2.x.y e.g.\nor initramfs, dracut, ... Then type exit to finish.");
         }
         mvaddstr_and_log_it(g_currentY, 0, "Modifying initrd...");
@@ -1435 +1432 @@
 
             if ((res) || (mntlistchg)) {
-                popup_and_OK("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
-            } else {
-                popup_and_OK("The mountlist was changed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
-            }
-            if (!g_text_mode) {
-                newtSuspend();
-            }
-            mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
-                mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
-            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
-                mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
-            } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
-                mr_asprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
-            }
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                if (res) {
+                    popup_and_OK("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                } else {
+                    popup_and_OK("The mountlist was changed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
+                }
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+                mr_asprintf(editor, "%s", find_my_editor());
+                mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                mr_free(tmp);
+
+                mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                mr_free(tmp);
+    
+                if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
+                }
+                paranoid_system(tmp);
+                mr_free(tmp);
+    
+                if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+                }
+                paranoid_system(tmp);
+                mr_free(tmp);
+
+                if (!g_text_mode) {
+                    newtResume();
+                }
+                mr_asprintf(command, "stabgrub-me %s", boot_device);
+                res = run_program_and_log_output(command, 1);
+                mr_free(command);
+
+                if (res) {
+                    popup_and_OK("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
+                    newtSuspend();
+                    paranoid_system("chroot " MNT_RESTORING);
+                    newtResume();
+                    popup_and_OK("Thank you.");
+                } else {
+                    popup_and_OK("GRUB is now installed correctly");
+                    done = TRUE;
+                }
+                popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst/grub.cfg");
+                if (!g_text_mode) {
+                    newtSuspend();
+                }
+    
+                mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                mr_free(tmp);
+    
+                mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+                paranoid_system(tmp);
+                mr_free(tmp);
+    
+                if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+                } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                }
+                paranoid_system(tmp);
+                mr_free(tmp);
+
                 mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
-            } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
-                mr_asprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
-            }
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            if (!g_text_mode) {
-                newtResume();
-            }
-            mr_asprintf(command, "stabgrub-me %s", boot_device);
-            res = run_program_and_log_output(command, 1);
-            mr_free(command);
-            if (res) {
-                popup_and_OK("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
-                newtSuspend();
-                paranoid_system("chroot " MNT_RESTORING);
-                newtResume();
-                popup_and_OK("Thank you.");
-            } else {
-                popup_and_OK("GRUB is now installed correctly");
-                done = TRUE;
-            }
-            popup_and_OK("You will now edit fstab, mtab, device.map and menu.lst/grub.cfg");
-            if (!g_text_mode) {
-                newtSuspend();
-            }
-            mr_asprintf(editor, "%s", find_my_editor());
-
-            mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
-                mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
-            } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
-                mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
-            }
-            paranoid_system(tmp);
-            mr_free(tmp);
-
-            mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
-            paranoid_system(tmp);
-            mr_free(tmp);
-            mr_free(editor);
-
-            if (!g_text_mode) {
-                newtResume();
+                paranoid_system(tmp);
+                mr_free(tmp);
+                mr_free(editor);
+    
+                if (!g_text_mode) {
+                    newtResume();
+                }
             }
         }
@@ -1525 +1525 @@
             log_msg(1, "WARNING - grub-MR not found; using grub-install");
         }
-        mvaddstr_and_log_it(g_currentY,
-                            0,
-                            "Running GRUB...                                                 ");
+        mvaddstr_and_log_it(g_currentY, 0, "Running GRUB...                                                 ");
         log_it("%s",command);
         res = run_program_and_log_output(command, 1);
@@ -1611 +1609 @@
                 paranoid_system(tmp);
                 mr_free(tmp);
-
                 mr_free(editor);
 
@@ -1688 +1685 @@
                 paranoid_system(tmp);
                 mr_free(tmp);
-
                 mr_free(editor);
 
@@ -2114 +2110 @@
     paranoid_free(raidlist);
 }
-
-

branches/3.1/mondo/src/mondorestore/mondoprep.h

@@ -69 +69 @@
 int partition_everything(struct mountlist_itself *);
 int do_my_funky_lvm_stuff(bool, bool);
-char *which_format_command_do_i_need(char *);
 int make_dummy_partitions(FILE *, char *, int);
 int make_list_of_drives(struct mountlist_itself *,

branches/3.1/mondo/src/mondorestore/mondorestore.c

@@ -582 +582 @@
                     log_msg(1, "Restoring subset");
                     retval += restore_everything(filelist);
+                    free_filelist(filelist);
                 } else {
                     mr_free(bkpinfo->restore_path);
@@ -839 +840 @@
                         "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
-    mr_asprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp, TRUE);
-    mr_free(tmp);
+    mr_free(tmp1);
     if (res) {
         log_to_screen("label-partitions-as-necessary returned an error");
@@ -2045 +2046 @@
     int res;
     int attempts;
-    long current_tarball_number = 0;
+    long current_tarball_number = 0L;
     long max_val;
   /**malloc ***/
@@ -2620 +2621 @@
     mr_free(tmp1);
 
+    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
+    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
+
+
+
     /* Init GUI */
     setup_newt_stuff();         /* call newtInit and setup screen log */
@@ -2666 +2672 @@
 
     log_it("what time is it");
-
-    mountlist = (struct mountlist_itself *)mr_malloc(sizeof(struct mountlist_itself));
-    raidlist = (struct raidlist_itself *)mr_malloc(sizeof(struct raidlist_itself));
 
     /* Process command-line parameters */
@@ -2799 +2802 @@
         mount_boot_if_necessary();  /* for Gentoo users */
         log_msg(2, "Still here.");
-        /* Adding an initialisation in order to avoid to hndle NULL pointer later */
+        /* Adding an initialisation in order to avoid to handle NULL pointer later */
         mr_free(bkpinfo->restore_path);
         mr_asprintf(bkpinfo->restore_path, "%s", "/tmp");

branches/3.2/mondo/src/include/mr_str.h

@@ -19 +19 @@
 extern inline char *mr_date(void);
 extern void mr_strip_spaces(char *in_out);
+/*
+extern void mr_strip_char(char *in_out, char *caracs);
+extern void mr_chomp(char *in_out);
+*/
 
 #endif                          /* MR_STR_H */

branches/3.2/mondo/src/include/my-stuff.h

@@ -8 +8 @@
 // Extra info for ACLs and SELINUX users
 #define STAR_ACL_SZ "-xattr -acl"
-//#define STAR_ACL_SZ "-xfflags"
-//#define STAR_ACL_SZ ""
-// Enable the first line and disable the second if you are a Fedora Core 2 user
 
 /**
@@ -230 +227 @@
  */
 #define MAX_TAPECAT_FNAME_LEN 32
-
-//#define strcpy(y,x) strncpy(y, x, sizeof(y)-1)
-
 
 /**
@@ -346 +340 @@
 #define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
 #define FORTY_SPACES "                                         "    ///< 40 spaces.
-    ///< Size of the tmpfs, in megabytes, to attempt to mount (to speed up Mondo).
-/*
-#define PPCFG_RAMDISK_SIZE 350
-*/
-
 #define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
 #define MONDO_MNTLISTCHG "/tmp/mountlist.changed"

branches/3.2/mondo/src/lib/mr_str.c

@@ -146 +146 @@
 }
 
+/* Return an allocated string containing the date
+char *mr_date(void) {
+    
+    time_t tcurr;
+    char *tmp = NULL;
+
+    tcurr = time(NULL);
+    mr_asprintf(tmp, "%s", ctime(&tcurr));
+    mr_chomp(tmp);
+    return(tmp);
+}
+ */
 
 /**
@@ -181 +193 @@
     in_out[i] = '\0';
 }
+
+
+/*
+ * Remove '\n' char from both sides of @p in_out.
+ * @param in_out The string to strip characters from (modified).
+
+void mr_chomp(char *in_out) {
+
+    mr_strip_char(in_out, "\n");
+}
+*/
+
+/**
+ * Remove all characters in caracs from begining and end of string @p in_out
+ * @param in_out The string to strip char characters from (modified).
+
+void mr_strip_char(char *in_out, char *caracs) {
+    int i = 0;
+    int j = 0;
+    size_t length = 0;
+
+    if (caracs == NULL) {
+        return;
+    }
+    if (in_out == NULL) {
+        return;
+    }
+    length = strlen(in_out);
+
+    /* Skip initial caracs */
+    for (i = 0; index(caracs, in_out[i]) != NULL && i < (int)length ; i++);
+
+    /* Shift the string to the begining if needed */
+    if (i != 0) {
+        for (j = 0; i < (int)length ; i++, j++) {
+            in_out[j] = in_out[i];
+        }
+        /* Erase the end of the string if needed */
+        j++;
+        in_out[j] = '\0';
+    }
+
+    /* Skip final caracs */
+    for (i = (int)strlen(in_out) - 1; i >= 0  && index(caracs, in_out[i]) != NULL; i--);
+
+    /* The string now ends after that char */
+    i++;
+    in_out[i] = '\0';
+}
+*/
+

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -32 +33 @@
 
 /***************** global vars, used only by main.c ******************/
-long diffs;
+long diffs = 0L;
 
 extern t_bkptype g_backup_media_type;
 extern int g_loglevel;
+
+extern char *g_magicdev_command;
 
 /**
@@ -74 +77 @@
     char *tmp = NULL;
 
-    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org",
-            PACKAGE_VERSION);
+    log_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", PACKAGE_VERSION);
     log_msg(0, "running %s binaries", get_architecture());
     tmp = get_uname_m();
     log_msg(0, "running on %s architecture", tmp);
     mr_free(tmp);
-    log_msg(0,
-            "-----------------------------------------------------------");
-    log_msg(0,
-            "NB: Mondo logs almost everything, so don't panic if you see");
-    log_msg(0,
-            "some error messages.  Please read them carefully before you");
-    log_msg(0,
-            "decide to break out in a cold sweat.    Despite (or perhaps");
-    log_msg(0,
-            "because of) the wealth of messages. some users are inclined");
-    log_msg(0,
-            "to stop reading this log. If Mondo stopped for some reason,");
-    log_msg(0,
-            "chances are it's detailed here.  More than likely there's a");
-    log_msg(0,
-            "message at the very end of this log that will tell you what");
-    log_msg(0,
-            "is wrong. Please read it!                          -Devteam");
-    log_msg(0,
-            "-----------------------------------------------------------");
+    log_msg(0, "-----------------------------------------------------------");
+    log_msg(0, "NB: Mondo logs almost everything, so don't panic if you see");
+    log_msg(0, "some error messages.  Please read them carefully before you");
+    log_msg(0, "decide to break out in a cold sweat.    Despite (or perhaps");
+    log_msg(0, "because of) the wealth of messages. some users are inclined");
+    log_msg(0, "to stop reading this log. If Mondo stopped for some reason,");
+    log_msg(0, "chances are it's detailed here.  More than likely there's a");
+    log_msg(0, "message at the very end of this log that will tell you what");
+    log_msg(0, "is wrong. Please read it!                          -Devteam");
+    log_msg(0, "-----------------------------------------------------------");
 
     log_msg(0, "Zero...");
@@ -113 +105 @@
 }
 
-
-extern char *g_magicdev_command;
 
 /**
@@ -170 +160 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
-    int res, retval;
+    int res = 0;
+    int i = 0;
+    int retval = 0;
     char *say_at_end = NULL;
     FILE *fin = NULL;
@@ -181 +173 @@
 
 /* If -V, -v or --version then echo version no. and quit */
-    if (argc == 2
-        && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
-            || !strcmp(argv[argc - 1], "--version"))) {
+    if (argc == 2 && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V") || !strcmp(argv[argc - 1], "--version"))) {
         printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
         exit(0);
@@ -196 +186 @@
     reset_bkpinfo();
 
-    res = 0;
-    retval = 0;
-    diffs = 0;
+    /* Memory allocation is done in those functions */
     malloc_libmondo_global_strings();
 
@@ -208 +196 @@
     mr_asprintf(tmp1,"%s:/sbin:/usr/sbin:/usr/local/sbin",getenv("PATH"));
     setenv("PATH", tmp1, 1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     /* Add the ARCH environment variable for ia64 purposes */
     mr_asprintf(tmp1,"%s",get_architecture());
     setenv("ARCH", tmp1, 1);
-    paranoid_free(tmp1);
+    mr_free(tmp1);
 
     /* Add MONDO_SHARE environment variable for mindi */
@@ -255 +243 @@
         g_text_mode = TRUE;
         setup_newt_stuff();
-        malloc_string(tmp);
-        turn_wildcard_chars_into_literal_chars(tmp, argv[2]);
-        printf("in=%s; out=%s\n", argv[2], tmp);
-        paranoid_free(tmp);
+        tmp1 = mr_stresc(argv[2], "[]*?", '\\');
+        printf("in=%s; out=%s\n", argv[2], tmp1);
+        mr_free(tmp1);
         finish(1);
     }
@@ -311 +298 @@
             printf("CD-ROM is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -325 +312 @@
             printf("DVD is at %s\n", tmp);
         }
-        paranoid_free(tmp);
+        mr_free(tmp);
         finish(0);
     }
@@ -343 +330 @@
 
     if (pre_param_configuration()) {
-        fatal_error
-            ("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
-    }
-
-/* Process command line, if there is one. If not, ask user for info. */
+        fatal_error("Pre-param initialization phase failed. Please review the error messages above, make the specified changes, then try again. Exiting...");
+    }
+
+    /* Process command line, if there is one. If not, ask user for info. */
     if (argc == 1) {
         g_text_mode = FALSE;
@@ -353 +339 @@
         res = interactively_obtain_media_parameters_from_user(TRUE);    /* yes, archiving */
         if (res) {
-            fatal_error
-                ("Syntax error. Please review the parameters you have supplied and try again.");
+            fatal_error("Syntax error. Please review the parameters you have supplied and try again.");
         }
     } else {
         res = handle_incoming_parameters(argc, argv);
         if (res) {
-            printf
-                ("Errors were detected in the command line you supplied.\n");
+            printf("Errors were detected in the command line you supplied.\n");
             printf("Please review the log file - %s\n", MONDO_LOGFILE );
             log_msg(1, "Mondoarchive will now exit.");
@@ -370 +354 @@
 /* Finish configuring global structures */
     if (post_param_configuration()) {
-        fatal_error
-            ("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
-    }
-
-    log_to_screen
-        ("BusyBox's sources are available from http://www.busybox.net");
+        fatal_error("Post-param initialization phase failed. Perhaps bad parameters were supplied to mondoarchive? Please review the documentation, error messages and logs. Exiting...");
+    }
 
     /* If we're meant to backup then backup */
@@ -392 +372 @@
         res = verify_data();
         if (res < 0) {
-            mr_asprintf(tmp, "%d difference%c found.", -res,
-                    (-res != 1) ? 's' : ' ');
+            mr_asprintf(tmp, "%d difference%c found.", -res, (-res != 1) ? 's' : ' ');
             mr_asprintf(say_at_end, "%s", tmp);
             log_to_screen(tmp);
@@ -430 +409 @@
     if (say_at_end != NULL) {
         log_to_screen(say_at_end);
-        paranoid_free(say_at_end);
+        mr_free(say_at_end);
     }
     mr_asprintf(tmp, "umount %s/tmpfs", bkpinfo->tmpdir);
@@ -437 +416 @@
     if (bkpinfo->backup_media_type == usb) {
         log_msg(1, "Unmounting USB device.");
+        if (bkpinfo->media_device == NULL) {
+            fatal_error("USB device set to NULL");
+        }
         mr_asprintf(tmp, "umount %s1", bkpinfo->media_device);
         run_program_and_log_output(tmp, TRUE);
@@ -471 +453 @@
 
     if (!g_text_mode) {
-        popup_and_OK
-            ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
+        popup_and_OK("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
         log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
     } else {

branches/3.2/mondo/src/mondoarchive/mondoarchive.h

@@ -9 +9 @@
  */
 char *MONDO_LOGFILE = "/var/log/mondoarchive.log";
-char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LM:NOP:QRS:T:UVWb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
+char *MONDO_OPTIONS = "0123456789A:B:C:DE:FGHI:J:K:LM:NOP:QRS:T:UVWYb:c:d:ef:gik:l:mn:op:rs:tuw:x:z";
 
 /* No restriction on ps options */

branches/3.2/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -43 +43 @@
 
   /** needs malloc *******/
-    char *checksum_ptr;
-    char *original_cksum_ptr;
-    char *bigfile_fname_ptr;
-    char *tmp_ptr = NULL;
-    char *command_ptr;
-
-    char *checksum, *original_cksum, *bigfile_fname, *tmp, *command;
+    char *checksum = NULL;
+    char *original_cksum = NULL;
+    char *bigfile_fname = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
 
     char *p;
@@ -56 +54 @@
 
     struct s_filename_and_lstat_info biggiestruct;
-
-    malloc_string(checksum);
-    malloc_string(original_cksum);
-    malloc_string(bigfile_fname);
-    malloc_string(tmp);
-    malloc_string(command);
-    malloc_string(checksum_ptr);
-    malloc_string(original_cksum_ptr);
-    malloc_string(bigfile_fname_ptr);
-    malloc_string(command_ptr);
 
   /*********************************************************************
@@ -71 +59 @@
    *********************************************************************/
     assert(bkpinfo != NULL);
-    memset(checksum_ptr, '\0', sizeof(checksum));
-    memset(original_cksum_ptr, '\0', sizeof(original_cksum));
-    memset(bigfile_fname_ptr, '\0', sizeof(bigfile_fname));
-    memset(command_ptr, '\0', sizeof(command));
   /** end **/
 
@@ -81 +65 @@
             insist_on_this_cd_number((++g_current_media_number));
         } else {
-            mr_asprintf(tmp_ptr, "No CD's left. No biggiefiles left. No prob, Bob.");
-            log_msg(2, tmp_ptr);
-            paranoid_free(tmp_ptr);
+            log_msg(2, "No CD's left. No biggiefiles left. No prob, Bob.");
             return (0);
         }
     }
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        mr_asprintf(tmp_ptr, "Cannot open bigfile %ld (%s)'s info file", bigfileno + 1, bigfile_fname_ptr);
-        log_to_screen(tmp_ptr);
-        paranoid_free(tmp_ptr);
+        log_to_screen("Cannot open bigfile %ld (NULL)'s info file", bigfileno + 1);
         return (1);
     }
@@ -98 +78 @@
     paranoid_fclose(fin);
 
-    strcpy(checksum_ptr, biggiestruct.checksum);
-    strcpy(bigfile_fname_ptr, biggiestruct.filename);
-
+
+    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
     log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
+    mr_asprintf(checksum, "%s", biggiestruct.checksum);
     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
     if (!g_text_mode) {
-        mr_asprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
-        newtDrawRootText(0, 22, tmp_ptr);
-        paranoid_free(tmp_ptr);
+        mr_asprintf(tmp, "Comparing %s", bigfile_fname);
+        newtDrawRootText(0, 22, tmp);
+        mr_free(tmp);
         newtRefresh();
     }
-    if (!checksum[0]) {
-        log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
-    }
-    if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
-        strcpy(original_cksum_ptr, "IGNORE");
-    } else {
-        sprintf(command_ptr,
-                "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors",
-                MNT_RESTORING, bigfile_fname_ptr);
-    }
-    log_msg(2, command_ptr);
-    mr_asprintf(tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
-    paranoid_system(tmp_ptr);
-    paranoid_free(tmp_ptr);
-
-    if (system(command_ptr)) {
+    if (checksum == NULL]) {
+        log_msg(2, "Warning - %s has no checksum", bigfile_fname);
+    }
+    if (!strncmp(bigfile_fname, "/dev/", 5)) {
+        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname);
+        mr_free(checksum);
+        mr_free(bigfile_fname);
+        return (1);
+    }
+
+    mr_asprintf(command, "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", MNT_RESTORING, bigfile_fname);
+    log_msg(2, command);
+    i =  system(command);
+    mr_free(command);
+
+    mr_asprintf(tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+    paranoid_system(tmp);
+    mr_free(tmp);
+
+    if (i) {
         log_OS_error("Warning - command failed");
-        original_cksum[0] = '\0';
+        mr_free(checksum);
+        mr_free(bigfile_fname);
         return (1);
     } else {
         if (!(fin = fopen("/tmp/md5sum.txt", "r"))) {
-            log_msg(2,
-                    "Unable to open /tmp/md5sum.txt; can't get live checksum");
-            original_cksum[0] = '\0';
+            log_msg(2, "Unable to open /tmp/md5sum.txt; can't get live checksum");
+            mr_free(checksum);
+            mr_free(bigfile_fname);
             return (1);
         } else {
-            if (fgets(original_cksum_ptr, MAX_STR_LEN - 1, fin)) {
-                // FIXME
-            }
+            mr_getline(original_cksum, fin);
             paranoid_fclose(fin);
-            for (i = strlen(original_cksum_ptr);
+            for (i = strlen(original_cksum);
                  i > 0 && original_cksum[i - 1] < 32; i--);
             original_cksum[i] = '\0';
-            p = (char *) strchr(original_cksum_ptr, ' ');
+            p = strchr(original_cksum, ' ');
             if (p) {
                 *p = '\0';
@@ -149 +132 @@
         }
     }
-    mr_asprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
-    if (!strcmp(checksum_ptr, original_cksum_ptr) != 0) {
-        mr_strcat(tmp_ptr, " ... OK");
-    } else {
-        mr_strcat(tmp_ptr, "... changed");
+    mr_asprintf(tmp, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname);
+    if ((original_cksum != NULL) && (strcmp(checksum, original_cksum) == 0)) {
+        mr_strcat(tmp, " ... OK");
+    } else {
+        mr_strcat(tmp, "... changed");
         retval++;
     }
-    log_msg(1, tmp_ptr);
-    paranoid_free(tmp_ptr);
+    mr_free(checksum);
+    mr_free(original_cksum);
+
+    log_msg(1, tmp);
+    mr_free(tmp);
 
     if (retval) {
@@ -163 +149 @@
             fatal_error("Cannot openout changed.txt");
         }
-        fprintf(fout, "%s\n", bigfile_fname_ptr);
+        fprintf(fout, "%s\n", bigfile_fname);
         paranoid_fclose(fout);
     }
-
-    paranoid_free(original_cksum_ptr);
-    paranoid_free(original_cksum);
-    paranoid_free(bigfile_fname_ptr);
-    paranoid_free(bigfile_fname);
-    paranoid_free(checksum_ptr);
-    paranoid_free(checksum);
-    paranoid_free(command_ptr);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(bigfile_fname);
 
     return (retval);
@@ -194 +171 @@
     int res;
     long noof_biggiefiles, bigfileno = 0;
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     log_msg(1, "Comparing biggiefiles");
@@ -215 +192 @@
                        noof_biggiefiles);
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
-        sprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
+        mr_asprintf(tmp, "Comparing big file #%ld", bigfileno + 1);
         log_msg(1, tmp);
         update_progress_form(tmp);
+        mr_free(tmp);
+
         res = compare_a_biggiefile(bigfileno);
         retval += res;
@@ -253 +232 @@
 
   /***  needs malloc *********/
-    char *command, *tmp, *filelist_name, *logfile,
-        *compressor_exe;
+    char *command = NULL;
+    char *tmp = NULL;
     char *archiver_exe = NULL;
-
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(filelist_name);
-    malloc_string(logfile);
-    malloc_string(compressor_exe);
+    char *tmp1 = NULL;
+    char *logfile = NULL;
+    char *compressor_exe = NULL;
 
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    sprintf(logfile, "/tmp/afio.log.%d", current_tarball_number);
-    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%d",
-            current_tarball_number);
+    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%d", current_tarball_number);
 
     if (strstr(tarball_fname, ".bz2")) {
-        strcpy(compressor_exe, "bzip2");
+        mr_asprintf(compressor_exe, "bzip2");
+    } else if (strstr(tarball_fname, ".lzma")) {
+        mr_asprintf(compressor_exe, "lzma");
     } else if (strstr(tarball_fname, ".gz")) {
-        strcpy(compressor_exe, "gzip");
+        mr_asprintf(compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
-        strcpy(compressor_exe, "lzop");
-    } else {
-        compressor_exe[0] = '\0';
+        mr_asprintf(compressor_exe, "lzop");
     }
 
@@ -285 +259 @@
     }
 
-    if (compressor_exe[0]) {
-        strcpy(tmp, compressor_exe);
+    if (compressor_exe) {
+        mr_asprintf(tmp, "%s", compressor_exe);
         if (!find_home_of_exe(tmp)) {
+            mr_free(tmp);
+            mr_free(compressor_exe);
+            mr_free(archiver_exe);
             fatal_error("(compare_a_tarball) Compression program missing");
         }
-        if (use_star)           // star
-        {
+        mr_free(tmp);
+
+        if (use_star) {
             if (!strcmp(compressor_exe, "bzip2")) {
                 mr_strcat(archiver_exe, " -bz");
             } else {
-                fatal_error
-                    ("(compare_a_tarball) Please use only bzip2 with star");
+                mr_free(compressor_exe);
+                mr_free(archiver_exe);
+                fatal_error("(compare_a_tarball) Please use only bzip2 with star");
             }
-        } else                  // afio
-        {
-            sprintf(compressor_exe, "-P %s -Z", tmp);
-        }
-    }
-// star -diff H=star -bz file=....
+        } else {
+            // afio
+            mr_asprintf(tmp, "%s", compressor_exe);
+            mr_free(compressor_exe);
+            mr_asprintf(compressor_exe, "-P %s -Z", tmp);
+            mr_free(tmp);
+        }
+    }
 
 #ifdef __FreeBSD__
@@ -310 +291 @@
 #define BUFSIZE (1024L*1024L)/TAPE_BLOCK_SIZE
 #endif
-    if (use_star)               // doesn't use compressor_exe
-    {
-        sprintf(command,
-                "%s -sparse -diff H=exustar file=%s >> %s 2>> %s",
-                archiver_exe, tarball_fname, logfile, logfile);
-    } else {
-        sprintf(command,
-                "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s",
-                archiver_exe,
-                TAPE_BLOCK_SIZE,
-                BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
-    }
-    paranoid_free(archiver_exe);
+    mr_asprintf(logfile, "/tmp/afio.log.%d", current_tarball_number);
+
+    if (use_star) {
+        // doesn't use compressor_exe
+        mr_asprintf(command, "%s -sparse -diff H=exustar file=%s >> %s 2>> %s", archiver_exe, tarball_fname, logfile, logfile);
+    } else {
+        mr_asprintf(command, "%s -r -b %ld -M 16m -c %ld %s %s >> %s 2>> %s", archiver_exe, TAPE_BLOCK_SIZE, BUFSIZE, compressor_exe, tarball_fname, logfile, logfile);
+    }
+    mr_free(compressor_exe);
+    mr_free(archiver_exe);
 
 #undef BUFSIZE
@@ -330 +308 @@
     if (res) {
         log_OS_error(command);
-        sprintf(tmp, "Warning - afio returned error = %d", res);
-        log_msg(2, tmp);
-    }
+        log_msg(2, "Warning - afio returned error = %d", res);
+    }
+    mr_free(command);
+
     if (length_of_file(logfile) > 5) {
-        sprintf(command,
-                "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt",
-                logfile);
+        mr_asprintf(command, "sed s/': \\\"'/\\|/ %s | sed s/'\\\": '/\\|/ | cut -d'|' -f2 | sort -u | grep -vE \"^dev/.*\" >> "MONDO_CACHE"/changed.txt", logfile);
         paranoid_system(command);
+        mr_free(command);
+
         archiver_errors = count_lines_in_file(logfile);
     } else {
         archiver_errors = 0;
     }
-    sprintf(tmp, "%ld difference%c in fileset #%d          ",
-            archiver_errors, (archiver_errors != 1) ? 's' : ' ',
-            current_tarball_number);
     if (archiver_errors) {
-        sprintf(tmp,
-                "Differences found while processing fileset #%d       ",
-                current_tarball_number);
-        log_msg(1, tmp);
+        log_msg(1, "%ld difference%c in fileset #%d          ", archiver_errors, (archiver_errors != 1) ? 's' : ' ', current_tarball_number);
     }
     unlink(logfile);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(logfile);
-    paranoid_free(compressor_exe);
+    mr_free(logfile);
+
     return (retval);
 }
@@ -377 +347 @@
   /**  needs malloc **********/
 
-    char *tarball_fname, *progress_str, *tmp;
+    char *tarball_fname = NULL;
+    char *progress_str = NULL; 
+    char *tmp = NULL;
     char *mds = NULL;
     long max_val;
 
-    malloc_string(tarball_fname);
-    malloc_string(progress_str);
     malloc_string(tmp);
-
     assert(bkpinfo != NULL);
     mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
-
     max_val = atol(tmp);
+    paranoid_free(tmp);
+
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
+    mr_asprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
 
     open_progress_form("Comparing files",
@@ -403 +373 @@
         insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
-        sprintf(tarball_fname,
-                MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
+        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.bz2", current_tarball_number);
 
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.gz",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzma", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.bz2",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%d.star.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.star.bz2", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -432 +405 @@
                 == 0) {
                 log_msg(2, "OK, I think I'm done with tarballs...");
+                mr_free(tarball_fname);
                 break;
             }
             log_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
+
+            mr_free(progress_str);
+            mr_asprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
             log_to_screen(progress_str);
         } else {
@@ -444 +420 @@
             current_tarball_number++;
         }
-    }
+        mr_free(tarball_fname);
+    }
+    mr_free(progress_str);
     mr_free(mds);
 
@@ -453 +431 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(tmp);
     return (retval);
 }
@@ -478 +453 @@
 {
   /** needs malloc *********/
-    char *tmp, *cwd, *new, *command;
+    char *tmp = NULL;
+    char *cwd, *new;
+    char *command = NULL;
     int resA = 0;
     int resB = 0;
@@ -486 +463 @@
     malloc_string(cwd);
     malloc_string(new);
-    malloc_string(command);
 
     assert(bkpinfo != NULL);
@@ -509 +485 @@
     noof_changed_files = count_lines_in_file(MONDO_CACHE"/changed.txt");
     if (noof_changed_files) {
-        sprintf(tmp, "%ld files do not match the backup            ",
-                noof_changed_files);
-        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
-        log_to_screen(tmp);
-        sprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
+        log_to_screen("%ld files do not match the backup            ", noof_changed_files);
+
+        mr_asprintf(command, "cat "MONDO_CACHE"/changed.txt >> %s", MONDO_LOGFILE);
         paranoid_system(command);
-    } else {
-        sprintf(tmp, "All files match the backup                     ");
+        mr_free(command);
+    } else {
+        mr_asprintf(tmp, "All files match the backup                     ");
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         log_to_screen(tmp);
-    }
-
-    paranoid_free(tmp);
+        mr_free(tmp);
+    }
+
     paranoid_free(cwd);
     paranoid_free(new);
-    paranoid_free(command);
 
     return (resA + resB);
@@ -552 +526 @@
     int res = 0;
     long q;
-    char *tmp;
+    char *tmp = NULL;
     char *new;
     char *cwd;
 
-    malloc_string(tmp);
     malloc_string(new);
     malloc_string(cwd);
@@ -630 +603 @@
         } else {
             q = count_lines_in_file(MONDO_CACHE"/changed.files");
-            sprintf(tmp, "%ld significant difference%s found.", q,
-                    (q != 1) ? "s" : "");
+            mr_asprintf(tmp, "%ld significant difference%s found.", q, (q != 1) ? "s" : "");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
-
-            strcpy(tmp,
-                   "Type 'less /tmp/changed.files' for a list of non-matching files");
+            mr_free(tmp);
+
+            mr_asprintf(tmp, "Type 'less /tmp/changed.files' for a list of non-matching files");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
+            mr_free(tmp);
 
             log_msg(2, "calling popup_changelist_from_file()");
@@ -663 +636 @@
 
     kill_petris();
-    paranoid_free(tmp);
     paranoid_free(new);
     paranoid_free(cwd);
@@ -686 +658 @@
 
   /** needs malloc **/
-    char *dir, *command;
+    char *dir;
+    char *command = NULL;
 
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
     if (getcwd(dir, MAX_STR_LEN)) {
         // FIXME
@@ -698 +670 @@
     }
 
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
-            bkpinfo->restore_path);
+    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
-    mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+    mr_free(command);
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
 
     if (bkpinfo->disaster_recovery
@@ -726 +697 @@
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     paranoid_free(dir);
-    paranoid_free(command);
     return (res);
 }
@@ -749 +719 @@
 {
     int res;
-    char *dir, *command;
+    char *dir;
+    char *command = NULL;
 
     assert(bkpinfo != NULL);
     malloc_string(dir);
-    malloc_string(command);
 
     if (getcwd(dir, MAX_STR_LEN)) {
@@ -761 +731 @@
         // FIXME
     }
-    sprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp",
-            bkpinfo->restore_path);
+    mr_asprintf(command, "cp -f /tmp/LAST-FILELIST-NUMBER %s/tmp", bkpinfo->restore_path);
     run_program_and_log_output(command, FALSE);
-    mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+    mr_free(command);
+
+    mvaddstr_and_log_it(g_currentY, 0, "Verifying archives against filesystem");
     res = verify_tape_backups();
     if (chdir(dir)) {
@@ -776 +746 @@
     }
     paranoid_free(dir);
-    paranoid_free(command);
     return (res);
 }

branches/3.2/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -12 +12 @@
 #include "mondo-rstr-newt.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 
 //static char cvsid[] = "$Id$";
@@ -52 +53 @@
 {
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     /** newt **************************************************************/
@@ -78 +79 @@
     newtPushHelpLine
         ("   Add one of the following unallocated RAID partitions to this RAID device.");
-    sprintf(tmp, "%-26s %s", "Device", "Size");
+    mr_asprintf(tmp, "%-26s %s", "Device", "Size");
     headerMsg = newtLabel(1, 1, tmp);
     partitionsListbox =
@@ -104 +105 @@
 
             items = disklist->entries;
-            strcpy(disklist->el[items].device,
-                   unallocated_raid_partitions->el[currline].device);
+            strcpy(disklist->el[items].device, unallocated_raid_partitions->el[currline].device);
             disklist->el[items].index = index;
             disklist->entries = ++items;
@@ -112 +112 @@
     }
     newtFormDestroy(myForm);
+    mr_free(tmp);
     newtPopWindow();
     newtPopHelpLine();
@@ -152 +153 @@
 
     /** buffers **********************************************************/
-    char drive_to_add[MAX_STR_LEN];
-    char mountpoint_str[MAX_STR_LEN];
-    char size_str[MAX_STR_LEN];
-    char device_str[MAX_STR_LEN];
-    char format_str[MAX_STR_LEN];
+    char *drive_to_add = NULL;
+    char *mountpoint_str = NULL;
+    char *size_str = NULL;
+    char *device_str = NULL;
+    char *format_str = NULL;
 
     /** pointers *********************************************************/
@@ -169 +170 @@
     assert(keylist != NULL);
 
-    strcpy(device_str, "/dev/");
-    strcpy(mountpoint_str, "/");
+    mr_asprintf(device_str, "/dev/");
+    mr_asprintf(mountpoint_str, "/");
+    mr_asprintf(size_str, "");
 #ifdef __FreeBSD__
-    strcpy(format_str, "ufs");
+    mr_asprintf(format_str, "ufs");
 #else
-    strcpy(format_str, "ext3");
+    mr_asprintf(format_str, "ext3");
 #endif
-    size_str[0] = '\0';
-    /* sprintf(size_str,""); */
     newtOpenWindow(20, 5, 48, 10, "Add entry");
     label0 = newtLabel(2, 1, "Device:    ");
@@ -183 +183 @@
     label2 = newtLabel(2, 3, "Size (MB): ");
     label3 = newtLabel(2, 4, "Format:    ");
-    deviceComp =
-        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
-    mountpointComp =
-        newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
-    formatComp =
-        newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
+    deviceComp = newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
+    mountpointComp = newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
+    formatComp = newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
     sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
     bOK = newtButton(5, 6, "  OK  ");
@@ -200 +197 @@
     for (b_res = NULL; b_res != bOK && b_res != bCancel;) {
         b_res = newtRunForm(myForm);
-        strcpy(device_str, device_here);
-        strcpy(mountpoint_str, mountpoint_here);
-        strcpy(format_str, format_here);
-        strcpy(size_str, size_here);
-//      log_it ("Originals = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
-        strip_spaces(device_str);
-        strip_spaces(mountpoint_str);
-        strip_spaces(format_str);
-        strip_spaces(size_str);
-//      log_it ("Modified = %s,%s,%s,%s", device_str, mountpoint_str, format_str, size_str);
+        mr_free(device_str);
+        mr_asprintf(device_str, "%s", device_here);
+
+        mr_free(mountpoint_str);
+        mr_asprintf(mountpoint_str, "%s", mountpoint_here);
+        mr_strip_spaces(mountpoint_str);
+
+        mr_free(format_str);
+        mr_asprintf(format_str, "%s", format_here);
+        mr_strip_spaces(format_str);
+
+        mr_free(size_str);
+        mr_asprintf(size_str, "%s", size_here);
+        mr_strip_spaces(size_str);
+
+        mr_strip_spaces(device_str);
         if (b_res == bOK) {
             if (device_str[strlen(device_str) - 1] == '/') {
@@ -215 +218 @@
                 b_res = NULL;
             }
-            if (size_of_specific_device_in_mountlist(mountlist, device_str)
-                >= 0) {
+            if (size_of_specific_device_in_mountlist(mountlist, device_str) >= 0) {
                 popup_and_OK("Can't add this - you've got one already!");
                 b_res = NULL;
@@ -228 +230 @@
         return;
     }
-    strcpy(drive_to_add, device_str);
+    mr_asprintf(drive_to_add, "%s", device_str);
     for (i = strlen(drive_to_add); isdigit(drive_to_add[i - 1]); i--);
-    drive_to_add[i] = '\0';
+    mr_free(drive_to_add);
+
     currline = mountlist->entries;
     strcpy(mountlist->el[currline].device, device_str);
     strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
+    mr_free(mountpoint_str);
+
     strcpy(mountlist->el[currline].format, format_str);
+    mr_free(format_str);
+
     mountlist->el[currline].size = atol(size_str) * 1024L;
+    mr_free(size_str);
+
     mountlist->entries++;
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
-        initiate_new_raidlist_entry(raidlist, mountlist, currline,
-                                    device_str);
-    }
+        initiate_new_raidlist_entry(raidlist, mountlist, currline, device_str);
+    }
+    mr_free(device_str);
+
     redraw_mountlist(mountlist, keylist, listbox);
 }
@@ -315 +325 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
-
-
-
+    char tmp = NULL;
+    char *devname = NULL;
 
     for (i = 0;
@@ -324 +332 @@
          && strcmp(raidlist->el[i].volname, basename(raid_device)); i++);
     if (i == raidlist->entries) {
-        sprintf(tmp,
-                "Cannot calc size of raid device %s - cannot find it in raidlist",
-                raid_device);
-        log_it(tmp);
+        log_it("Cannot calc size of raid device %s - cannot find it in raidlist", raid_device);
         return (0);             // Isn't this more sensible than 999999999? If the raid dev !exists,
         // then it has no size, right?
@@ -339 +344 @@
         int k = 0, l = 0;
         for (k = 0; k < raidrec->plex[j].subdisks; ++k) {
-            char devname[64];
-            strcpy(devname, raidrec->plex[j].sd[k].which_device);
+            mr_asprintf(devname, "%s", raidrec->plex[j].sd[k].which_device);
             for (l = 0; l < raidlist->disks.entries; ++l) {
                 if (!strcmp(devname, raidlist->disks.el[l].name)) {
@@ -368 +372 @@
                 }
             }
+            mr_free(devname);
         }
 
@@ -388 +393 @@
     }
 
-    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
-            (long) smallest_plex);
-    log_it(tmp);
+    log_it("I have calculated %s's real size to be %ld", raid_device, (long) smallest_plex);
     return (smallest_plex);
 #else
@@ -407 +410 @@
     long sp = 0;
 
-    /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
-
     assert(mountlist != NULL);
     assert(raidlist != NULL);
@@ -418 +418 @@
          && strcmp(raidlist->el[i].raid_device, raid_device); i++);
     if (i == raidlist->entries) {
-        sprintf(tmp,
-                "Cannot calc size of raid device %s - cannot find it in raidlist",
-                raid_device);
-        log_it(tmp);
+        log_it("Cannot calc size of raid device %s - cannot find it in raidlist", raid_device);
         return (999999999);
     }
@@ -444 +441 @@
         total_size = smallest_partition * (noof_partitions - 1);
     }
-    sprintf(tmp, "I have calculated %s's real size to be %ld", raid_device,
-            (long) total_size);
-    log_it(tmp);
+    log_it("I have calculated %s's real size to be %ld", raid_device, (long) total_size);
     return (total_size);
 #endif
@@ -470 +465 @@
     /** buffers ***********************************************************/
     char tmp[MAX_STR_LEN];
-    char prompt[MAX_STR_LEN];
+    char *prompt = NULL;
     char sz[MAX_STR_LEN];
 
-    sprintf(prompt,
-            "Please enter the RAID level you want. (concat, striped, raid5)");
+    mr_asprintf(prompt, "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
         strcpy(tmp, "concat");
@@ -485 +479 @@
         res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
         if (!res) {
+            mr_free(prompt);
             return;
         }
@@ -502 +497 @@
         log_it(tmp);
         if (is_this_raid_personality_registered(out)) {
-            log_it
-                ("Groovy. You've picked a RAID personality which is registered.");
+            log_it("Groovy. You've picked a RAID personality which is registered.");
         } else {
-            if (ask_me_yes_or_no
-                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
+            if (ask_me_yes_or_no("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
             {
                 out = 999;
@@ -512 +505 @@
         }
     }
+    mr_free(prompt);
+
     raidrec->raidlevel = out;
 #else
     /** buffers ***********************************************************/
     char tmp[MAX_STR_LEN];
-    char personalities[MAX_STR_LEN];
-    char prompt[MAX_STR_LEN];
+    char *personalities = NULL;
+    char *prompt = NULL;
     char sz[MAX_STR_LEN];
-    int out = 0, res = 0;
+    int out = 0;
+    int res = 0;
 
 
     assert(raidrec != NULL);
     paranoid_system("grep Pers /proc/mdstat > /tmp/raid-personalities.txt 2> /dev/null");
-    strcpy(personalities,
-           last_line_of_file("/tmp/raid-personalities.txt"));
-    sprintf(prompt, "Please enter the RAID level you want. %s",
-            personalities);
+    mr_asprintf(personalities, "%s", last_line_of_file("/tmp/raid-personalities.txt"));
+    mr_asprintf(prompt, "Please enter the RAID level you want. %s", personalities);
+    mr_free(personalities);
+
     if (raidrec->raid_level == -1) {
         strcpy(tmp, "linear");
@@ -555 +551 @@
         log_it(tmp);
         if (is_this_raid_personality_registered(out)) {
-            log_it
-                ("Groovy. You've picked a RAID personality which is registered.");
+            log_it("Groovy. You've picked a RAID personality which is registered.");
         } else {
-            if (ask_me_yes_or_no
-                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
-            {
+            if (ask_me_yes_or_no("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")) {
                 out = 999;
             }
         }
     }
+    mr_free(prompt);
+
     raidrec->raid_level = out;
 #endif
@@ -589 +584 @@
     int pos = 0;
 
-    /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
-
     assert(mountlist != NULL);
     assert(raidlist != NULL);
@@ -602 +594 @@
              pos++);
         if (pos < mountlist->entries) {
-            sprintf(tmp,
-                    "Deleting partition %s cos it was part of a now-defunct RAID",
-                    mountlist->el[pos].device);
-            log_it(tmp);
+            log_it("Deleting partition %s cos it was part of a now-defunct RAID", mountlist->el[pos].device);
+
             memcpy((void *) &mountlist->el[pos],
                    (void *) &mountlist->el[mountlist->entries - 1],
@@ -631 +621 @@
     /** int ***************************************************************/
     int pos = 0;
+    int res = 0;
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     assert(disklist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
 
-    sprintf(tmp, "Delete %s from RAID device %s - are you sure?",
-            disklist->el[currline].device, raid_device);
-    if (!ask_me_yes_or_no(tmp)) {
+    mr_asprintf(tmp, "Delete %s from RAID device %s - are you sure?", disklist->el[currline].device, raid_device);
+    res = ask_me_yes_or_no(tmp);
+    mr_free(tmp);
+
+    if (!res) {
         return;
     }
     for (pos = currline; pos < disklist->entries - 1; pos++) {
-        /* memcpy((void*)&disklist->el[pos], (void*)&disklist->el[pos+1], sizeof(struct s_disk)); */
         strcpy(disklist->el[pos].device, disklist->el[pos + 1].device);
     }
@@ -670 +662 @@
     /** int ***************************************************************/
     int pos = 0;
+    int res = 0;
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
-    char device[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *device = NULL;
 
 
@@ -681 +674 @@
     assert(keylist != NULL);
 
-    pos =
-        which_raid_device_is_using_this_partition(raidlist,
-                                                  mountlist->el[currline].
-                                                  device);
+    pos = which_raid_device_is_using_this_partition(raidlist, mountlist->el[currline].device);
     if (pos >= 0) {
-        sprintf(tmp, "Cannot delete %s: it is in use by RAID device %s",
-                mountlist->el[currline].device,
-                raidlist->el[pos].OSSWAP(raid_device, volname));
+        mr_asprintf(tmp, "Cannot delete %s: it is in use by RAID device %s", mountlist->el[currline].device, raidlist->el[pos].OSSWAP(raid_device, volname));
         popup_and_OK(tmp);
+        mr_free(tmp);
         return;
     }
-    sprintf(tmp, "Delete %s - are you sure?",
-            mountlist->el[currline].device);
-    if (!ask_me_yes_or_no(tmp)) {
+    mr_asprintf(tmp, "Delete %s - are you sure?", mountlist->el[currline].device);
+    res = ask_me_yes_or_no(tmp);
+    mr_free(tmp);
+
+    if (!res) {
         return;
     }
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
-        strcpy(device, mountlist->el[currline].device);
+        mr_asprintf(device, "%s", mountlist->el[currline].device);
         delete_raidlist_entry(mountlist, raidlist, device);
         for (currline = 0;
@@ -704 +695 @@
              && strcmp(mountlist->el[currline].device, device);
              currline++);
+        mr_free(device);
+
         if (currline == mountlist->entries) {
             log_it("Dev is gone. I can't delete it. Ho-hum");
@@ -737 +730 @@
 
     /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
     assert(mountlist != NULL);
@@ -747 +740 @@
         return;
     }
-    sprintf(tmp, "Do you want me to delete %s's partitions, too?", device);
+    mr_asprintf(tmp, "Do you want me to delete %s's partitions, too?", device);
     delete_partitions_too = ask_me_yes_or_no(tmp);
     if (delete_partitions_too) {
@@ -760 +753 @@
                     if (!strcmp(raidlist->el[i].plex[x].sd[y].which_device,
                                 raidlist->disks.el[z].name)) {
-                        strcpy(d.el[d.entries].name,
-                               raidlist->disks.el[z].name);
-                        strcpy(d.el[d.entries++].device,
-                               raidlist->disks.el[z].device);
+                        strcpy(d.el[d.entries].name, raidlist->disks.el[z].name);
+                        strcpy(d.el[d.entries++].device, raidlist->disks.el[z].device);
                     }
                 }
@@ -791 +782 @@
         items--;
     }
+    mr_free(tmp);
     raidlist->entries = items;
 }
@@ -806 +798 @@
 
     /** buffers ************************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    int res = 0;
 
     /** structures *********************************************************/
@@ -814 +807 @@
 
     av = &raidrec->additional_vars;
-    sprintf(tmp, "Delete %s - are you sure?", av->el[lino].label);
-    if (ask_me_yes_or_no(tmp)) {
+    mr_asprintf(tmp, "Delete %s - are you sure?", av->el[lino].label);
+    res = ask_me_yes_or_no(tmp);
+    mr_free(tmp);
+
+    if (res) {
         if (!strcmp(av->el[lino].label, "persistent-superblock")
             || !strcmp(av->el[lino].label, "chunk-size")) {
-            sprintf(tmp, "%s must not be deleted. It would be bad.",
-                    av->el[lino].label);
+            mr_asprintf(tmp, "%s must not be deleted. It would be bad.", av->el[lino].label);
             popup_and_OK(tmp);
+            mr_free(tmp);
         } else {
             memcpy((void *) &av->el[lino], (void *) &av->el[av->entries--],
@@ -856 +852 @@
     static char current_filename[MAX_STR_LEN];
     char tmp[MAX_STR_LEN + 2];
+    char *tmp1 = NULL;
 
     /** bool *************************************************************/
@@ -886 +883 @@
                 if (!warned_already) {
                     warned_already = TRUE;
-                    sprintf(tmp,
-                            "Too many lines. Displaying first %d entries only. Close a directory to see more.",
-                            ARBITRARY_MAXIMUM);
-                    popup_and_OK(tmp);
+                    mr_asprintf(tmp1, "Too many lines. Displaying first %d entries only. Close a directory to see more.", ARBITRARY_MAXIMUM);
+                    popup_and_OK(tmp1);
+                    mr_free(tmp1);
                 }
             } else {
-                strcpy(g_strings_of_flist_window[lines_in_flist_window],
-                       current_filename);
+                strcpy(g_strings_of_flist_window[lines_in_flist_window], current_filename);
                 g_is_path_selected[lines_in_flist_window] = node->selected;
                 lines_in_flist_window++;
@@ -908 +903 @@
                 (g_strings_of_flist_window[i],
                  g_strings_of_flist_window[i - 1]) < 0) {
-                strcpy(tmp, g_strings_of_flist_window[i]);
-                strcpy(g_strings_of_flist_window[i],
-                       g_strings_of_flist_window[i - 1]);
-                strcpy(g_strings_of_flist_window[i - 1], tmp);
+                mr_asprintf(tmp1, "%s", g_strings_of_flist_window[i]);
+                strcpy(g_strings_of_flist_window[i], g_strings_of_flist_window[i - 1]);
+                strcpy(g_strings_of_flist_window[i - 1], tmp1);
+                mr_free(tmp1);
+
                 dummybool = g_is_path_selected[i];
                 g_is_path_selected[i] = g_is_path_selected[i - 1];
@@ -1014 +1010 @@
     void *curr_choice;
     void *keylist[ARBITRARY_MAXIMUM];
-
-    /** buffers ***********************************************************/
-    char tmp[MAX_STR_LEN];
 
     /** bool **************************************************************/
@@ -1064 +1057 @@
                 indexno = 0;
             }
-            sprintf(tmp, "You selected '%s'",
-                    g_strings_of_flist_window[indexno]);
-            log_it(tmp);
+            log_it("You selected '%s'", g_strings_of_flist_window[indexno]);
+
             if (b_res == bMore) {
                 g_is_path_expanded[indexno] = TRUE;
@@ -1158 +1150 @@
 
   /** buffers ***********************************************************/
-    char device_str[MAX_STR_LEN];
-    char mountpoint_str[MAX_STR_LEN];
-    char size_str[MAX_STR_LEN];
-    char format_str[MAX_STR_LEN];
-    char tmp[MAX_STR_LEN];
-    char device_used_to_be[MAX_STR_LEN];
-    char mountpt_used_to_be[MAX_STR_LEN];
+    char *device_str = NULL;
+    char *mountpoint_str = NULL;
+    char *size_str = NULL;
+    char *format_str = NULL;
+    char *tmp = NULL;
+    char *device_used_to_be = NULL;
+    char *mountpt_used_to_be = NULL;
 
     /** pointers **********************************************************/
@@ -1182 +1174 @@
     memcpy((void *) &bkp_raidlist, (void *) raidlist,
            sizeof(struct raidlist_itself));
-    strcpy(device_str, mountlist->el[currline].device);
-    strcpy(device_used_to_be, mountlist->el[currline].device);
-    strcpy(mountpoint_str, mountlist->el[currline].mountpoint);
-    strcpy(mountpt_used_to_be, mountlist->el[currline].mountpoint);
-    strcpy(format_str, mountlist->el[currline].format);
-    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024L);
+    mr_asprintf(device_str, "%s", mountlist->el[currline].device);
+    mr_asprintf(device_used_to_be, "%s", mountlist->el[currline].device);
+    mr_asprintf(mountpoint_str, "%s", mountlist->el[currline].mountpoint);
+    mr_asprintf(mountpt_used_to_be, "%s", mountlist->el[currline].mountpoint);
+    mr_asprintf(format_str, "%s", mountlist->el[currline].format);
+    mr_asprintf(size_str, "%lld", mountlist->el[currline].size / 1024L);
     newtOpenWindow(20, 5, 48, 10, "Edit entry");
     label0 = newtLabel(2, 1, "Device:");
@@ -1193 +1185 @@
     label2 = newtLabel(2, 3, "Size (MB): ");
     label3 = newtLabel(2, 4, "Format:    ");
-    deviceComp =
-        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
-    mountpointComp =
-        newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
-    formatComp =
-        newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
+    deviceComp = newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
+    mountpointComp = newtEntry(14, 2, mountpoint_str, 30, (void *) &mountpoint_here, 0);
+    formatComp = newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
         || !strcmp(mountlist->el[currline].mountpoint, "image")) {
@@ -1218 +1207 @@
     for (b_res = NULL; b_res != bOK && b_res != bCancel;) {
         b_res = newtRunForm(myForm);
-        strcpy(device_str, device_here);
-        strip_spaces(device_str);
-        strcpy(mountpoint_str, mountpoint_here);
-        strip_spaces(mountpoint_str);
-        strcpy(format_str, format_here);
-        strip_spaces(format_str);
+        mr_free(device_str);
+        mr_asprintf(device_str, "%s", device_here);
+        mr_strip_spaces(device_str);
+
+        mr_free(mountpoint_str);
+        mr_asprintf(mountpoint_str, "%s", mountpoint_here);
+        mr_strip_spaces(mountpoint_str);
+
+        mr_free(format_str);
+        mr_asprintf(format_str, "%s", format_here);
+        mr_strip_spaces(format_str);
+
         if (b_res == bOK && strstr(device_str, RAID_DEVICE_STUB)
             && strstr(device_used_to_be, RAID_DEVICE_STUB)
@@ -1238 +1233 @@
         if (!strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
             && strcmp(mountlist->el[currline].mountpoint, "image")) {
-            strcpy(size_str, size_here);
-            strip_spaces(size_str);
+            mr_free(size_str);
+            mr_asprintf(size_str, "%s", size_here);
+            mr_strip_spaces(size_str);
         } else {
-            sprintf(size_str, "%ld",
-                    calculate_raid_device_size(mountlist, raidlist,
-                                               mountlist->el[currline].
-                                               device) / 1024);
+            mr_asprintf(size_str, "%ld", calculate_raid_device_size(mountlist, raidlist, mountlist->el[currline].device) / 1024);
             newtLabelSetText(sizeComp, size_str);
         }
@@ -1261 +1254 @@
                                                  device);
                 if (j < 0) {
-                    sprintf(tmp,
-                            "/etc/raidtab does not have an entry for %s; please delete it and add it again",
-                            mountlist->el[currline].device);
+                    mr_asprintf(tmp, "/etc/raidtab does not have an entry for %s; please delete it and add it again", mountlist->el[currline].device);
                     popup_and_OK(tmp);
+                    mr_free(tmp);
                 } else {
                     log_it("edit_raidlist_entry - calling");
@@ -1276 +1268 @@
     newtPopHelpLine();
     newtPopWindow();
+    mr_free(mountpt_used_to_be);
+
     if (b_res == bCancel) {
         memcpy((void *) raidlist, (void *) &bkp_raidlist,
                sizeof(struct raidlist_itself));
+        mr_free(device_str);
+        mr_free(device_used_to_be);
+        mr_free(format_str);
+        mr_free(size_str);
         return;
     }
     strcpy(mountlist->el[currline].device, device_str);
     strcpy(mountlist->el[currline].mountpoint, mountpoint_str);
+    mr_free(mountpoint_str);
+
     strcpy(mountlist->el[currline].format, format_str);
+    mr_free(format_str);
+
     if (strcmp(mountlist->el[currline].mountpoint, "image")) {
         if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
@@ -1293 +1295 @@
         }
     }
+    mr_free(size_str);
     newtListboxSetEntry(listbox, (long) keylist[currline],
                         mountlist_entry_to_string(mountlist, currline));
@@ -1298 +1301 @@
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)
         && !strstr(device_used_to_be, RAID_DEVICE_STUB)) {
-        initiate_new_raidlist_entry(raidlist, mountlist, currline,
-                                    device_str);
+        initiate_new_raidlist_entry(raidlist, mountlist, currline, device_str);
     }
     /* if moving from RAID to non-RAID then do funky stuff */
@@ -1316 +1318 @@
 #ifndef __FreeBSD__             /* It works fine under FBSD. */
     else if (strcmp(device_used_to_be, device_str)) {
-        popup_and_OK
-            ("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
+        popup_and_OK("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
     }
 #endif
+    mr_free(device_str);
+    mr_free(device_used_to_be);
+
     redraw_mountlist(mountlist, keylist, listbox);
 }
@@ -1342 +1346 @@
     for (i = 0; i < raidlist->disks.entries; ++i) {
         if (!strcmp(raidlist->disks.el[i].device, temp)) {
-            strcpy(raidrec->sd[raidrec->subdisks].which_device,
-                   raidlist->disks.el[i].name);
+            strcpy(raidrec->sd[raidrec->subdisks].which_device, raidlist->disks.el[i].name);
             found = TRUE;
         }
     }
     if (!found) {
-        sprintf(raidlist->disks.el[raidlist->disks.entries].name,
-                "drive%i", raidlist->disks.entries);
-        sprintf(raidrec->sd[raidrec->subdisks].which_device, "drive%i",
-                raidlist->disks.entries);
+        sprintf(raidlist->disks.el[raidlist->disks.entries].name, "drive%i", raidlist->disks.entries);
+        sprintf(raidrec->sd[raidrec->subdisks].which_device, "drive%i", raidlist->disks.entries);
         strcpy(raidlist->disks.el[raidlist->disks.entries++].device, temp);
     }
@@ -1424 +1425 @@
     void *keylist[10];
     void *curr_choice;
+    char *raidlevel = NULL;
+    char *chunksize = NULL;
+    char *msg = NULL;
 
     int currline2 = 0;
+    int res = 0;
 
     log_it("Started edit_raidlist_entry");
@@ -1455 +1460 @@
             keylist[i] = (void *) i;
             if (i < raidrec->plexes) {
-                char pname[64], entry[MAX_STR_LEN], raidlevel[64],
-                    chunksize[64];
+                char pname[64], entry[MAX_STR_LEN];
                 switch (raidrec->plex[i].raidlevel) {
                 case -1:
-                    strcpy(raidlevel, "concat");
+                    mr_asprintf(raidlevel, "concat");
                     break;
                 case 0:
-                    strcpy(raidlevel, "striped");
+                    mr_asprintf(raidlevel, "striped");
                     break;
                 case 5:
-                    strcpy(raidlevel, "raid5");
+                    mr_asprintf(raidlevel, "raid5");
                     break;
                 default:
-                    sprintf(raidlevel, "raid%i",
-                            raidrec->plex[i].raidlevel);
+                    mr_asprintf(raidlevel, "raid%i", raidrec->plex[i].raidlevel);
                     break;
                 }
 
                 if (raidrec->plex[i].raidlevel == -1) {
-                    strcpy(chunksize, "N/A");
+                    mr_asprintf(chunksize, "N/A");
                 } else {
-                    sprintf(chunksize, "%dk", raidrec->plex[i].stripesize);
+                    mr_asprintf(chunksize, "%dk", raidrec->plex[i].stripesize);
                 }
                 snprintf(pname, 64, "%s.p%i", raidrec->volname, i);
@@ -1482 +1485 @@
                          pname, raidlevel, chunksize,
                          raidrec->plex[i].subdisks);
+                mr_free(raidlevel);
+                mr_free(chunksize);
+
                 newtListboxAppendEntry(plexesListbox, entry, keylist[i]);
             }
@@ -1503 +1509 @@
 
         if (b_res == bDelete) {
-            char msg[MAX_STR_LEN];
-            sprintf(msg, "Are you sure you want to delete %s.p%i?",
-                    raidrec->volname, currline2);
-            if (ask_me_yes_or_no(msg)) {
+            mr_asprintf(msg, "Are you sure you want to delete %s.p%i?", raidrec->volname, currline2);
+            res = ask_me_yes_or_no(msg);
+            mr_free(msg);
+
+            if (res) {
                 log_it("Deleting RAID plex");
                 memcpy((void *) &raidrec->plex[currline2],
@@ -1540 +1547 @@
     /** buffers ***********************************************************/
     char *title_of_editraidForm_window;
-    char *sz_raid_level;
-    char *sz_data_disks;
-    char *sz_spare_disks;
-    char *sz_parity_disks;
-    char *sz_failed_disks;
+    char *sz_raid_level = NULL;
+    char *sz_data_disks = NULL;
+    char *sz_spare_disks = NULL;
+    char *sz_parity_disks = NULL;
+    char *sz_failed_disks = NULL;
 
     /** newt **************************************************************/
@@ -1562 +1569 @@
     assert(raidrec != NULL);
 
-    malloc_string(title_of_editraidForm_window);
-    malloc_string(sz_raid_level);
-    malloc_string(sz_data_disks);
-    malloc_string(sz_spare_disks);
-    malloc_string(sz_parity_disks);
-    malloc_string(sz_failed_disks);
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
-
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
     log_it("Started edit_raidlist_entry");
 
-    memcpy((void *) bkp_raidrec, (void *) raidrec,
-           sizeof(struct raid_device_record));
-    sprintf(title_of_editraidForm_window, "%s", raidrec->raid_device);
+    memcpy((void *) bkp_raidrec, (void *) raidrec, sizeof(struct raid_device_record));
+    mr_asprintf(title_of_editraidForm_window, "%s", raidrec->raid_device);
     log_msg(2, "Opening newt window");
     newtOpenWindow(20, 5, 40, 14, title_of_editraidForm_window);
     for (;;) {
         log_msg(2, "Main loop");
-        sprintf(title_of_editraidForm_window, "Edit %s",
-                raidrec->raid_device);
-        strcpy(sz_raid_level,
-               turn_raid_level_number_to_string(raidrec->raid_level));
-        strcpy(sz_data_disks,
-               number_of_disks_as_string(raidrec->data_disks.entries,
-                                         "data"));
-        strcpy(sz_spare_disks,
-               number_of_disks_as_string(raidrec->spare_disks.entries,
-                                         "spare"));
-        strcpy(sz_parity_disks,
-               number_of_disks_as_string(raidrec->parity_disks.entries,
-                                         "parity"));
-        strcpy(sz_failed_disks,
-               number_of_disks_as_string(raidrec->failed_disks.entries,
-                                         "failed"));
+        mr_free(title_of_editraidForm_window);
+        mr_asprintf(title_of_editraidForm_window, "Edit %s", raidrec->raid_device);
+        mr_asprintf(sz_raid_level, "%s", turn_raid_level_number_to_string(raidrec->raid_level));
+        mr_asprintf(sz_data_disks, "%s", number_of_disks_as_string(raidrec->data_disks.entries, "data"));
+        mr_asprintf(sz_spare_disks, "%s", number_of_disks_as_string(raidrec->spare_disks.entries, "spare"));
+        mr_asprintf(sz_parity_disks, "%s", number_of_disks_as_string(raidrec->parity_disks.entries, "parity"));
+        mr_asprintf(sz_failed_disks, "%s", number_of_disks_as_string(raidrec->failed_disks.entries, "failed"));
         bSelectData = newtButton(1, 1, sz_data_disks);
         bSelectSpare = newtButton(20, 1, sz_spare_disks);
@@ -1617 +1605 @@
             choose_raid_level(raidrec);
         } else if (b_res == bSelectData) {
-            select_raid_disks(mountlist, raidlist, raidrec, "data",
-                              &raidrec->data_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "data", &raidrec->data_disks);
         } else if (b_res == bSelectSpare) {
-            select_raid_disks(mountlist, raidlist, raidrec, "spare",
-                              &raidrec->spare_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "spare", &raidrec->spare_disks);
         } else if (b_res == bSelectParity) {
-            select_raid_disks(mountlist, raidlist, raidrec, "parity",
-                              &raidrec->parity_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "parity", &raidrec->parity_disks);
         } else if (b_res == bSelectFailed) {
-            select_raid_disks(mountlist, raidlist, raidrec, "failed",
-                              &raidrec->failed_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "failed", &raidrec->failed_disks);
         } else if (b_res == bAdditional) {
             edit_raidrec_additional_vars(raidrec);
@@ -1635 +1619 @@
             break;
         }
+        mr_free(sz_data_disks);
+        mr_free(sz_spare_disks);
+        mr_free(sz_parity_disks);
+        mr_free(sz_failed_disks);
     }
     if (b_res == bCancel) {
-        memcpy((void *) raidrec, (void *) bkp_raidrec,
-               sizeof(struct raid_device_record));
+        memcpy((void *) raidrec, (void *) bkp_raidrec, sizeof(struct raid_device_record));
     }
     newtPopHelpLine();
     newtPopWindow();
-    mountlist->el[currline].size =
-        calculate_raid_device_size(mountlist, raidlist,
-                                   raidrec->raid_device);
-    paranoid_free(title_of_editraidForm_window);
-    paranoid_free(sz_raid_level);
-    paranoid_free(sz_data_disks);
-    paranoid_free(sz_spare_disks);
-    paranoid_free(sz_parity_disks);
-    paranoid_free(sz_failed_disks);
+    mountlist->el[currline].size = calculate_raid_device_size(mountlist, raidlist, raidrec->raid_device);
+    mr_free(title_of_editraidForm_window);
+    mr_free(sz_raid_level);
     paranoid_free(bkp_raidrec);
 #endif
@@ -1678 +1659 @@
 
     /** buffers ***********************************************************/
-    char title_of_editraidForm_window[MAX_STR_LEN];
+    char *title_of_editraidForm_window = NULL;
 
     /** newt **************************************************************/
@@ -1697 +1678 @@
     int currline_a, currline_u;
 
+    char *p = NULL;
+    char *tmp = NULL;
+    char *entry = NULL;
+
     struct mountlist_itself *unallocparts;
 
@@ -1704 +1689 @@
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct vinum_plex));
-    sprintf(title_of_editraidForm_window, "%s.p%i",
-            raidlist->el[currline].volname, currline2);
+    mr_asprintf(title_of_editraidForm_window, "%s.p%i", raidlist->el[currline].volname, currline2);
     newtPushHelpLine
         ("   Please select a subdisk to edit, or edit this plex's parameters");
     newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
+    mr_free(title_of_editraidForm_window);
+
     for (;;) {
         int i;
-        char headerstr[MAX_STR_LEN];
-        char tmp[64];
-        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", "Subdisk", "Device");
-
 
         switch (raidrec->raidlevel) {
         case -1:
-            strcpy(tmp, "concat");
+            mr_asprintf(tmp, "concat");
             break;
         case 0:
-            strcpy(tmp, "striped");
+            mr_asprintf(tmp, "striped");
             break;
         case 5:
-            strcpy(tmp, "raid5");
+            mr_asprintf(tmp, "raid5");
             break;
         default:
-            sprintf(tmp, "unknown (%i)", raidrec->raidlevel);
+            mr_asprintf(tmp, "unknown (%i)", raidrec->raidlevel);
             break;
         }
         bLevel = newtCompactButton(2, 2, " RAID level ");
         sLevel = newtLabel(19, 2, tmp);
+        mr_free(tmp);
 
         if (raidrec->raidlevel >= 0) {
-            sprintf(tmp, "%ik", raidrec->stripesize);
+            mr_asprintf(tmp, "%ik", raidrec->stripesize);
             bStripeSize = newtCompactButton(2, 4, " Stripe size ");
         } else {
-            strcpy(tmp, "N/A");
+            mr_asprintf(tmp, "N/A");
             bStripeSize = newtLabel(2, 4, "Stripe size:");
         }
         sStripeSize = newtLabel(19, 4, tmp);
+        mr_free(tmp);
 
         bOK = newtCompactButton(2, 16, "  OK  ");
@@ -1749 +1733 @@
 
 
-        //  plexesListbox = newtListbox (2, 7, 9, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
-        //  plexesHeader  = newtLabel (2, 6, headerstr);
         unallocListbox =
             newtListbox(2, 7, 7, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -1766 +1748 @@
                                                  raidlist);
         for (i = 0; i < ARBITRARY_MAXIMUM; ++i) {
-            char entry[MAX_STR_LEN];
             keylist[i] = (void *) i;
             if (i < raidrec->subdisks) {
-                snprintf(entry, MAX_STR_LEN, "%-17s",
-                         find_dev_entry_for_raid_device_name(raidlist,
-                                                             raidrec->
-                                                             sd[i].
-                                                             which_device));
+                mr_asprintf(entry, "%-17s", find_dev_entry_for_raid_device_name(raidlist, raidrec->sd[i].which_device));
                 newtListboxAppendEntry(allocListbox, entry, keylist[i]);
+                mr_free(entry);
             }
             if (i < unallocparts->entries) {
-                snprintf(entry, MAX_STR_LEN, "%-17s",
-                         unallocparts->el[i].device);
+                mr_asprintf(entry, "%-17s", unallocparts->el[i].device);
                 newtListboxAppendEntry(unallocListbox, entry, keylist[i]);
+                mr_free(entry);
             }
         }
@@ -1830 +1808 @@
             choose_raid_level(raidrec);
         } else if (b_res == bStripeSize) {
-            char tmp[64];
-            sprintf(tmp, "%i", raidrec->stripesize);
+            char tmp1[64];
+            sprintf(tmp1, "%i", raidrec->stripesize);
             if (popup_and_get_string
                 ("Stripe size",
-                 "Please enter the stripe size in kilobytes.", tmp, 20)) {
-                raidrec->stripesize = atoi(tmp);
+                 "Please enter the stripe size in kilobytes.", tmp1, 20)) {
+                raidrec->stripesize = atoi(tmp1);
             }
         } else if ((b_res == bAlloc) || (b_res == unallocListbox)) {
@@ -1849 +1827 @@
             }
         }
-#if 0
-    } else {
-        edit_raid_subdisk(raidlist, raidrec, &raidrec->sd[currline3],
-                          currline3);
-    }
-#endif
     newtFormDestroy(editraidForm);
     newtRefresh();
@@ -1860 +1832 @@
 
 if (b_res == bCancel) {
-    memcpy((void *) raidrec, (void *) &bkp_raidrec,
-           sizeof(struct vinum_plex));
+    memcpy((void *) raidrec, (void *) &bkp_raidrec, sizeof(struct vinum_plex));
 }
 newtPopWindow();
@@ -1877 +1848 @@
 
     /** buffers ***********************************************************/
-    char header[MAX_STR_LEN];
-    char comment[MAX_STR_LEN];
+    char *header = NULL;
+    char *comment = NULL;
     char sz_out[MAX_STR_LEN];
 
@@ -1885 +1856 @@
 
     strcpy(sz_out, raidrec->additional_vars.el[lino].value);
-    sprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
-    sprintf(comment, "Please set %s's value (currently '%s')",
-            raidrec->additional_vars.el[lino].label, sz_out);
+    mr_asprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
+    mr_asprintf(comment, "Please set %s's value (currently '%s')", raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
         strip_spaces(sz_out);
         strcpy(raidrec->additional_vars.el[lino].value, sz_out);
     }
-}
-
-
-/* I'm not racist against white people. I just don't like people who think Liberia is near Spain.       - Hugo, 09/01/2001 */
+    mr_free(header);
+    mr_free(comment);
+}
 
 #endif
@@ -1936 +1905 @@
 
     /** buffers **********************************************************/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
     char *flaws_str = NULL;
     char *flaws_str_A = NULL;
@@ -1957 +1926 @@
     bCancel = newtCompactButton(i += 12, 17, "Cancel");
     bOK = newtCompactButton(i += 12, 17, "  OK  ");
-    sprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format", "Size (MB)");
+    mr_asprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format", "Size (MB)");
     headerMsg = newtLabel(2, 1, tmp);
+    mr_free(tmp);
+
     flawsLabelA = newtLabel(2, 13, "         ");
     flawsLabelB = newtLabel(2, 14, "         ");
@@ -2015 +1986 @@
         } else if (b_res == bReload) {
             if (ask_me_yes_or_no("Reload original mountlist?")) {
-/*
-This would be really dumb. RAIDTAB_FNAME is #define'd.   --- Hugo, 2003/04/24
-          if (!RAIDTAB_FNAME[0])
-        {
-                  strcpy(RAIDTAB_FNAME, "/etc/raidtab");
-          log_it("Warning - raidtab_fname is blank. Assuming %s", g_raidtab_fname);
-        }
-*/
                 load_mountlist(mountlist, mountlist_fname);
                 load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
@@ -2237 +2200 @@
     int i = 0;
 #ifdef __FreeBSD__
-    char vdev[64];
+    char *vdev = NULL;
+    int res = 0;
 #else
 // Linux
@@ -2247 +2211 @@
 #ifdef __FreeBSD__
     for (i = 0; i < raidlist->entries; i++) {
-        sprintf(vdev, "/dev/vinum/%s", raidlist->el[i].volname);
-        if (!strcmp(device, vdev))
+        mr_asprintf(vdev, "/dev/vinum/%s", raidlist->el[i].volname);
+        res = strcmp(device, vdev);
+        mr_free(vdev);
+
+        if (!res)
             break;
     }
@@ -2298 +2265 @@
     raidrec = &raidlist->el[pos_in_raidlist];
     initialize_raidrec(raidrec);
-    strcpy(raidrec->OSSWAP(raid_device, volname),
-           OSSWAP(device, basename(device)));
+    strcpy(raidrec->OSSWAP(raid_device, volname), OSSWAP(device, basename(device)));
 #ifndef __FreeBSD__
     choose_raid_level(raidrec);
@@ -2549 +2515 @@
                                                    char *new_dev)
 {
-    /** buffers ********************************************************/
-    char tmp[MAX_STR_LEN];
-
     /** int ************************************************************/
     int pos = 0;
@@ -2562 +2525 @@
     pos = which_raid_device_is_using_this_partition(raidlist, old_dev);
     if (pos < 0) {
-        sprintf(tmp, "No need to rejig %s in raidlist: it's not listed.",
-                old_dev);
-        log_it(tmp);
+        log_it("No need to rejig %s in raidlist: it's not listed.", old_dev);
     } else {
         if ((j =
@@ -2570 +2531 @@
                                          OSSWAP(el[pos].data_disks, disks),
                                          old_dev)) >= 0) {
-            strcpy(raidlist->OSSWAP(el[pos].data_disks, disks).el[j].
-                   device, new_dev);
+            strcpy(raidlist->OSSWAP(el[pos].data_disks, disks).el[j].device, new_dev);
         } else
             if ((j =
@@ -2578 +2538 @@
                                                     spares),
                                              old_dev)) >= 0) {
-            strcpy(raidlist->OSSWAP(el[pos].spare_disks, spares).el[j].
-                   device, new_dev);
+            strcpy(raidlist->OSSWAP(el[pos].spare_disks, spares).el[j].device, new_dev);
         }
 #ifndef __FreeBSD__
@@ -2596 +2555 @@
 #endif
         else {
-            sprintf(tmp,
-                    "%s is supposed to be listed in this raid dev but it's not...",
-                    old_dev);
-            log_it(tmp);
+            log_it("%s is supposed to be listed in this raid dev but it's not...", old_dev);
         }
     }
@@ -2671 +2627 @@
     /** buffers **********************************************************/
     void *keylist[ARBITRARY_MAXIMUM];
-    char *tmp;
-    char *help_text;
-    char *title_of_window;
-    char *sz_res;
-    char *header_text;
+    char *tmp = NULL;
+    char *help_text = NULL;
+    char *title_of_window = NULL;
+    char sz_res[MAX_STR_LEN];
+    char *header_text = NULL;
+    char *p = NULL;
 
   /** int **************************************************************/
@@ -2688 +2645 @@
 
     log_it("malloc'ing");
-    malloc_string(tmp);
-    malloc_string(help_text);
-    malloc_string(title_of_window);
-    malloc_string(sz_res);
-    malloc_string(header_text);
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
-    if (!(bkp_disklist = malloc(sizeof(struct list_of_disks)))) {
-        fatal_error("Cannot malloc space for disklist");
-    }
-    if (!(bkp_raidlist = malloc(sizeof(struct raidlist_itself)))) {
-        fatal_error("Cannot malloc space for raidlist");
-    }
-    if (!
-        (unallocated_raid_partitions =
-         malloc(sizeof(struct mountlist_itself)))) {
-        fatal_error("Cannot malloc space for unallocated_raid_partitions");
-    }
-
-    memcpy((void *) bkp_raidlist, (void *) raidlist,
-           sizeof(struct raidlist_itself));
-    memcpy((void *) bkp_raidrec, (void *) raidrec,
-           sizeof(struct raid_device_record));
-    memcpy((void *) bkp_disklist, (void *) disklist,
-           sizeof(struct list_of_disks));
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
+    bkp_disklist = mr_malloc(sizeof(struct list_of_disks));
+    bkp_raidlist = mr_malloc(sizeof(struct raidlist_itself));
+    unallocated_raid_partitions = mr_malloc(sizeof(struct mountlist_itself));
+
+    memcpy((void *) bkp_raidlist, (void *) raidlist, sizeof(struct raidlist_itself));
+    memcpy((void *) bkp_raidrec, (void *) raidrec, sizeof(struct raid_device_record));
+    memcpy((void *) bkp_disklist, (void *) disklist, sizeof(struct list_of_disks));
 
     log_it("Post-malloc");
-    strcpy(help_text,
-           "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
-    sprintf(header_text, "%-24s    %s", "Device", "Index");
-    sprintf(title_of_window, "%s contains...", raidrec->raid_device);
+    mr_asprintf(help_text, "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
+    mr_asprintf(header_text, "%-24s    %s", "Device", "Index");
+    mr_asprintf(title_of_window, "%s contains...", raidrec->raid_device);
     newtPushHelpLine(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
@@ -2774 +2712 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    sprintf(tmp, "%s's index is %d. What should it be?",
-                            raidrec->raid_device,
-                            disklist->el[currline].index);
+                    mr_asprintf(tmp, "%s's index is %d. What should it be?", raidrec->raid_device, disklist->el[currline].index);
                     sprintf(sz_res, "%d", disklist->el[currline].index);
                     if (popup_and_get_string("Set index", tmp, sz_res, 10)) {
                         disklist->el[currline].index = atoi(sz_res);
                     }
+                    mr_free(tmp);
+
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 }
@@ -2789 +2727 @@
     }
     newtPopHelpLine();
+    mr_free(help_text);
+    mr_free(header_text);
+    mr_free(title_of_window);
+
     if (b_res == bCancel) {
-        memcpy((void *) raidlist, (void *) bkp_raidlist,
-               sizeof(struct raidlist_itself));
-        memcpy((void *) raidrec, (void *) bkp_raidrec,
-               sizeof(struct raid_device_record));
-        memcpy((void *) disklist, (void *) bkp_disklist,
-               sizeof(struct list_of_disks));
-    }
-    paranoid_free(tmp);
-    paranoid_free(help_text);
-    paranoid_free(title_of_window);
+        memcpy((void *) raidlist, (void *) bkp_raidlist, sizeof(struct raidlist_itself));
+        memcpy((void *) raidrec, (void *) bkp_raidrec, sizeof(struct raid_device_record));
+        memcpy((void *) disklist, (void *) bkp_disklist, sizeof(struct list_of_disks));
+    }
     paranoid_free(sz_res);
-    paranoid_free(header_text);
-    paranoid_free(bkp_raidrec);
-    paranoid_free(bkp_disklist);
-    paranoid_free(bkp_raidlist);
-    paranoid_free(unallocated_raid_partitions);
+    mr_free(bkp_raidrec);
+    mr_free(bkp_disklist);
+    mr_free(bkp_raidlist);
+    mr_free(unallocated_raid_partitions);
 }
 #endif
@@ -2821 +2756 @@
   /** char *************************************************************/
     char output = '\0';
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
 
   /** newt *************************************************************/
@@ -2833 +2768 @@
 
     if (g_text_mode) {
-        for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
-            printf
-                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
-            if (fgets(tmp, MAX_STR_LEN - 1, stdin)) {
-                // FIXME
-            }
+        while (!strchr("AICE", output)) {
+            printf("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
+            mr_getline(tmp, stdin);
+            output = tmp[0];
+            mr_free(tmp);
         }
         return (output);
     }
 
-    newtPushHelpLine
-        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
+    newtPushHelpLine("   Do you want to 'nuke' your system, restore interactively, or just compare?");
     newtOpenWindow(24, 3, 32, 17, "How should I restore?");
     b1 = newtButton(7, 1, "Automatically");

branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -7 +7 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "../common/mondostructures.h"
 #include "../common/libmondo.h"
@@ -120 +121 @@
 * @ingroup restoreUtilityGroup
 */
-void ask_about_these_imagedevs(char *infname, char *outfname)
-{
+void ask_about_these_imagedevs(char *infname, char *outfname) {
+
 FILE *fin;
 FILE *fout;
-/************************************************************************
-* allocate memory regions. test and set  -sab 16 feb 2003              *
-************************************************************************/
-char *incoming_ptr;
-char *question_ptr;
-char *q;
-
-char incoming[MAX_STR_LEN] = "\0";
-char question[MAX_STR_LEN];
+char *incoming = NULL;
+char *question = NULL;
 
 assert_string_is_neither_NULL_nor_zerolength(infname);
 assert_string_is_neither_NULL_nor_zerolength(outfname);
 
-incoming_ptr = malloc(sizeof(incoming));
-if (incoming_ptr == NULL) {
-    fprintf(stderr, "Out of Memory\n");
-    exit(EXIT_FAILURE);
-}
-
-question_ptr = malloc(sizeof(question));
-if (question_ptr == NULL) {
-    fprintf(stderr, "Out of Memory\n");
-    exit(EXIT_FAILURE);
-}
-
-memset(incoming_ptr, '\0', sizeof(incoming));
-memset(question_ptr, '\0', sizeof(question));
-
-
-
 if (!(fin = fopen(infname, "r"))) {
     fatal_error("Cannot openin infname");
@@ -160 +137 @@
     fatal_error("Cannot openin outfname");
 }
-for (q = fgets(incoming_ptr, MAX_STR_LEN, fin); !feof(fin) && (q != NULL); q = fgets(incoming_ptr, MAX_STR_LEN, fin)) {
-    strip_spaces(incoming_ptr);
+for (mr_getline(incoming, fin); !feof(fin) && (incoming != NULL); mr_getline(incoming, fin)) {
+    mr_strip_spaces(incoming);
 
     if (incoming[0] == '\0') {
+        mr_free(incoming);
         continue;
     }
 
-    sprintf(question_ptr, "Should I restore the image of %s ?", incoming_ptr);
-
-    if (ask_me_yes_or_no(question_ptr)) {
-        fprintf(fout, "%s\n", incoming_ptr);
-    }
-}
-
-/*** free memory ***********/
-paranoid_free(incoming_ptr);
-incoming_ptr = NULL;
-paranoid_free(question_ptr);
-question_ptr = NULL;
-
-
+    mr_asprintf(question, "Should I restore the image of %s ?", incoming);
+    
+    if (ask_me_yes_or_no(question)) {
+        fprintf(fout, "%s\n", incoming);
+    }
+    mr_free(incoming);
+}
+mr_free(incoming);
+mr_free(question);
 paranoid_fclose(fout);
 paranoid_fclose(fin);
@@ -232 +205 @@
 {
 
-/** needs malloc **/
-char *command;
-char *file;
-char *tmp;
+char *command = NULL;
+char *file = NULL;
+char *tmp = NULL;
 int res;
 
-malloc_string(command);
-malloc_string(file);
-malloc_string(tmp);
 assert_string_is_neither_NULL_nor_zerolength(f);
 assert_string_is_neither_NULL_nor_zerolength(list_fname);
@@ -246 +215 @@
 
 if (strncmp(preamble, f, strlen(preamble)) == 0) {
-strcpy(file, f + strlen(preamble));
+    mr_asprintf(file, "%s", f + strlen(preamble));
 } else {
-strcpy(file, f);
+    mr_asprintf(file, "%s", f);
 }
 if (file[0] == '/' && file[1] == '/') {
-strcpy(tmp, file);
-strcpy(file, tmp + 1);
-}
-sprintf(tmp,
-    "Checking to see if f=%s, file=%s, is in the list of biggiefiles",
-    f, file);
-log_msg(2, tmp);
-sprintf(command, "grep -E '^%s$' %s", file, list_fname);
+    tmp = file;
+
+    mr_asprintf(file, "%s", tmp + 1);
+    mr_free(tmp);
+}
+log_msg(2, "Checking to see if f=%s, file=%s, is in the list of biggiefiles", f, file);
+mr_asprintf(command, "grep -E '^%s$' %s", file, list_fname);
+mr_free(file);
+
 res = run_program_and_log_output(command, FALSE);
-paranoid_free(command);
-paranoid_free(file);
-paranoid_free(tmp);
+mr_free(command);
 if (res) {
-return (FALSE);
+    return (FALSE);
 } else {
-return (TRUE);
+    return (TRUE);
 }
 }
@@ -351 +319 @@
 * @return 0 for success, nonzero for failure.
 */
-int iso_fiddly_bits(bool nuke_me_please)
-{
+int iso_fiddly_bits(bool nuke_me_please) {
+
 char *mount_isodir_command = NULL;
-char *tmp, *command;
+char *command = NULL;
 char *mds = NULL;
 int retval = 0, i;
 
-assert(bkpinfo != NULL);
-malloc_string(tmp);
-malloc_string(command);
 g_ISO_restore_mode = TRUE;
 read_cfg_var(g_mondo_cfg_file, "iso-dev", g_isodir_device);
@@ -370 +335 @@
     }
     /* End patch */
-    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);
     log_msg(2, "Setting isodir to %s", bkpinfo->isodir);
 }
@@ -387 +353 @@
         mr_strcat(mount_isodir_command, " -t %s", g_isodir_format);
     }
+
     mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
-    run_program_and_log_output("df -m", FALSE);
-    sprintf(tmp,
-        "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?",
-        mount_isodir_command);
-    log_msg(1, tmp);
+    run_program_and_log_output("df -m -P", FALSE);
+    log_msg(1, "The 'mount' command is '%s'. PLEASE report this command to be if you have problems, ok?", mount_isodir_command);
     if (run_program_and_log_output(mount_isodir_command, FALSE)) {
         popup_and_OK
@@ -407 +371 @@
 i = what_number_cd_is_this();   /* has the side-effect of calling mount_media() */
 mds = media_descriptor_string(bkpinfo->backup_media_type);
-sprintf(tmp, "%s #%d has been mounted via loopback mount", mds, i);
 mr_free(mds);
 
-log_msg(1, tmp);
+log_msg(1, "%s #%d has been mounted via loopback mount", mds, i);
 if (i < 0) {
-popup_and_OK
-    ("Cannot find ISO images in the directory you specified.");
-retval = 1;
-}
-log_msg(2, "%ld: bkpinfo->isodir is now %s", __LINE__,
-    bkpinfo->isodir);
-paranoid_free(tmp);
-paranoid_free(command);
+    popup_and_OK("Cannot find ISO images in the directory you specified.");
+    retval = 1;
+}
+log_msg(2, "bkpinfo->isodir is now %s", bkpinfo->isodir);
 return (retval);
 }
@@ -451 +410 @@
 
 /** malloc **/
-char *tmp, *command, *mountdir, *mountpoint;
+char *tmp = NULL;
+char *command = NULL;
+char *mountdir = NULL;
+char *mountpoint = NULL;
 char *additional_parameters = NULL;
 
@@ -457 +419 @@
 assert_string_is_neither_NULL_nor_zerolength(mpt);
 assert(format != NULL);
-malloc_string(tmp);
-malloc_string(command);
-malloc_string(mountdir);
-malloc_string(mountpoint);
 
     if (!strcmp(mpt, "/1")) {
-        strcpy(mountpoint, "/");
+        mr_asprintf(mountpoint, "/");
         log_msg(3, "Mommm! SME is being a dildo!");
     } else {
-        strcpy(mountpoint, mpt);
+        mr_asprintf(mountpoint, "%s", mpt);
     }
 
@@ -475 +433 @@
         return (0);
     }
-    sprintf(tmp, "Mounting device %s   ", device);
+    mr_asprintf(tmp, "Mounting device %s   ", device);
     log_msg(1, tmp);
     /* Deal with additional params only if not /proc or /sys */
@@ -494 +452 @@
 
     if (!strcmp(mountpoint, "swap")) {
-        sprintf(command, "swapon %s", device);
+        mr_asprintf(command, "swapon %s", device);
+        mr_asprintf(mountdir, "swap");
     } else {
         if (!strcmp(mountpoint, "/")) {
-            strcpy(mountdir, MNT_RESTORING);
+            mr_asprintf(mountdir, "%s", MNT_RESTORING);
         } else {
-            sprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
-        }
-        sprintf(command, "mkdir -p %s", mountdir);
+            mr_asprintf(mountdir, "%s%s", MNT_RESTORING, mountpoint);
+        }
+        mr_asprintf(command, "mkdir -p %s", mountdir);
         run_program_and_log_output(command, FALSE);
-        sprintf(command, "mount -t %s %s %s %s 2>> %s", format, device,
-                additional_parameters, mountdir, MONDO_LOGFILE);
+        mr_free(command);
+
+        mr_asprintf(command, "mount -t %s %s %s %s 2>> %s", format, device, additional_parameters, mountdir, MONDO_LOGFILE);
         log_msg(2, "command='%s'", command);
     }
-    paranoid_free(additional_parameters);
+    mr_free(additional_parameters);
 
     res = run_program_and_log_output(command, TRUE);
     if (res && (strstr(command, "xattr") || strstr(command, "acl"))) {
         log_msg(1, "Re-trying without the fancy extra parameters");
-        sprintf(command, "mount -t %s %s %s 2>> %s", format, device,
-            mountdir, MONDO_LOGFILE);
+        mr_free(command);
+        mr_asprintf(command, "mount -t %s %s %s 2>> %s", format, device, mountdir, MONDO_LOGFILE);
         res = run_program_and_log_output(command, TRUE);
     }
     if (res) {
-        log_msg(1, "Unable to mount device %s (type %s) at %s", device,
-                format, mountdir);
+        log_msg(1, "Unable to mount device %s (type %s) at %s", device, format, mountdir);
         log_msg(1, "command was '%s'", command);
         if (!strcmp(mountpoint, "swap")) {
@@ -524 +483 @@
         } else {
             log_msg(2, "Retrying w/o the '-t' switch");
-            sprintf(command, "mount %s %s 2>> %s", device, mountdir,
-                MONDO_LOGFILE);
+            mr_free(command);
+            mr_asprintf(command, "mount %s %s 2>> %s", device, mountdir, MONDO_LOGFILE);
             log_msg(2, "2nd command = '%s'", command);
             res = run_program_and_log_output(command, TRUE);
@@ -543 +502 @@
     }
 
-paranoid_free(tmp);
-paranoid_free(command);
-paranoid_free(mountdir);
-paranoid_free(mountpoint);
-
-    return (res);
+mr_free(tmp);
+mr_free(command);
+mr_free(mountdir);
+mr_free(mountpoint);
+
+return (res);
 }
 /**************************************************************************
@@ -561 +520 @@
  * @return The number of errors encountered (0 for success).
  */
-int mount_all_devices(struct mountlist_itself
-                      *p_external_copy_of_mountlist, bool writeable)
+int mount_all_devices(struct mountlist_itself *p_external_copy_of_mountlist, bool writeable)
 {
 int retval = 0, lino, res;
-char *tmp;
+char *tmp = NULL;
 char *these_failed = NULL;
-char *format;
 struct mountlist_itself *mountlist = NULL;
-
-malloc_string(tmp);
-malloc_string(format);
 
 assert(p_external_copy_of_mountlist != NULL);
@@ -581 +535 @@
 
     mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
-    open_progress_form("Mounting devices",
-               "I am now mounting all the drives.",
-               "This should not take long.",
-               "", mountlist->entries);
+    open_progress_form("Mounting devices", "I am now mounting all the drives.", "This should not take long.", "", mountlist->entries);
 
     mr_asprintf(these_failed, "");
     for (lino = 0; lino < mountlist->entries; lino++) {
         if (!strcmp(mountlist->el[lino].device, "/proc")) {
-            log_msg(1,
-                "Again with the /proc - why is this in your mountlist?");
+            log_msg(1, "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            sprintf(tmp, "%s is already mounted",
-                mountlist->el[lino].device);
-            log_to_screen(tmp);
+            log_to_screen("%s is already mounted", mountlist->el[lino].device);
         } else if (strcmp(mountlist->el[lino].mountpoint, "none")
            && strcmp(mountlist->el[lino].mountpoint, "lvm")
            && strcmp(mountlist->el[lino].mountpoint, "raid")
            && strcmp(mountlist->el[lino].mountpoint, "image")) {
-            sprintf(tmp, "Mounting %s", mountlist->el[lino].device);
+            mr_asprintf(tmp, "Mounting %s", mountlist->el[lino].device);
             update_progress_form(tmp);
-            strcpy(format, mountlist->el[lino].format);
-            res = mount_device(mountlist->el[lino].device,
-                       mountlist->el[lino].mountpoint,
-                       format, writeable);
+            mr_free(tmp);
+            res = mount_device(mountlist->el[lino].device, mountlist->el[lino].mountpoint, mountlist->el[lino].format, writeable);
             retval += res;
             if (res) {
@@ -615 +561 @@
     if (retval) {
         if (g_partition_table_locked_up > 0) {
-            log_to_screen
-                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
-            log_to_screen
-                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
-            log_to_screen
-                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
-        }
-        sprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
+            log_to_screen("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
+            log_to_screen("lock up the partition table. You might have to reboot and use Interactive Mode to");
+            log_to_screen("format and restore *without* partitioning first. Sorry for the inconvenience.");
+        }
+        mr_asprintf(tmp, "Could not mount device(s) %s- shall I abort?", these_failed);
 
         if (!ask_me_yes_or_no(tmp)) {
             retval = 0;
-            log_to_screen
-                ("Continuing, although some device(s) failed to be mounted");
+            log_to_screen("Continuing, although some device(s) failed to be mounted");
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         } else {
             mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-            log_to_screen
-        ("Unable to mount some or all of your partitions.");
-        }
+            log_to_screen("Unable to mount some or all of your partitions.");
+        }
+        mr_free(tmp);
     } else {
         log_to_screen("All partitions were mounted OK.");
@@ -643 +585 @@
     (void)mount_device("/proc","/proc","proc",TRUE);
     (void)mount_device("/sys","/sys","sysfs",TRUE);
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -m -P", 3);
     paranoid_free(mountlist);
-    paranoid_free(tmp);
-    paranoid_free(format);
     return (retval);
 }
@@ -652 +592 @@
 *END_MOUNT_ALL_DEVICES                                                   *
 **************************************************************************/
-
-
 
 
@@ -700 +638 @@
 {
 /** add mallocs **/
-char *value = NULL;
+char value[MAX_STR_LEN];
 char *tmp = NULL;
+char *tmp1 = NULL;
 char *envtmp1 = NULL;
 char *envtmp2 = NULL;
 char *command = NULL;
-char *iso_mnt = NULL;
-char *iso_path = NULL;
+char iso_mnt[MAX_STR_LEN];
+char iso_path[MAX_STR_LEN];
 char *old_isodir = NULL;
-char cfg_file[100];
+char *cfg_file = NULL;
 t_bkptype media_specified_by_user;
 
-malloc_string(command);
-malloc_string(iso_mnt);
-malloc_string(iso_path);
-malloc_string(old_isodir);
-malloc_string(value);
-malloc_string(tmp);
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
 assert(bkpinfo != NULL);
+assert(cfgf != NULL);
 log_it("Entering read_cfg_file_into_bkpinfo");
 
@@ -730 +664 @@
 
 if (0 == read_cfg_var(cfg_file, "backup-media-type", value)) {
-if (!strcmp(value, "cdstream")) {
-    bkpinfo->backup_media_type = cdstream;
-} else if (!strcmp(value, "cdr")) {
-    bkpinfo->backup_media_type = cdr;
-} else if (!strcmp(value, "cdrw")) {
-    bkpinfo->backup_media_type = cdrw;
-} else if (!strcmp(value, "dvd")) {
-    bkpinfo->backup_media_type = dvd;
-} else if (!strcmp(value, "usb")) {
-    bkpinfo->backup_media_type = usb;
-    bkpinfo->please_dont_eject = TRUE;
-} else if (!strcmp(value, "iso")) {
-    bkpinfo->backup_media_type = iso;
-    if (am_I_in_disaster_recovery_mode()) {
-        /* Check to see if CD is already mounted before mounting it... */
-        if (!is_this_device_mounted("/dev/cdrom")) {
-            log_msg(2, "NB: CDROM device not mounted, mounting...");
-            run_program_and_log_output("mount /dev/cdrom " MNT_CDROM, 1);
-        }
-        if (does_file_exist(MNT_CDROM "/archives/filelist.0")) {
-            bkpinfo->backup_media_type = cdr;
-            run_program_and_log_output("umount -d " MNT_CDROM, 1);
-            log_it("Re-jigging configuration AGAIN. CD-R, not ISO.");
-        }
-    }
-    if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-        strcpy(bkpinfo->prefix,value);
+    if (!strcmp(value, "cdstream")) {
+        bkpinfo->backup_media_type = cdstream;
+    } else if (!strcmp(value, "cdr")) {
+        bkpinfo->backup_media_type = cdr;
+    } else if (!strcmp(value, "cdrw")) {
+        bkpinfo->backup_media_type = cdrw;
+    } else if (!strcmp(value, "dvd")) {
+        bkpinfo->backup_media_type = dvd;
+    } else if (!strcmp(value, "usb")) {
+        bkpinfo->backup_media_type = usb;
+        bkpinfo->please_dont_eject = TRUE;
+    } else if (!strcmp(value, "iso")) {
+        bkpinfo->backup_media_type = iso;
+        if (am_I_in_disaster_recovery_mode()) {
+            /* Check to see if CD is already mounted before mounting it... */
+            if (!is_this_device_mounted("/dev/cdrom")) {
+                log_msg(2, "NB: CDROM device not mounted, mounting...");
+                run_program_and_log_output("mount /dev/cdrom "MNT_CDROM, 1);
+            }
+            if (does_file_exist(MNT_CDROM"/archives/filelist.0")) {
+                bkpinfo->backup_media_type = cdr;
+                run_program_and_log_output("umount -d "MNT_CDROM, 1);
+                log_it("Re-jigging configuration AGAIN. CD-R, not ISO.");
+            }
+        }
+        if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
+            strcpy(bkpinfo->prefix,value);
+        } else {
+            strcpy(bkpinfo->prefix,STD_PREFIX);
+        }
+        log_it("Setting Prefix to %s", bkpinfo->prefix);
+    } else if ((!strcmp(value, "netfs")) || (!strcmp(value, "nfs"))) {
+        /* Stay compatible with previous versions by allowing nfs as an entry here */
+        bkpinfo->backup_media_type = netfs;
+        bkpinfo->please_dont_eject = TRUE;
+        if (read_cfg_var(cfg_file, "netfs-proto", value) == 0) {
+            mr_asprintf(bkpinfo->netfs_proto,"%s", value);
+        } else {
+            /* For compatibility, force protocol in old nfs case to be transparent */
+            mr_asprintf(bkpinfo->netfs_proto, "nfs");
+        }
+        if (read_cfg_var(cfg_file, "netfs-server-user", value) == 0) {
+            mr_asprintf(bkpinfo->netfs_user,"%s", value);
+        }
+        if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
+                strcpy(bkpinfo->prefix,value);
+        } else {
+                strcpy(bkpinfo->prefix,STD_PREFIX);
+        }
+        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
+            /* We need to override prefix value in PXE mode as it's
+            * already done in start-netfs */
+            envtmp1 = getenv("imgname");
+            if (envtmp1 == NULL) {
+                fatal_error("no imgname variable in environment");
+            }
+            strcpy(bkpinfo->prefix,envtmp1);
+        }   
+    } else if (!strcmp(value, "tape")) {
+        bkpinfo->backup_media_type = tape;
+    } else if (!strcmp(value, "udev")) {
+        bkpinfo->backup_media_type = udev;
     } else {
-        strcpy(bkpinfo->prefix,STD_PREFIX);
-    }
-    log_it("Setting Prefix to %s", bkpinfo->prefix);
-} else if ((!strcmp(value, "netfs")) || (!strcmp(value, "nfs"))) {
-    /* Stay compatible with previous versions by allowing nfs as an entry here */
-    bkpinfo->backup_media_type = netfs;
-    bkpinfo->please_dont_eject = TRUE;
-    if (read_cfg_var(cfg_file, "netfs-proto", value) == 0) {
-        mr_asprintf(bkpinfo->netfs_proto,"%s", value);
-    } else {
-        /* For compatibility, force protocol in old nfs case to be transparent */
-        mr_asprintf(bkpinfo->netfs_proto, "nfs");
-    }
-    if (read_cfg_var(cfg_file, "netfs-server-user", value) == 0) {
-        mr_asprintf(bkpinfo->netfs_user,"%s", value);
-    }
-    if (read_cfg_var(cfg_file, "iso-prefix", value) == 0) {
-            strcpy(bkpinfo->prefix,value);
-    } else {
-            strcpy(bkpinfo->prefix,STD_PREFIX);
-    }
-    if (strstr(call_program_and_get_last_line_of_output
-       ("cat /proc/cmdline"), "pxe")) {
-        /* We need to override prefix value in PXE mode as it's
-        * already done in start-netfs */
-        envtmp1 = getenv("imgname");
-        if (envtmp1 == NULL) {
-            fatal_error("no imgname variable in environment");
-        }
-        strcpy(bkpinfo->prefix,envtmp1);
-    }
-
-} else if (!strcmp(value, "tape")) {
-    bkpinfo->backup_media_type = tape;
-} else if (!strcmp(value, "udev")) {
-    bkpinfo->backup_media_type = udev;
+        fatal_error("UNKNOWN bkp-media-type");
+    }
 } else {
-    fatal_error("UNKNOWN bkp-media-type");
-}
-} else {
-fatal_error("backup-media-type not specified!");
-}
+    fatal_error("backup-media-type not specified!");
+}
+
 if (bkpinfo->disaster_recovery) {
     if (bkpinfo->backup_media_type == cdstream) {
@@ -814 +747 @@
         }
         sprintf(bkpinfo->media_device, "%s1", value);
-        sprintf(tmp, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
-        log_msg(2, tmp);
-    } else if (bkpinfo->backup_media_type == tape
-            || bkpinfo->backup_media_type == udev) {
+        log_msg(2, "Backup medium is USB --- dev=%s", bkpinfo->media_device);
+    } else if (bkpinfo->backup_media_type == tape || bkpinfo->backup_media_type == udev) {
         if (read_cfg_var(cfg_file, "media-dev", value)) {
             fatal_error("Cannot get tape device name from cfg file");
@@ -824 +755 @@
         read_cfg_var(cfg_file, "media-size", value);
         bkpinfo->media_size = atol(value);
-        sprintf(tmp, "Backup medium is TAPE --- dev=%s",
-                bkpinfo->media_device);
-        log_msg(2, tmp);
+        log_msg(2, "Backup medium is TAPE --- dev=%s", bkpinfo->media_device);
     } else {
         strcpy(bkpinfo->media_device, "/dev/cdrom");    /* we don't really need this var */
@@ -833 +762 @@
     }
 } else {
-    log_msg(2,
-        "Not in Disaster Recovery Mode. No need to derive device name from config file.");
+    log_msg(2, "Not in Disaster Recovery Mode. No need to derive device name from config file.");
 }
 
@@ -867 +795 @@
 
 if (0 == read_cfg_var(cfg_file, "internal-tape-block-size", value)) {
-bkpinfo->internal_tape_block_size = atol(value);
-log_msg(1, "Internal tape block size has been custom-set to %ld",
-        bkpinfo->internal_tape_block_size);
+    bkpinfo->internal_tape_block_size = atol(value);
 } else {
-bkpinfo->internal_tape_block_size =
-    DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
-log_msg(1, "Internal tape block size = default (%ld)",
-        DEFAULT_INTERNAL_TAPE_BLOCK_SIZE);
+    bkpinfo->internal_tape_block_size = DEFAULT_INTERNAL_TAPE_BLOCK_SIZE;
+}
+log_msg(1, "Internal tape block size set to %ld", bkpinfo->internal_tape_block_size);
+
+read_cfg_var(cfg_file, "use-lzma", value);
+if (strstr(value, "yes")) {
+    bkpinfo->use_lzma = TRUE;
+    bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
+    strcpy(bkpinfo->zip_exe, "lzma");
+    strcpy(bkpinfo->zip_suffix, "lzma");
 }
 
 read_cfg_var(cfg_file, "use-lzo", value);
 if (strstr(value, "yes")) {
-bkpinfo->use_lzo = TRUE;
-bkpinfo->use_gzip = FALSE;
-strcpy(bkpinfo->zip_exe, "lzop");
-strcpy(bkpinfo->zip_suffix, "lzo");
-} else {
+    bkpinfo->use_lzma = FALSE;
+    bkpinfo->use_lzo = TRUE;
+    bkpinfo->use_gzip = FALSE;
+    strcpy(bkpinfo->zip_exe, "lzop");
+    strcpy(bkpinfo->zip_suffix, "lzo");
+}
+
 read_cfg_var(cfg_file, "use-gzip", value);
 if (strstr(value, "yes")) {
+    bkpinfo->use_lzma = FALSE;
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = TRUE;
     strcpy(bkpinfo->zip_exe, "gzip");
     strcpy(bkpinfo->zip_suffix, "gz");
-} else {
-    read_cfg_var(cfg_file, "use-comp", value);
-    if (strstr(value, "yes")) {
-        bkpinfo->use_lzo = FALSE;
-        bkpinfo->use_gzip = FALSE;
-        strcpy(bkpinfo->zip_exe, "bzip2");
-        strcpy(bkpinfo->zip_suffix, "bz2");
-    } else {
-        bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
-    }
-}
+}
+
+read_cfg_var(cfg_file, "use-comp", value);
+if (strstr(value, "yes")) {
+    bkpinfo->use_lzma = FALSE;
+    bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
+    strcpy(bkpinfo->zip_exe, "bzip2");
+    strcpy(bkpinfo->zip_suffix, "bz2");
 }
 
@@ -906 +840 @@
 read_cfg_var(cfg_file, "differential", value);
 if (!strcmp(value, "yes") || !strcmp(value, "1")) {
-bkpinfo->differential = TRUE;
+    bkpinfo->differential = TRUE;
 }
 log_msg(2, "differential var = '%s'", value);
 if (bkpinfo->differential) {
-log_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
+    log_msg(2, "THIS IS A DIFFERENTIAL BACKUP");
 } else {
-log_msg(2, "This is a regular (full) backup");
-}
-
-read_cfg_var(g_mondo_cfg_file, "please-dont-eject", tmp);
-if (tmp[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
+    log_msg(2, "This is a regular (full) backup");
+}
+
+read_cfg_var(g_mondo_cfg_file, "please-dont-eject", value);
+if (value[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
     bkpinfo->please_dont_eject = TRUE;
     log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
@@ -923 +857 @@
 if (bkpinfo->backup_media_type == netfs) {
     if (!cfgf) {
-        log_msg(2, "netfs_mount remains %s", bkpinfo->netfs_mount);
-        log_msg(2, "netfs_remote_dir remains %s",
-                bkpinfo->netfs_remote_dir);
-        log_msg(2,
-                "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
+        if (bkpinfo->netfs_mount) {
+            log_msg(2, "netfs_mount remains %s", bkpinfo->netfs_mount);
+        }
+        if (bkpinfo->netfs_remote_dir) {
+            log_msg(2, "netfs_remote_dir remains %s", bkpinfo->netfs_remote_dir);
+        }
+        log_msg(2, "...cos it wouldn't make sense to abandon the values that GOT ME to this config file in the first place");
     } else {
-        read_cfg_var(g_mondo_cfg_file, "netfs-server-mount",
-                    bkpinfo->netfs_mount);
-        read_cfg_var(g_mondo_cfg_file, "netfs-server-path",
-                    bkpinfo->netfs_remote_dir);
-        log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
-        log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
-        if (bkpinfo->netfs_user) {
+        read_cfg_var(g_mondo_cfg_file, "netfs-server-mount", value);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", value);
+
+        read_cfg_var(g_mondo_cfg_file, "netfs-server-path", value);
+        mr_free(bkpinfo->netfs_remote_dir);
+        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", value);
+
+        if (bkpinfo->netfs_mount != NULL) {
+            log_msg(2, "netfs_mount is %s", bkpinfo->netfs_mount);
+        }
+        if (bkpinfo->netfs_remote_dir != NULL) {
+            log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
+        }
+        if (bkpinfo->netfs_proto != NULL) {
+            log_msg(2, "netfs_proto is %s", bkpinfo->netfs_proto);
+        }
+        if (bkpinfo->netfs_user != NULL) {
             log_msg(2, "netfs_user is %s", bkpinfo->netfs_user);
         }
-        log_msg(2, "netfs_remote_dir is %s", bkpinfo->netfs_remote_dir);
-    }
-    if (strstr(call_program_and_get_last_line_of_output
-        ("cat /proc/cmdline"), "pxe")) {
+    }
+    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
         /* We need to override values in PXE mode as it's
         * already done in start-netfs */
@@ -952 +897 @@
             fatal_error("no dirimg variable in environment");
         }
-        strcpy(bkpinfo->netfs_mount,envtmp1);
-        strcpy(bkpinfo->netfs_remote_dir,envtmp2);
+        mr_free(bkpinfo->netfs_mount);
+        mr_asprintf(bkpinfo->netfs_mount, "%s", envtmp1);
+
+        mr_free(bkpinfo->netfs_remote_dir);
+        mr_asprintf(bkpinfo->netfs_remote_dir, "%s", envtmp2);
     }
 } else if (bkpinfo->backup_media_type == iso) {
@@ -960 +908 @@
     * isodir in disaster recovery mode
     */
-    strcpy(old_isodir, bkpinfo->isodir);
+    mr_asprintf(old_isodir, "%s", bkpinfo->isodir);
     read_cfg_var(g_mondo_cfg_file, "iso-mnt", iso_mnt);
     read_cfg_var(g_mondo_cfg_file, "isodir", iso_path);
@@ -969 +917 @@
     if ((!bkpinfo->disaster_recovery) || (g_isodir_device[0] != '\0')) {
         if (strcmp(old_isodir, bkpinfo->isodir)) {
-            log_it
-                ("user nominated isodir %s differs from archive %s, keeping user's choice\n",
-                old_isodir, bkpinfo->isodir);
+            log_it("user nominated isodir %s differs from archive, keeping user's choice: %s\n", bkpinfo->isodir, old_isodir );
             strcpy(bkpinfo->isodir, old_isodir);
         }
@@ -982 +928 @@
 
     log_msg(2, "isodir=%s; iso-dev=%s", bkpinfo->isodir, g_isodir_device);
+
     if (bkpinfo->disaster_recovery) {
         if (is_this_device_mounted(g_isodir_device)) {
             log_msg(2, "NB: isodir is already mounted");
             /* Find out where it's mounted */
-            sprintf(command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
+            mr_asprintf(command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
             log_it("command = %s", command);
-            log_it("res of it = %s",
-                call_program_and_get_last_line_of_output(command));
-            sprintf(iso_mnt, "%s",
-                    call_program_and_get_last_line_of_output(command));
+            log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
+            mr_strcpy(iso_mnt, call_program_and_get_last_line_of_output(command));
+            mr_free(command);
         } else {
-            sprintf(iso_mnt, "/tmp/isodir");
-            sprintf(tmp, "mkdir -p %s", iso_mnt);
-            run_program_and_log_output(tmp, 5);
-            sprintf(tmp, "mount %s %s", g_isodir_device, iso_mnt);
-            if (run_program_and_log_output(tmp, 3)) {
-                log_msg(1,
-                        "Unable to mount isodir. Perhaps this is really a CD backup?");
+            mr_asprintf(iso_mnt, "/tmp/isodir");
+            mr_asprintf(tmp1, "mkdir -p %s", iso_mnt);
+            run_program_and_log_output(tmp1, 5);
+            mr_free(tmp1);
+
+            mr_asprintf(tmp1, "mount %s %s", g_isodir_device, iso_mnt);
+            if (run_program_and_log_output(tmp1, 3)) {
+                log_msg(1, "Unable to mount isodir. Perhaps this is really a CD backup?");
                 bkpinfo->backup_media_type = cdr;
                 strcpy(bkpinfo->media_device, "/dev/cdrom");    /* superfluous */
                 bkpinfo->isodir[0] = iso_mnt[0] = iso_path[0] = '\0';
                 if (mount_media()) {
-                    fatal_error
-                        ("Unable to mount isodir. Failed to mount CD-ROM as well.");
+                    mr_free(tmp1);
+                    fatal_error("Unable to mount isodir. Failed to mount CD-ROM as well.");
                 } else {
-                    log_msg(1,
-                            "You backed up to disk, then burned some CDs.");
-                }
-            }
+                    log_msg(1, "You backed up to disk, then burned some CDs.");
+                }
+            }
+            mr_free(tmp1);
         }
         /* bkpinfo->isodir should now be the true path to prefix-1.iso etc... */
-        /*  except when already done is iso_fiddly_bits */
+        /*  except when already done in iso_fiddly_bits */
         if ((bkpinfo->backup_media_type == iso) && (g_isodir_device[0] == '\0')) {
             sprintf(bkpinfo->isodir, "%s%s", iso_mnt, iso_path);
@@ -1027 +974 @@
             media_specified_by_user = bkpinfo->backup_media_type;
             get_cfg_file_from_archive();
-    /*
-        if (media_specified_by_user != cdr && media_specified_by_user == cdrw)
-            { g_restoring_live_from_cd = FALSE; }
-    */
         }
     }
@@ -1037 +980 @@
 g_backup_media_type = bkpinfo->backup_media_type;
 paranoid_free(value);
-paranoid_free(tmp);
-paranoid_free(command);
 paranoid_free(iso_mnt);
 paranoid_free(iso_path);
-paranoid_free(old_isodir);
 return (0);
 
@@ -1068 +1008 @@
 struct s_node *filelist;
 
-/** add mallocs**/
-char *command;
+char *command = NULL;
 char *tmp;
 char *q;
@@ -1077 +1016 @@
 
 assert(bkpinfo != NULL);
-malloc_string(command);
 malloc_string(tmp);
 
@@ -1105 +1043 @@
     unlink(FILELIST_FULL_STUB);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        sprintf(command,
-            "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s",
-            bkpinfo->internal_tape_block_size,
-            bkpinfo->media_device,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "tar -b %ld -zxf %s ./%s ./%s ./%s ./%s ./%s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
+        mr_free(command);
+
         if (!does_file_exist(FILELIST_FULL_STUB)) {
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            sprintf(command,
-                "tar -b %ld -zxf %s %s %s %s %s %s",
-                bkpinfo->internal_tape_block_size,
-                bkpinfo->media_device,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(command, "tar -b %ld -zxf %s %s %s %s %s %s", bkpinfo->internal_tape_block_size, bkpinfo->media_device, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
+            mr_free(command);
         }
     } else {
-        log_msg(2,
-            "Calling insist_on_this_cd_number; bkpinfo->isodir=%s",
-            bkpinfo->isodir);
+        log_msg(2, "Calling insist_on_this_cd_number; bkpinfo->isodir=%s", bkpinfo->isodir);
         insist_on_this_cd_number(1);
         log_msg(2, "Back from iotcn");
         run_program_and_log_output("mount", 1);
-        sprintf(command,
-            "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s",
-            MNT_CDROM,
-            MOUNTLIST_FNAME_STUB,
-            BIGGIELIST_TXT_STUB,
-            FILELIST_FULL_STUB,
-            IWANTMYLVM_STUB,
-            MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "tar -zxf %s/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
         log_msg(1, "tarcommand = %s", command);
         run_program_and_log_output(command, 1);
+        mr_free(command);
+
         if (!does_file_exist(FILELIST_FULL_STUB)) {
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            sprintf(command,
-                "tar -zxf %s/images/all.tar.gz %s %s %s %s %s",
-                MNT_CDROM,
-                MOUNTLIST_FNAME_STUB,
-                BIGGIELIST_TXT_STUB,
-                FILELIST_FULL_STUB,
-                IWANTMYLVM_STUB,
-                MONDO_CFG_FILE_STUB);
+            mr_asprintf(command, "tar -zxf %s/images/all.tar.gz %s %s %s %s %s", MNT_CDROM, MOUNTLIST_FNAME_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB, MONDO_CFG_FILE_STUB);
 
             log_msg(1, "tarcommand = %s", command);
             run_program_and_log_output(command, 1);
+            mr_free(command);
         }
         if (!does_file_exist(BIGGIELIST_TXT_STUB)) {
-            fatal_error
-                ("all.tar.gz did not include " BIGGIELIST_TXT_STUB);
+            fatal_error("all.tar.gz did not include " BIGGIELIST_TXT_STUB);
         }
         if (!does_file_exist(FILELIST_FULL_STUB)) {
-            fatal_error
-                ("all.tar.gz did not include " FILELIST_FULL_STUB);
-        }
-    }
-    sprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB,
-        g_mondo_cfg_file);
+            fatal_error("all.tar.gz did not include " FILELIST_FULL_STUB);
+        }
+    }
+    mr_asprintf(command, "cp -f %s %s", MONDO_CFG_FILE_STUB, g_mondo_cfg_file);
     run_program_and_log_output(command, FALSE);
-
-    sprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir,
-        BIGGIELIST_TXT_STUB, g_biggielist_txt);
+    mr_free(command);
+
+    mr_asprintf(command, "cp -f %s/%s %s", bkpinfo->tmpdir, BIGGIELIST_TXT_STUB, g_biggielist_txt);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
-    sprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir,
-        FILELIST_FULL_STUB, g_filelist_full);
+    mr_free(command);
+
+    mr_asprintf(command, "ln -sf %s/%s %s", bkpinfo->tmpdir, FILELIST_FULL_STUB, g_filelist_full);
     log_msg(1, "command = %s", command);
     paranoid_system(command);
+    mr_free(command);
     }
 
@@ -1194 +1105 @@
     ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
     {
-        sprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB,
-            bkpinfo->tmpdir);
-    paranoid_system(command);
+        mr_asprintf(command, "ln -sf %s/%s /tmp", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir);
+        paranoid_system(command);
+        mr_free(command);
     }
 
@@ -1209 +1120 @@
         log_msg(1, "Warning - %s does not exist", g_filelist_full);
     }
-//  popup_and_OK("Wonderful.");
 
     log_msg(2, "Forking");
@@ -1221 +1131 @@
         log_to_screen("Pre-processing filelist");
         if (!does_file_exist(g_biggielist_txt)) {
-            sprintf(command, "echo -n > %s", g_biggielist_txt);
+            mr_asprintf(command, "echo -n > %s", g_biggielist_txt);
             paranoid_system(command);
-        }
-        sprintf(command, "grep -E '^/dev/.*' %s > %s",
-                g_biggielist_txt, g_filelist_imagedevs);
+            mr_free(command);
+        }
+        mr_asprintf(command, "grep -E '^/dev/.*' %s > %s", g_biggielist_txt, g_filelist_imagedevs);
         paranoid_system(command);
+        mr_free(command);
         exit(0);
         break;
@@ -1247 +1158 @@
         while (q == NULL) {
             printf("Restore which directory? --> ");
-            q = fgets(tmp, sizeof(tmp), stdin);
-        }
-        toggle_path_selection(filelist, tmp, TRUE);
-        if (strlen(tmp) == 0) {
+            mr_getline(q, stdin);
+        }
+        toggle_path_selection(filelist, q, TRUE);
+        if (strlen(q) == 0) {
             res = 1;
         } else {
             res = 0;
         }
+        mr_free(q);
     } else {
         res = edit_filelist(filelist);
@@ -1277 +1189 @@
     }
 
-    paranoid_free(command);
     paranoid_free(tmp);
     return (filelist);
@@ -1298 +1209 @@
 int backup_crucial_file(char *path_root, char *filename)
 {
-    char *tmp;
-    char *command;
+    char *tmp = NULL;
+    char *command = NULL;
     int res;
 
-    malloc_string(tmp);
-    malloc_string(command);
     assert(path_root != NULL);
     assert_string_is_neither_NULL_nor_zerolength(filename);
 
-    sprintf(tmp, "%s/%s", path_root, filename);
-    sprintf(command, "cp -f %s %s.pristine", tmp, tmp);
+    mr_asprintf(tmp, "%s/%s", path_root, filename);
+    mr_asprintf(command, "cp -f %s %s.pristine", tmp, tmp);
+    mr_free(tmp);
 
     res = run_program_and_log_output(command, 5);
-    paranoid_free(tmp);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }
@@ -1358 +1267 @@
 
   /** malloc *******/
-    char *device;
-    char *tmp = NULL;
-    char *name;
+    char *device = NULL;
+    char *name = NULL;
     char *cmd = NULL;
 
@@ -1385 +1293 @@
     read_cfg_var(g_mondo_cfg_file, "bootloader.device", device);
     read_cfg_var(g_mondo_cfg_file, "bootloader.name", name);
-    mr_asprintf(tmp, "run_boot_loader: device='%s', name='%s'", device, name);
-    log_msg(2, tmp);
-    paranoid_free(tmp);
-    paranoid_system("sync");
+    log_msg(2, "run_boot_loader: device='%s', name='%s'", device, name);
+    sync();
 
     offer_to_make_initrd();
@@ -1408 +1314 @@
         mr_asprintf(tmp, "ls /dev | grep -Eq '^%ss[1-4].*'", device);
         if (!system(tmp)) {
-            paranoid_free(tmp);
+            mr_free(tmp);
             mr_asprintf(tmp, MNT_RESTORING "/sbin/fdisk -B %s", device);
             res = run_program_and_log_output(tmp, 3);
         } else {
-            log_msg(1,
-                    "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
-        }
-        paranoid_free(tmp);
+            log_msg(1, "I'm not running any boot loader. You have a DD boot drive. It's already loaded up.");
+        }
+        mr_free(tmp);
     }
 #else
@@ -1446 +1351 @@
  * @note The returned string points to static storage that will be overwritten with each call.
  */
-char *find_my_editor(void)
-{
+char *find_my_editor(void) {
+
     static char output[MAX_STR_LEN];
     if (find_home_of_exe("pico")) {
@@ -1476 +1381 @@
 {
   /** malloc **/
-    char *command;
-    char *boot_device;
-    char *rootdev;
-    char *rootdrive;
-    char *conffile;
-    char *tmp;
-    char *editor;
-
+    char *command = NULL;
+    char *boot_device = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
+
+    bool done;
     int res = 0;        /*  FALSE */
-    int done;
     bool mntlistchg = FALSE;
     FILE *fin = NULL;
 
-    malloc_string(command);
     malloc_string(boot_device);
-    malloc_string(tmp);
-    malloc_string(editor);
-    malloc_string(rootdev);
-    malloc_string(rootdrive);
-    malloc_string(conffile);
+
     assert_string_is_neither_NULL_nor_zerolength(bd);
-    strcpy(editor, find_my_editor());
     strcpy(boot_device, bd);
 
-    if (!run_program_and_log_output("which grub-MR", FALSE)) {
-        log_msg(1, "Yay! grub-MR found...");
-        sprintf(command, "grub-MR %s /tmp/mountlist.txt", boot_device);
-        log_msg(1, "command = %s", command);
-    } else {
-        sprintf(command, "chroot " MNT_RESTORING " grub-install %s",
-                boot_device);
-        log_msg(1, "WARNING - grub-MR not found; using grub-install");
-    }
     if (offer_to_run_stabgrub
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY,
                             0,
@@ -1521 +1407 @@
         }
         for (done = FALSE; !done;) {
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
+            popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4);
             /*  Only try to adapt grub here first if the mountlist wasn't changed before */
             if (! mntlistchg) {
-                sprintf(command, "stabgrub-me %s", boot_device);
+                mr_asprintf(command, "stabgrub-me %s", boot_device);
                 res = run_program_and_log_output(command, 1);
-            }
-            if ((res) || (mntlistchg)){
+                mr_free(command);
+            }
+
+            if ((res) || (mntlistchg)) {
                 if (res) {
                     popup_and_OK("GRUB installation failed. You will now edit fstab, mtab, device.map and menu.lst/grub.cfg in order to fix grub install");
@@ -1538 +1424 @@
                     newtSuspend();
                 }
-                sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                mr_asprintf(editor, "%s", find_my_editor());
+                mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
+                mr_free(tmp);
+
+                mr_asprintf(tmp, "chroot %s %s /etc/mtab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
+                mr_free(tmp);
+    
                 if (does_file_exist(MNT_RESTORING"/boot/grub/menu.lst")) {
-                    sprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/menu.lst", MNT_RESTORING, editor);
                 } else if (does_file_exist(MNT_RESTORING"/boot/grub/grub.cfg")) {
-                    sprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/grub.cfg", MNT_RESTORING, editor);
                 } else if (does_file_exist(MNT_RESTORING"/boot/grub2/grub.cfg")) {
-                    sprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub2/grub.cfg", MNT_RESTORING, editor);
                 }
                 paranoid_system(tmp);
+                mr_free(tmp);
+    
                 if (does_file_exist(MNT_RESTORING"/boot/grub/device.map")) {
-                    sprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub/device.map", MNT_RESTORING, editor);
                 } else if (does_file_exist(MNT_RESTORING"/boot/grub2/device.map")) {
-                    sprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
-                                }
+                    mr_asprintf(tmp, "chroot %s %s /boot/grub2/device.map", MNT_RESTORING, editor);
+                }
                 paranoid_system(tmp);
+                mr_free(tmp);
+                mr_free(editor);
+
                 if (!g_text_mode) {
                     newtResume();
                 }
-                sprintf(command, "stabgrub-me %s", boot_device);
+                mr_asprintf(command, "stabgrub-me %s", boot_device);
                 res = run_program_and_log_output(command, 1);
+                mr_free(command);
+
                 if (res) {
-                    popup_and_OK
-                        ("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
+                    popup_and_OK("GRUB installation failed. Please fix the conf files so that a manual install using 'grub-install' or similar command works. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
                     newtSuspend();
                     paranoid_system("chroot " MNT_RESTORING);
@@ -1576 +1473 @@
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
-        mvaddstr_and_log_it(g_currentY,
-                            0,
-                            "Running GRUB...                                                 ");
+        if (!run_program_and_log_output("which grub-MR", FALSE)) {
+            log_msg(1, "Yay! grub-MR found...");
+            mr_asprintf(command, "grub-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
+            log_msg(1, "command = %s", command);
+        } else {
+            mr_asprintf(command, "chroot " MNT_RESTORING " grub-install %s", boot_device);
+            log_msg(1, "WARNING - grub-MR not found; using grub-install");
+        }
+        mvaddstr_and_log_it(g_currentY, 0, "Running GRUB...                                                 ");
         log_it("%s",command);
         res = run_program_and_log_output(command, 1);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
@@ -1609 +1513 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(rootdev);
-    paranoid_free(rootdrive);
-    paranoid_free(conffile);
-    paranoid_free(command);
     paranoid_free(boot_device);
-    paranoid_free(tmp);
-    paranoid_free(editor);
 
     return (res);
@@ -1633 +1531 @@
 {
   /** malloc **/
-    char *command;
-    char *tmp;
-    char *editor;
+    char *command = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
 
     int res;
     int done;
 
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(editor);
-    strcpy(editor, find_my_editor());
     if (offer_to_run_stabelilo
         && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
@@ -1652 +1546 @@
                             0,
                             "Modifying fstab and elilo.conf...                             ");
-        sprintf(command, "stabelilo-me");
+        mr_asprintf(command, "stabelilo-me");
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
@@ -1661 +1557 @@
                     newtSuspend();
                 }
-                sprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
+                mr_asprintf(editor, "%s", find_my_editor());
+
+                mr_asprintf(tmp, "chroot %s %s /etc/fstab", MNT_RESTORING, editor);
                 paranoid_system(tmp);
-                sprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
+                mr_free(tmp);
+
+                mr_asprintf(tmp, "chroot %s %s /etc/elilo.conf", MNT_RESTORING, editor);
                 paranoid_system(tmp);
+                mr_free(tmp);
+                mr_free(editor);
+
                 if (!g_text_mode) {
                     newtResume();
@@ -1682 +1585 @@
         res = TRUE;
     }
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(editor);
     return (res);
 }
@@ -1701 +1601 @@
 {
   /** malloc **/
-    char *command;
-    char *tmp;
-    char *editor;
+    char *command = NULL;
+    char *tmp = NULL;
+    char *editor = NULL;
 
     int res;
     int done;
     bool run_lilo_M = FALSE;
-    malloc_string(command);
-    malloc_string(tmp);
-    malloc_string(editor);
 
     if (!run_program_and_log_output
@@ -1717 +1614 @@
     }
 
-    strcpy(editor, find_my_editor());
     if (offer_to_run_stablilo
         && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
@@ -1726 +1622 @@
                             0,
                             "Modifying fstab and lilo.conf, and running LILO...                             ");
-        sprintf(command, "stablilo-me");
+        mr_asprintf(command, "stablilo-me");
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
+
         if (res) {
             popup_and_OK
@@ -1735 +1633 @@
                     newtSuspend();
                 }
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(editor, "%s", find_my_editor());
+
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
                 paranoid_system(tmp);
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
+                mr_free(tmp);
+
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/lilo.conf", editor);
                 paranoid_system(tmp);
+                mr_free(tmp);
+                mr_free(editor);
+
                 if (!g_text_mode) {
                     newtResume();
@@ -1793 +1698 @@
                                    " lilo -M /dev/sda", 3);
     }
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(editor);
     return (res);
 }
@@ -1813 +1715 @@
 {
   /** malloc **/
-    char *command;
-    char *boot_device;
-    char *tmp;
+    char *command = NULL;
+    char *boot_device = NULL;
+    char *tmp = NULL;
     char *editor;
     int res;
     int done;
 
-    malloc_string(command);
     malloc_string(boot_device);
-    malloc_string(tmp);
-    malloc_string(editor);
     assert_string_is_neither_NULL_nor_zerolength(bd);
 
-    strcpy(editor, find_my_editor());
     strcpy(boot_device, bd);
-    sprintf(command, "raw-MR %s /tmp/mountlist.txt", boot_device);
-    log_msg(2, "run_raw_mbr() --- command='%s'", command);
 
     if (offer_to_hack_scripts
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY, 0,
                             "Modifying fstab and restoring MBR...                           ");
@@ -1843 +1738 @@
                     newtSuspend();
                 }
-                sprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_asprintf(editor, "%s", find_my_editor());
+                mr_asprintf(tmp, "%s " MNT_RESTORING "/etc/fstab", editor);
+                mr_free(editor);
+
                 paranoid_system(tmp);
+                mr_free(tmp);
                 if (!g_text_mode) {
                     newtResume();
                 }
-//              newtCls();
-            }
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
-            sprintf(command, "stabraw-me %s", boot_device);
+            }
+            popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device, MAX_STR_LEN / 4);
+            mr_asprintf(command, "stabraw-me %s", boot_device);
             res = run_program_and_log_output(command, 3);
+            mr_free(command);
+
             if (res) {
                 done = ask_me_yes_or_no("Modifications failed. Re-try?");
@@ -1861 +1759 @@
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
+        mr_asprintf(command, "raw-MR %s "MINDI_CACHE"/mountlist.txt", boot_device);
+        log_msg(2, "run_raw_mbr() --- command='%s'", command);
+
         mvaddstr_and_log_it(g_currentY, 0,
                             "Restoring MBR...                                               ");
         res = run_program_and_log_output(command, 3);
+        mr_free(command);
     }
     if (res) {
@@ -1875 +1776 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(command);
     paranoid_free(boot_device);
-    paranoid_free(tmp);
-    paranoid_free(editor);
     return (res);
 }
@@ -1907 +1805 @@
     malloc_string(g_mountlist_fname);
     malloc_string(g_mondo_home);
-    /*
-    malloc_string(g_tmpfs_mountpt);
-    */
     malloc_string(g_isodir_device);
     malloc_string(g_isodir_format);
@@ -1946 +1841 @@
     FILE *fin;
     FILE *fout;
-  /** malloc **/
-    char *incoming;
-    char *q;
+    char *incoming = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);
     assert_string_is_neither_NULL_nor_zerolength(input_file);
-    malloc_string(incoming);
 
     if (!(fin = fopen(input_file, "r"))) {
@@ -1961 +1853 @@
         fatal_error("cannot open output_file");
     }
-    for (q = fgets(incoming, MAX_STR_LEN - 1, fin); !feof(fin) && (q != NULL);
-         q = fgets(incoming, MAX_STR_LEN - 1, fin)) {
+    for (mr_getline(incoming, fin); !feof(fin); mr_getline(incoming, fin)) {
         if (strncmp(incoming, "etc/adjtime", 11)
             && strncmp(incoming, "etc/mtab", 8)
@@ -1971 +1862 @@
             && strncmp(incoming, "var/", 4))
             fprintf(fout, "%s", incoming);  /* don't need \n here, for some reason.. */
-    }
+        mr_free(incoming);
+    }
+    mr_free(incoming);
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(incoming);
 }
 
@@ -1989 +1881 @@
     int i;
     /* MALLOC * */
-    char *tmp;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+
     if (does_file_exist("/tmp/NOPAUSE")) {
         return;
@@ -2001 +1892 @@
     for (i = 0; i < 20; i++) {
         g_current_progress = i;
-        sprintf(tmp, "You have %d seconds left to abort.", 20 - i);
+        mr_asprintf(tmp, "You have %d seconds left to abort.", 20 - i);
         update_progress_form(tmp);
+        mr_free(tmp);
         sleep(1);
     }
     close_progress_form();
-    paranoid_free(tmp);
 }
 
@@ -2024 +1915 @@
     struct mountlist_itself *mountlist;
     int retval = 0, lino, res = 0, i;
-    char *command;
+    char *command = NULL;
     char *tmp = NULL;
 
-    malloc_string(command);
     assert(p_external_copy_of_mountlist != NULL);
 
@@ -2035 +1925 @@
     sort_mountlist_by_mountpoint(mountlist, 0);
 
-    run_program_and_log_output("df -m", 3);
+    run_program_and_log_output("df -m -P", 3);
     mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
     open_progress_form("Unmounting devices",
@@ -2054 +1944 @@
     }
 
-    paranoid_system("sync");
+    sync();
 
     mr_asprintf(tmp, "cp -f %s " MNT_RESTORING "/var/log", MONDO_LOGFILE);
@@ -2068 +1958 @@
 
     /* Unmounting the local /proc and /sys first */
-    run_program_and_log_output("umount " MNT_RESTORING "/proc",3);
-    run_program_and_log_output("umount " MNT_RESTORING "/sys",3);
+    run_program_and_log_output("umount -d " MNT_RESTORING "/proc",3);
+    run_program_and_log_output("umount -d " MNT_RESTORING "/sys",3);
 
     for (lino = mountlist->entries - 1; lino >= 0; lino--) {
@@ -2076 +1966 @@
         }
         mr_asprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
-
         update_progress_form(tmp);
 
         if (is_this_device_mounted(mountlist->el[lino].device)) {
             if (!strcmp(mountlist->el[lino].mountpoint, "swap")) {
-                sprintf(command, "swapoff %s", mountlist->el[lino].device);
+                mr_asprintf(command, "swapoff %s", mountlist->el[lino].device);
             } else {
                 if (!strcmp(mountlist->el[lino].mountpoint, "/1")) {
-                    sprintf(command, "umount %s/", MNT_RESTORING);
+                    mr_asprintf(command, "umount -d %s/", MNT_RESTORING);
                     log_msg(3,
                             "Well, I know a certain kitty-kitty who'll be sleeping with Mommy tonight...");
                 } else {
-                    sprintf(command, "umount " MNT_RESTORING "%s",
-                            mountlist->el[lino].mountpoint);
+                    mr_asprintf(command, "umount -d " MNT_RESTORING "%s", mountlist->el[lino].mountpoint);
 
                     /* To support latest Ubuntu where /var is a separate FS 
@@ -2102 +1990 @@
             log_msg(10, "The 'umount' command is '%s'", command);
             res = run_program_and_log_output(command, 3);
+            mr_free(command);
         } else {
             mr_strcat(tmp, "...not mounted anyway :-) OK");
@@ -2128 +2017 @@
     }
     free(mountlist);
-    paranoid_free(command);
     return (retval);
 }
@@ -2135 +2023 @@
  *END_UNMOUNT_ALL_DEVICES                                                 *
  **************************************************************************/
-
-
 
 /**
@@ -2146 +2032 @@
 int extract_cfg_file_and_mountlist_from_tape_dev(char *dev)
 {
-    char *command;
+    char *command = NULL;
     int res = 0;
-
-    malloc_string(command);
 
     if (bkpinfo->use_obdr) {
@@ -2158 +2042 @@
     }
 
-    sprintf(command,
-            "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s",
-            dev,
-            bkpinfo->internal_tape_block_size,
-            1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-            MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-            BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+    mr_asprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx ./%s ./%s ./%s ./%s ./%s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
     log_msg(2, "command = '%s'", command);
     res = run_program_and_log_output(command, -1);
+    mr_free(command);
+
     if (res != 0) {
         if (does_file_exist(MONDO_CFG_FILE_STUB)) {
@@ -2173 +2053 @@
             /* Doing that allow us to remain compatible with pre-2.2.5 versions */
             log_msg(2, "pre-2.2.4 compatible mode on");
-            sprintf(command,
-                    "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s",
-                    dev,
-                    bkpinfo->internal_tape_block_size,
-                    1024L * 1024 * 32 / bkpinfo->internal_tape_block_size,
-                    MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB,
-                    BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
+            mr_sprintf(command, "dd if=%s bs=%ld count=%ld 2> /dev/null | tar -zx %s %s %s %s %s", dev, bkpinfo->internal_tape_block_size, 1024L * 1024 * 32 / bkpinfo->internal_tape_block_size, MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);
             log_msg(2, "command = '%s'", command);
             res = run_program_and_log_output(command, -1);
+            mr_free(command);
             if ((res != 0) && (does_file_exist(MONDO_CFG_FILE_STUB))) {
                 res = 0;
@@ -2190 +2065 @@
     return (res);
 }
-
 
 
@@ -2206 +2080 @@
 
    /** malloc *****/
-    char *device;
-    char *command;
-    char *cfg_file;
-    char *mounted_cfgf_path;
-    char *tmp;
-    char *mountpt;
-    char *ramdisk_fname;
-    char *mountlist_file;
+    char *command = NULL;
+    char *cfg_file = NULL;
+    char *tmp = NULL;
+    char *mountpt = NULL;
+    char *mountlist_file = NULL;
     bool extract_mountlist_stub = FALSE;
     bool extract_i_want_my_lvm = FALSE;
@@ -2220 +2091 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(cfg_file);
-    malloc_string(mounted_cfgf_path);
-    malloc_string(mountpt);
-    malloc_string(ramdisk_fname);
-    malloc_string(mountlist_file);
-    malloc_string(device);
-    malloc_string(command);
-    malloc_string(tmp);
     log_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
-    sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    device[0] = '\0';
+    mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     if (chdir(bkpinfo->tmpdir)) {
         // FIXME
     }
-    strcpy(cfg_file, MONDO_CFG_FILE_STUB);
+    mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
     unlink(cfg_file);           // cfg_file[] is missing the '/' at the start, FYI, by intent
+    mr_free(cfg_file);
+
     unlink(FILELIST_FULL_STUB);
     unlink(BIGGIELIST_TXT_STUB);
-    sprintf(command, "mkdir -p %s", mountpt);
+    mr _asprintf(command, "mkdir -p %s", mountpt);
     run_program_and_log_output(command, FALSE);
-
-    sprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    sprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
-    //   make_hole_for_file( cfg_file );
-    //   make_hole_for_file( mountlist_file);
+    mr_free(command);
+
+    mr_asprintf(cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
+    mr_asprintf(mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
+    mr_free(mountpt);
 
     if (!does_file_exist(cfg_file)) {
@@ -2276 +2140 @@
                 log_msg(2, "media_device is blank; assuming %s");
             }
-            strcpy(tmp, bkpinfo->media_device);
+            mr_asprintf(tmp, "%s", bkpinfo->media_device);
             if (extract_cfg_file_and_mountlist_from_tape_dev
                 (bkpinfo->media_device)) {
@@ -2295 +2159 @@
                 }
             }
+            mr_free(tmp);
 
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
@@ -2314 +2179 @@
                 log_msg(2,
                         "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
-                sprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);    // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz ./%s ./%s ./%s ./%s ./%s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);    // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                 run_program_and_log_output(command, TRUE);
+                mr_free(command);
+
                 if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
                     /* Doing that allow us to remain compatible with pre-2.2.5 versions */
                     log_msg(2, "pre-2.2.4 compatible mode on");
-                    sprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
+                    mr_asprintf(command, "tar -zxvf " MNT_CDROM "/images/all.tar.gz %s %s %s %s %s", MOUNTLIST_FNAME_STUB, MONDO_CFG_FILE_STUB, BIGGIELIST_TXT_STUB, FILELIST_FULL_STUB, IWANTMYLVM_STUB);  // add -b TAPE_BLOCK_SIZE if you _really_ think it's necessary
                     run_program_and_log_output(command, TRUE);
+                    mr_free(command);
                     if (!does_file_exist(MONDO_CFG_FILE_STUB)) {
                         fatal_error
@@ -2330 +2198 @@
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
         log_msg(1, "gcffa --- great! We've got the config file");
-        sprintf(tmp, "%s/%s",
-                call_program_and_get_last_line_of_output("pwd"),
-                MONDO_CFG_FILE_STUB);
-        sprintf(command, "cp -f %s %s", tmp, cfg_file);
+        mr_asprintf(tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
+        mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
         if (strcmp(tmp, cfg_file)
@@ -2343 +2209 @@
             log_msg(1, "... and I moved it successfully to %s", cfg_file);
         }
-        sprintf(command, "cp -f %s/%s %s",
-            call_program_and_get_last_line_of_output("pwd"),
-            MOUNTLIST_FNAME_STUB, mountlist_file);
+        mr_free(command);
+
+        mr_asprintf(command, "cp -f %s/%s %s", call_program_and_get_last_line_of_output("pwd"), MOUNTLIST_FNAME_STUB, mountlist_file);
         log_it("%s",command);
         if (extract_mountlist_stub) {
@@ -2353 +2219 @@
             } else {
                 log_msg(1, "Got mountlist too");
-                sprintf(command, "cp -f %s %s", mountlist_file,
-                        g_mountlist_fname);
+                mr_free(command);
+                mr_asprintf(command, "cp -f %s %s", mountlist_file, g_mountlist_fname);
                 if (run_program_and_log_output(command, 1)) {
                     log_msg(1, "Failed to copy mountlist to /tmp");
                 } else {
                     log_msg(1, "Copied mountlist to /tmp as well OK");
-                    sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+                    mr_free(command);
+                    mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
                     run_program_and_log_output(command, 1);
                 }
             }
         }
-    }
+        mr_free(command);
+        mr_free(tmp);
+    }
+
     run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
     if (!does_file_exist(cfg_file)) {
@@ -2381 +2251 @@
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {
-            sprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB,
-                    bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+            mr_asprintf(command, "cp -f %s %s/%s", MOUNTLIST_FNAME_STUB, bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
             run_program_and_log_output(command, FALSE);
-        }
-    }
-
-    sprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+            mr_free(command);
+        }
+    }
+
+    mr_asprintf(command, "cp -f %s /%s", cfg_file, MONDO_CFG_FILE_STUB);
+    mr_free(cfg_file);
+
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     if (extract_mountlist_stub) {
-        sprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
+        mr_asprintf(command, "cp -f %s /%s", mountlist_file, MOUNTLIST_FNAME_STUB);
         run_program_and_log_output(command, FALSE);
-    }
-    sprintf(command, "cp -f etc/raidtab /etc/");
+        mr_free(command);
+    }
+    mr_free(mountlist_file);
+
+    mr_asprintf(command, "cp -f etc/raidtab /etc/");
     run_program_and_log_output(command, FALSE);
+    mr_free(command);
+
     if (extract_i_want_my_lvm) {
-        sprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
+        mr_asprintf(command, "cp -f %s /tmp/",IWANTMYLVM_STUB);
         run_program_and_log_output(command, FALSE);
+        mr_free(command);
     }
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(device);
-    paranoid_free(command);
-    paranoid_free(tmp);
-    paranoid_free(cfg_file);
-    paranoid_free(mounted_cfgf_path);
-    paranoid_free(mountpt);
-    paranoid_free(ramdisk_fname);
-    paranoid_free(mountlist_file);
     return (retval);
 }
@@ -2416 +2288 @@
 
 /* @} - end restoreUtilityGroup */
-
-
-/***************************************************************************
- * F@                                                                      *
- * () -- Hugo Rabson                                  *
- *                                                                         *
- * Purpose:                                                                *
- *                                                                         *
- * Called by:                                                              *
- * Params:    -                      -                                     *
- * Returns:   0=success; nonzero=failure                                   *
- ***************************************************************************/
-
-
 
 void wait_until_software_raids_are_prepped(char *mdstat_file, int wait_for_percentage)
@@ -2436 +2294 @@
     int unfinished_mdstat_devices = 9999;
     int i = 0;
-    char *screen_message;
-
-    malloc_string(screen_message);
+    char *screen_message = NULL;
+
     raidlist = malloc(sizeof(struct raidlist_itself));
 
@@ -2458 +2315 @@
                 }
                 log_msg(1,"Sync'ing %s (i=%d)", raidlist->el[i].raid_device, i);
-                sprintf(screen_message, "Sync'ing %s",
-                        raidlist->el[i].raid_device);
+                mr_asprintf(screen_message, "Sync'ing %s", raidlist->el[i].raid_device);
                 open_evalcall_form(screen_message);
+                mr_free(screen_message);
+
                 while (raidlist->el[i].progress < wait_for_percentage) {
                     log_msg(1,"Percentage sync'ed: %d", raidlist->el[i].progress);
@@ -2474 +2332 @@
         }
     }
-    paranoid_free(screen_message);
     paranoid_free(raidlist);
 }
-
-

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -253 +253 @@
               struct raidlist_itself *raidlist)
 {
-    char c, *tmp;
+    char c;
+    char *tmp = NULL;
     int retval = 0;
 
@@ -260 +261 @@
     assert(mountlist != NULL);
     assert(raidlist != NULL);
-    malloc_string(tmp);
     log_it("pre wrm");
     c = which_restore_mode();
@@ -274 +274 @@
         }
         if (g_ISO_restore_mode) {
-            sprintf(tmp, "umount -d %s", bkpinfo->isodir);
+            mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
         paranoid_MR_finish(0);
@@ -284 +285 @@
     if (bkpinfo->backup_media_type == iso) {
         if (iso_fiddly_bits((c == 'N') ? TRUE : FALSE)) {
-            log_msg(2, "catchall_mode --- iso_fiddly_bits returned w/ error");
+            log_msg(2,
+                    "catchall_mode --- iso_fiddly_bits returned w/ error");
             return (1);
         } else {
@@ -301 +303 @@
         retval += compare_mode(mountlist, raidlist);
     }
-    paranoid_free(tmp);
     return (retval);
 }
@@ -418 +419 @@
  * @return 0 for success, or the number of errors encountered.
  */
-int
-interactive_mode(struct mountlist_itself *mountlist,
-                 struct raidlist_itself *raidlist)
+int interactive_mode(struct mountlist_itself *mountlist, struct raidlist_itself *raidlist)
 {
     int retval = 0;
@@ -432 +431 @@
   /** needs malloc **********/
     char *tmp;
-    char *fstab_fname;
-    char *old_restpath;
+    char *p = NULL;
+    char *tmp1 = NULL;
+    char *fstab_fname = NULL;
+    char *old_restpath = NULL;
 
     struct s_node *filelist;
@@ -442 +443 @@
 
     malloc_string(tmp);
-    malloc_string(fstab_fname);
-    malloc_string(old_restpath);
     assert(bkpinfo != NULL);
     assert(mountlist != NULL);
@@ -451 +450 @@
 
     if (g_text_mode) {
-        if (!ask_me_yes_or_no
-            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
-        {
+        if (!ask_me_yes_or_no("Interactive Mode + textonly = experimental! Proceed anyway?")) {
             fatal_error("Wise move.");
         }
@@ -463 +460 @@
     log_it("Done loading config file; resizing ML");
 
-#ifdef __FreeBSD__
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
-         "noresize"))
-#else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "noresize"))
-#endif
-    {
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE);
+    if (strstr(tmp1, "noresize")) {
         log_msg(1, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
     }
+    mr_free(tmp1);
+
     for (done = FALSE; !done;) {
         log_it("About to edit mountlist");
         if (g_text_mode) {
             save_mountlist_to_disk(mountlist, g_mountlist_fname);
-            sprintf(tmp, "%s %s", find_my_editor(), g_mountlist_fname);
-            res = system(tmp);
+            mr_asprintf(tmp1, "%s %s", find_my_editor(), g_mountlist_fname);
+            res = system(tmp1);
+            mr_free(tmp1);
             load_mountlist(mountlist, g_mountlist_fname);
         } else {
@@ -571 +563 @@
     }
     /* restore */
-    if ((restore_all =
-         ask_me_yes_or_no("Do you want me to restore all of your data?")))
-    {
+    if ((restore_all = ask_me_yes_or_no("Do you want me to restore all of your data?"))) {
         log_msg(1, "Restoring all data");
         retval += restore_everything(NULL);
-    } else
-        if ((restore_all =
-             ask_me_yes_or_no
-             ("Do you want me to restore _some_ of your data?"))) {
-        strcpy(old_restpath, bkpinfo->restore_path);
+    } else if ((restore_all = ask_me_yes_or_no("Do you want me to restore _some_ of your data?"))) {
+        mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
         for (done = FALSE; !done;) {
             unlink("/tmp/filelist.full");
@@ -590 +577 @@
               gotos_suck:
                 strcpy(tmp, old_restpath);
-// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
+                // (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
                 if (popup_and_get_string
                     ("Restore path", "Restore files to where?", tmp,
@@ -608 +595 @@
                     free_filelist(filelist);
                 }
-                if (!ask_me_yes_or_no
-                    ("Restore another subset of your backup?")) {
+                if (!ask_me_yes_or_no("Restore another subset of your backup?")) {
                     done = TRUE;
                 }
@@ -616 +602 @@
             }
         }
-        strcpy(old_restpath, bkpinfo->restore_path);
-    } else {
-        mvaddstr_and_log_it(g_currentY++,
-                            0,
-                            "User opted not to restore any data.                                  ");
+        mr_free(old_restpath);
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 0, "User opted not to restore any data.                                  ");
     }
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++,
-                            0,
-                            "Errors occurred during the restore phase.            ");
+        mvaddstr_and_log_it(g_currentY++, 0, "Errors occurred during the restore phase.            ");
     }
 
@@ -647 +629 @@
                             "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
         if (does_file_exist("/tmp/fstab.new")) {
-            strcpy(fstab_fname, "/tmp/fstab.new");
+            mr_asprintf(fstab_fname, "/tmp/fstab.new");
         } else {
-            strcpy(fstab_fname, "/tmp/fstab");
-        }
-        sprintf(tmp,
-                "label-partitions-as-necessary %s < %s >> %s 2>> %s",
-                g_mountlist_fname, fstab_fname, MONDO_LOGFILE,
-                MONDO_LOGFILE);
-        res = system(tmp);
+            mr_asprintf(fstab_fname, "/tmp/fstab");
+        }
+        mr_asprintf(tmp1, "label-partitions-as-necessary %s < %s >> %s 2>> %s", g_mountlist_fname, fstab_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_free(fstab_fname);
+
+        res = system(tmp1);
+        mr_free(tmp1);
         if (res) {
             log_to_screen
@@ -674 +656 @@
   end_of_func:
     paranoid_free(tmp);
-    paranoid_free(fstab_fname);
-    paranoid_free(old_restpath);
     log_it("Leaving interactive_mode()");
     return (retval);
@@ -759 +739 @@
     int retval = 0;
     int res = 0;
-  /** malloc **/
-    char tmp[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *flaws_str = NULL;
 
@@ -772 +752 @@
     load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
 #ifdef __FreeBSD__
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
-         "noresize"))
+    if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "noresize"))
 #else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "noresize"))
+    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "noresize"))
 #endif
     {
@@ -812 +788 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-#ifdef __FreeBSD__
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /tmp/cmdline"), "nopart"))
-#else
-            if (strstr
-                (call_program_and_get_last_line_of_output
-                 ("cat /proc/cmdline"), "nopart"))
-#endif
-            {
-                log_msg(2,
-                        "Not partitioning drives due to 'nopart' option.");
+            mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
+            if (strstr(tmp1, "nopart")) {
+                log_msg(2, "Not partitioning drives due to 'nopart' option.");
                 res = 0;
             } else {
                 res = partition_everything(mountlist);
                 if (res) {
-                    log_to_screen
-                        ("Warning. Errors occurred during partitioning.");
+                    log_to_screen("Warning. Errors occurred during partitioning.");
                     res = 0;
                 }
             }
+            mr_free(tmp1);
+
             retval += res;
             if (!res) {
                 log_to_screen("Preparing to format your disk(s)");
                 sleep(1);
-                paranoid_system("sync");
+                sync();
                 log_to_screen("Please wait. This may take a few minutes.");
                 res += format_everything(mountlist, FALSE, raidlist);
@@ -880 +848 @@
                         "Using tune2fs/tune4fs to identify your ext2,3,4 partitions");
 
-    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", g_mountlist_fname, MONDO_LOGFILE, MONDO_LOGFILE);
+    mr_asprintf(tmp1, "label-partitions-as-necessary %s < /tmp/fstab >> %s 2>> %s", MINDI_CACHE"/mountlist.txt", MONDO_LOGFILE, MONDO_LOGFILE);
     res = run_program_and_log_output(tmp, TRUE);
+    mr_free(tmp1);
     if (res) {
         log_to_screen("label-partitions-as-necessary returned an error");
@@ -891 +860 @@
 
   after_the_nuke:
+    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat " CMDLINE,TRUE));
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
-    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE")) {
-        log_to_screen
-            ("PC was restored successfully. Thank you for using Mondo Rescue.");
-        log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
-    } else {
-        strcpy(tmp,"Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
-            popup_and_OK(tmp);
-        log_to_screen
-          ("Mondo has restored your system. Please wait for the command prompt.");
-        log_to_screen
-            ("Then remove the backup media and reboot.");
-        log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
-    }
+    } else if (strstr(tmp1, "RESTORE")) {
+        log_to_screen("PC was restored successfully. Thank you for using Mondo Rescue.");
+        log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
+    } else {
+        mr_asprintf(tmp,"%s","Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
+        popup_and_OK(tmp);
+        mr_free(tmp);
+        log_to_screen("Mondo has restored your system. Please wait for the command prompt.");
+        log_to_screen("Then remove the backup media and reboot.");
+        log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
+    }
+    mr_free(tmp1);
+
     g_I_have_just_nuked = TRUE;
     return (retval);
@@ -928 +896 @@
     int retval = 0;
 
-  /** malloc **/
-    char *old_restpath;
+    char *old_restpath = NULL;
 
     struct mountlist_itself *mountlist = NULL;
-//  static
     struct raidlist_itself *raidlist = NULL;
     struct s_node *filelist = NULL;
@@ -938 +904 @@
     log_msg(1, "restore_to_live_filesystem() - starting");
     assert(bkpinfo != NULL);
-    malloc_string(old_restpath);
     mountlist = malloc(sizeof(struct mountlist_itself));
     raidlist = malloc(sizeof(struct raidlist_itself));
@@ -974 +939 @@
     if (!g_restoring_live_from_netfs && (filelist = process_filelist_and_biggielist())) {
         save_filelist(filelist, "/tmp/selected-files.txt");
-        strcpy(old_restpath, bkpinfo->restore_path);
+        mr_asprintf(old_restpath, "%s", bkpinfo->restore_path);
         if (popup_and_get_string("Restore path",
                                  "Restore files to where? )",
@@ -986 +951 @@
         }
         strcpy(bkpinfo->restore_path, old_restpath);
+        mr_free(old_restpath);
     } else {
         if (filelist != NULL) {
@@ -1004 +970 @@
         eject_device(bkpinfo->media_device);
     }
-    paranoid_free(old_restpath);
     free(mountlist);
     free(raidlist);
@@ -1043 +1008 @@
 
   /** malloc ***/
-    char *checksum, *outfile_fname, *tmp, *bzip2_command,
-        *ntfsprog_command, *suffix, *sz_devfile;
+    char *checksum = NULL;
+    char *outfile_fname = NULL;
+    char *tmp = NULL;
+    char *bzip2_command = NULL;
+    char *suffix = NULL;
+    char *sz_devfile = NULL;
     char *bigblk;
     char *mds = NULL;
@@ -1051 +1020 @@
     long sliceno;
     long siz;
-    char ntfsprog_fifo[MAX_STR_LEN];
+    char *ntfsprog_fifo = NULL;
     char *file_to_openout = NULL;
     struct s_filename_and_lstat_info biggiestruct;
@@ -1059 +1028 @@
     int res = 0;
     int old_loglevel;
-    char sz_msg[MAX_STR_LEN];
     struct s_node *node;
 
@@ -1065 +1033 @@
     ubuf = &the_utime_buf;
     assert(bkpinfo != NULL);
-
-    malloc_string(checksum);
-    malloc_string(outfile_fname);
-    malloc_string(tmp);
-    malloc_string(bzip2_command);
-    malloc_string(ntfsprog_command);
-    malloc_string(suffix);
-    malloc_string(sz_devfile);
 
     pathname_of_last_file_restored[0] = '\0';
@@ -1092 +1052 @@
     paranoid_fclose(fin);
 
-    strcpy(checksum, biggiestruct.checksum);
-
+    mr_asprintf(checksum, "%s", biggiestruct.checksum);
     if (!checksum[0]) {
-        sprintf(tmp, "Warning - bigfile %ld does not have a checksum",
-                bigfileno + 1);
-        log_msg(3, tmp);
-    }
+        log_msg(3, "Warning - bigfile %ld does not have a checksum", bigfileno + 1);
+    }
+    mr_free(checksum);
 
     if (!strncmp(biggiestruct.filename, "/dev/", 5))    // Whether NTFS or not :)
     {
-        strcpy(outfile_fname, biggiestruct.filename);
-    } else {
-        sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
-                biggiestruct.filename);
+        mr_asprintf(outfile_fname, "%s", biggiestruct.filename);
+    } else {
+        mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, biggiestruct.filename);
     }
 
@@ -1112 +1069 @@
         node = find_string_at_node(filelist, biggiestruct.filename);
         if (!node) {
-            log_msg(0, "Skipping %s (name isn't in filelist)",
-                    biggiestruct.filename);
+            log_msg(0, "Skipping %s (name isn't in filelist)", biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
             return (0);
         } else if (!(node->selected)) {
-            log_msg(1, "Skipping %s (name isn't in biggielist subset)",
-                    biggiestruct.filename);
+            log_msg(1, "Skipping %s (name isn't in biggielist subset)", biggiestruct.filename);
             pathname_of_last_file_restored[0] = '\0';
             return (0);
         }
     }
+
     /* otherwise, continue */
-
     log_msg(1, "DEFINITELY restoring %s", biggiestruct.filename);
     if (biggiestruct.use_ntfsprog) {
         if (strncmp(biggiestruct.filename, "/dev/", 5)) {
-            log_msg(1,
-                    "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
+            log_msg(1, "I was in error when I set biggiestruct.use_ntfsprog to TRUE.");
             log_msg(1, "%s isn't even in /dev", biggiestruct.filename);
             biggiestruct.use_ntfsprog = FALSE;
@@ -1136 +1090 @@
 
     if (biggiestruct.use_ntfsprog)  // if it's an NTFS device
-//  if (!strncmp ( biggiestruct.filename, "/dev/", 5))
     {
         g_loglevel = 4;
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
-                "Calling ntfsclone in background because %s is an NTFS /dev entry",
-                outfile_fname);
-        sprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768),
-                (int) (random() % 32768));
+        log_msg(2, "Calling ntfsclone in background because %s is an NTFS /dev entry", outfile_fname);
+        mr_asprintf(sz_devfile, "/tmp/%d.%d.000", (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
-        strcpy(ntfsprog_fifo, sz_devfile);
+        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
+        mr_free(sz_devfile);
         file_to_openout = ntfsprog_fifo;
         switch (pid = fork()) {
@@ -1152 +1103 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
-                    "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
-                    biggiestruct.filename, ntfsprog_fifo);
-            res =
-                feed_outfrom_ntfsprog(biggiestruct.filename,
-                                       ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", biggiestruct.filename, ntfsprog_fifo);
+            res = feed_outfrom_ntfsprog(biggiestruct.filename, ntfsprog_fifo);
+            mr_free(ntfsprog_fifo);
             exit(res);
             break;
         default:
-            log_msg(3,
-                    "feed_into_ntfsprog() called in background --- pid=%ld",
-                    (long int) (pid));
-        }
+            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+        }
+        mr_free(ntfsprog_fifo);
     } else {
         use_ntfsprog_hack = FALSE;
-        ntfsprog_fifo[0] = '\0';
         file_to_openout = outfile_fname;
         if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
@@ -1176 +1121 @@
     }
 
-    sprintf(tmp, "Reassembling big file %ld (%s)", bigfileno + 1,
-            outfile_fname);
-    log_msg(2, tmp);
+    log_msg(2, "Reassembling big file %ld (%s)", bigfileno + 1, outfile_fname);
 
     /*
@@ -1186 +1129 @@
      */
 
-    strncpy(pathname_of_last_file_restored, biggiestruct.filename,
-            MAX_STR_LEN - 1);
+    strncpy(pathname_of_last_file_restored, biggiestruct.filename, MAX_STR_LEN - 1);
     pathname_of_last_file_restored[MAX_STR_LEN - 1] = '\0';
 
@@ -1198 +1140 @@
 
     for (sliceno = 1, finished = FALSE; !finished;) {
-        if (!does_file_exist
-            (slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))
-            &&
-            !does_file_exist(slice_fname
-                             (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))
-            &&
-            !does_file_exist(slice_fname
-                             (bigfileno, sliceno, ARCHIVES_PATH, "gz"))
-            &&
-            !does_file_exist(slice_fname
-                             (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-            log_msg(3,
-                    "Cannot find a data slice or terminator slice on CD %d",
-                    g_current_media_number);
+        if (!does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+            log_msg(3, "Cannot find a data slice or terminator slice on CD %d", g_current_media_number);
             g_current_media_number++;
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            sprintf(tmp,
-                    "Asking for %s #%d so that I may read slice #%ld\n", mds, 
-                    g_current_media_number, sliceno);
-            log_msg(2, tmp);
-            sprintf(tmp, "Restoring from %s #%d", mds, g_current_media_number);
+            log_msg(2, "Asking for %s #%d so that I may read slice #%ld\n", mds, g_current_media_number, sliceno);
             mr_free(mds);
 
-            log_to_screen(tmp);
+            log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
+
             insist_on_this_cd_number(g_current_media_number);
             log_to_screen("Continuing to restore.");
         } else {
-            strcpy(tmp,
-                   slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
+            mr_asprintf(tmp, "%s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""));
             if (does_file_exist(tmp) && length_of_file(tmp) == 0) {
-                log_msg(2,
-                        "End of bigfile # %ld (slice %ld is the terminator)",
-                        bigfileno + 1, sliceno);
+                log_msg(2, "End of bigfile # %ld (slice %ld is the terminator)", bigfileno + 1, sliceno);
                 finished = TRUE;
+                mr_free(tmp);
                 continue;
             } else {
-                if (does_file_exist
-                    (slice_fname
-                     (bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
-                    strcpy(bzip2_command, "lzop");
-                    strcpy(suffix, "lzo");
+                if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo"))) {
+                    mr_asprintf(bzip2_command, "lzop");
+                    mr_asprintf(suffix, "lzo");
                 } else
-                    if (does_file_exist
-                        (slice_fname
-                         (bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
-                    strcpy(bzip2_command, "gzip");
-                    strcpy(suffix, "gz");
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
+                    mr_asprintf(bzip2_command, "gzip");
+                    mr_asprintf(suffix, "gz");
                 } else
-                    if (does_file_exist
-                        (slice_fname
-                         (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
-                    strcpy(bzip2_command, "bzip2");
-                    strcpy(suffix, "bz2");
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma"))) {
+                    mr_asprintf(bzip2_command, "lzma");
+                    mr_asprintf(suffix, "lzma");
                 } else
-                    if (does_file_exist
-                        (slice_fname
-                         (bigfileno, sliceno, ARCHIVES_PATH, ""))) {
-                    strcpy(bzip2_command, "");
-                    strcpy(suffix, "");
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
+                    mr_asprintf(bzip2_command, "bzip2");
+                    mr_asprintf(suffix, "bz2");
+                } else
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, ""))) {
+                    mr_asprintf(bzip2_command, "");
+                    mr_asprintf(suffix, "");
                 } else {
                     log_to_screen("OK, that's pretty fsck0red...");
+                    mr_free(tmp);
                     return (1);
                 }
             }
-            if (bzip2_command[0] != '\0') {
-                sprintf(bzip2_command + strlen(bzip2_command),
-                        " -dc %s 2>> %s",
-                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
-                                    suffix), MONDO_LOGFILE);
+            mr_free(tmp);
+            if (bzip2_command != NULL) {
+                mr_strcat(bzip2_command, " -dc %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
             } else {
-                sprintf(bzip2_command, "cat %s 2>> %s",
-                        slice_fname(bigfileno, sliceno, ARCHIVES_PATH,
-                                    suffix), MONDO_LOGFILE);
-            }
+                mr_asprintf(bzip2_command, "cat %s 2>> %s", slice_fname(bigfileno, sliceno, ARCHIVES_PATH, suffix), MONDO_LOGFILE);
+            }
+            mr_free(suffix);
+
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            sprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds,
-                    g_current_media_number, bigfileno + 1, sliceno);
+            mr_asprintf(tmp, "Working on %s #%d, file #%ld, slice #%ld    ", mds, g_current_media_number, bigfileno + 1, sliceno);
             mr_free(mds);
             log_msg(2, tmp);
@@ -1284 +1207 @@
                 update_progress_form(tmp);
             }
+            mr_free(tmp);
+
             if (!(fbzip2 = popen(bzip2_command, "r"))) {
                 fatal_error("Can't run popen command");
             }
+            mr_free(bzip2_command);
+
             while (!feof(fbzip2)) {
                 siz = fread(bigblk, 1, TAPE_BLOCK_SIZE, fbzip2);
                 if (siz > 0) {
-                    sprintf(sz_msg, "Read %ld from fbzip2", siz);
                     siz = fwrite(bigblk, 1, siz, fout);
-                    sprintf(sz_msg + strlen(sz_msg),
-                            "; written %ld to fout", siz);
-//        log_msg(2. sz_msg);
                 }
             }
@@ -1304 +1227 @@
         }
     }
-/*
-  memset(bigblk, TAPE_BLOCK_SIZE, 1); // This all looks very fishy...
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-  fwrite( bigblk, 1, TAPE_BLOCK_SIZE, fout);
-*/
     paranoid_fclose(fout);
     g_loglevel = old_loglevel;
@@ -1316 +1232 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        sprintf(tmp,
-                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        mr_asprintf(tmp, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
         while (system(tmp) == 0) {
             sleep(1);
         }
+        mr_free(tmp);
         log_it("OK, ntfsclone has really finished");
     }
 
     if (strcmp(outfile_fname, "/dev/null")) {
-        if (chown(outfile_fname, biggiestruct.properties.st_uid,
-              biggiestruct.properties.st_gid)) {
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
             // FIXME
         }
@@ -1334 +1249 @@
         utime(outfile_fname, ubuf);
     }
+    mr_free(outfile_fname);
     paranoid_free(bigblk);
-    paranoid_free(checksum);
-    paranoid_free(outfile_fname);
-    paranoid_free(tmp);
-    paranoid_free(bzip2_command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(suffix);
-    paranoid_free(sz_devfile);
 
     return (retval);
@@ -1376 +1285 @@
 
   /** mallocs ********/
-    char *tmp;
-    char *command;
-    char *outfile_fname;
-    char *ntfsprog_command;
-    char *sz_devfile;
-    char *ntfsprog_fifo;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *command = NULL;
+    char *outfile_fname = NULL;
+    char *sz_devfile = NULL;
+    char *ntfsprog_fifo = NULL;
     char *file_to_openout = NULL;
 
@@ -1400 +1309 @@
 
     malloc_string(tmp);
-    malloc_string(ntfsprog_fifo);
-    malloc_string(outfile_fname);
-    malloc_string(command);
-    malloc_string(sz_devfile);
-    malloc_string(ntfsprog_command);
     old_loglevel = g_loglevel;
     assert(bkpinfo != NULL);
@@ -1455 +1359 @@
     if (use_ntfsprog) {
         g_loglevel = 4;
-        strcpy(outfile_fname, orig_bf_fname);
+        mr_asprintf(outfile_fname, "%s", orig_bf_fname);
         use_ntfsprog_hack = TRUE;
-        log_msg(2,
-                "Calling ntfsclone in background because %s is a /dev entry",
-                outfile_fname);
-        sprintf(sz_devfile, "%s/%d.%d.000", 
-                bkpinfo->tmpdir,
-                (int) (random() % 32768),
-                (int) (random() % 32768));
+        log_msg(2, "Calling ntfsclone in background because %s is a /dev entry", outfile_fname);
+        mr_asprintf(sz_devfile, "%s/%d.%d.000", bkpinfo->tmpdir, (int) (random() % 32768), (int) (random() % 32768));
         mkfifo(sz_devfile, 0x770);
-        strcpy(ntfsprog_fifo, sz_devfile);
+        mr_asprintf(ntfsprog_fifo, "%s", sz_devfile);
+        mr_free(sz_devfile);
+
         file_to_openout = ntfsprog_fifo;
         switch (pid = fork()) {
@@ -1471 +1372 @@
             fatal_error("Fork failure");
         case 0:
-            log_msg(3,
-                    "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)",
-                    outfile_fname, ntfsprog_fifo);
-            res =
-                feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
-//          log_msg(3, "CHILD - fip - exiting");
+            log_msg(3, "CHILD - fip - calling feed_outfrom_ntfsprog(%s, %s)", outfile_fname, ntfsprog_fifo);
+            res = feed_outfrom_ntfsprog(outfile_fname, ntfsprog_fifo);
+            mr_free(ntfsprog_fifo);
             exit(res);
             break;
         default:
-            log_msg(3,
-                    "feed_into_ntfsprog() called in background --- pid=%ld",
-                    (long int) (pid));
-        }
-    } else {
-        if (!strncmp(orig_bf_fname, "/dev/", 5))    // non-NTFS partition
-        {
-            strcpy(outfile_fname, orig_bf_fname);
-        } else                  // biggiefile
-        {
-            sprintf(outfile_fname, "%s/%s", bkpinfo->restore_path,
-                    orig_bf_fname);
+            log_msg(3, "feed_into_ntfsprog() called in background --- pid=%ld", (long int) (pid));
+        }
+        mr_free(ntfsprog_fifo);
+    } else {
+        if (!strncmp(orig_bf_fname, "/dev/", 5))    {
+            // non-NTFS partition
+            mr_asprintf(outfile_fname, "%s", orig_bf_fname);
+        } else {
+            // biggiefile
+            mr_asprintf(outfile_fname, "%s/%s", bkpinfo->restore_path, orig_bf_fname);
         }
         use_ntfsprog_hack = FALSE;
-        ntfsprog_fifo[0] = '\0';
         file_to_openout = outfile_fname;
         if (!does_file_exist(outfile_fname))    // yes, it looks weird with the '!' but it's correct that way
@@ -1500 +1395 @@
             make_hole_for_file(outfile_fname);
         }
-        sprintf(tmp, "Reassembling big file %ld (%s)",
-                biggiefile_number + 1, orig_bf_fname);
-        log_msg(2, tmp);
+        log_msg(2, "Reassembling big file %ld (%s)", biggiefile_number + 1, orig_bf_fname);
     }
 
     if (dummy_restore) {
-        sprintf(outfile_fname, "/dev/null");
+        mr_free(outfile_fname);
+        mr_asprintf(outfile_fname, "/dev/null");
     }
 
     if (!bkpinfo->zip_exe[0]) {
-        sprintf(command, "cat > \"%s\"", file_to_openout);
-    } else {
-        sprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe,
-                file_to_openout, MONDO_LOGFILE);
+        mr_asprintf(command, "cat > \"%s\"", file_to_openout);
+    } else {
+        mr_asprintf(command, "%s -dc > \"%s\" 2>> %s", bkpinfo->zip_exe, file_to_openout, MONDO_LOGFILE);
         if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
             /* Ignore SIGPIPE for gzip as it causes errors on big files
-             * Cf: http://trac.mondorescue.org/ticket/244
-             */
+             * Cf: http://trac.mondorescue.org/ticket/244 */
             signal(SIGPIPE,SIG_IGN);
         }
     }
-    sprintf(tmp, "Pipe command = '%s'", command);
-    log_msg(3, tmp);
+    log_msg(3, "Pipe command = '%s'", command);
 
     /* restore biggiefile, one slice at a time */
@@ -1528 +1419 @@
         fatal_error("Cannot pipe out");
     }
+    mr_free(command);
+
     for (res = read_header_block_from_stream(&slice_siz, tmp, &ctrl_chr);
          ctrl_chr != BLK_STOP_A_BIGGIE;
@@ -1534 +1427 @@
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        sprintf(tmp, "Working on file #%ld, slice #%ld    ",
-                biggiefile_number + 1, current_slice_number);
-        log_msg(2, tmp);
+        log_msg(2, "Working on file #%ld, slice #%ld    ", biggiefile_number + 1, current_slice_number);
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -1575 +1466 @@
     if (bkpinfo->zip_exe[0]) {
         if (strcmp(bkpinfo->zip_exe, "gzip") == 0) {
-            /* Re-enable SIGPIPE for gzip
-             */
+            /* Re-enable SIGPIPE for gzip */
             signal(SIGPIPE, terminate_daemon);
         }
@@ -1586 +1476 @@
     if (use_ntfsprog_hack) {
         log_msg(3, "Waiting for ntfsclone to finish");
-        sprintf(tmp,
-                " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
-        while (system(tmp) == 0) {
+        mr_asprintf(tmp1, " ps | grep \" ntfsclone \" | grep -v grep > /dev/null 2> /dev/null");
+        while (system(tmp1) == 0) {
             sleep(1);
         }
+        mr_free(tmp1);
         log_msg(3, "OK, ntfsclone has really finished");
     }
@@ -1598 +1488 @@
     if (strcmp(outfile_fname, "/dev/null")) {
         chmod(outfile_fname, biggiestruct.properties.st_mode);
-        if (chown(outfile_fname, biggiestruct.properties.st_uid,
-              biggiestruct.properties.st_gid)) {
+        if (chown(outfile_fname, biggiestruct.properties.st_uid, biggiestruct.properties.st_gid)) {
             // FIXME
         }
@@ -1606 +1495 @@
         utime(outfile_fname, ubuf);
     }
+    mr_free(outfile_fname);
 
     paranoid_free(tmp);
-    paranoid_free(outfile_fname);
-    paranoid_free(command);
-    paranoid_free(ntfsprog_command);
-    paranoid_free(sz_devfile);
-    paranoid_free(ntfsprog_fifo);
     g_loglevel = old_loglevel;
     return (retval);
@@ -1645 +1530 @@
   /** malloc **/
     char *command = NULL;
-    char *tmp;
-    char *filelist_name;
-    char *filelist_subset_fname;
-    char *executable;
-    char *temp_log;
-    char screen_message[100];
+    char *tmp = NULL;
+    char *filelist_name = NULL;
+    char *filelist_subset_fname = NULL;
+    char *executable = NULL;
+    char *temp_log = NULL;
     long matches = 0;
     bool use_star;
-    char *xattr_fname;
-    char *acl_fname;
-//  char files_to_restore_this_time_fname[MAX_STR_LEN];
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
 
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    malloc_string(tmp);
-    malloc_string(filelist_name);
-    malloc_string(filelist_subset_fname);
-    malloc_string(executable);
-    malloc_string(temp_log);
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
 
     log_msg(5, "Entering");
-    filelist_subset_fname[0] = '\0';
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
-//  sprintf(files_to_restore_this_time_fname, "/tmp/ftrttf.%d.%d", (int)getpid(), (int)random());
     mr_asprintf(command, "mkdir -p %s/tmp", MNT_RESTORING);
     run_program_and_log_output(command, 9);
     paranoid_free(command);
 
-    sprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768),
-            (int) (random() % 32768));
-
-    sprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld",
-            current_tarball_number);
+    mr_asprintf(filelist_name, MNT_CDROM "/archives/filelist.%ld", current_tarball_number);
     if (length_of_file(filelist_name) <= 2) {
-        log_msg(2, "There are _zero_ files in filelist '%s'",
-                filelist_name);
-        log_msg(2,
-                "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
-        log_msg(2,
-                "but it's non-critical. It's cosmetic. Don't worry about it.");
+        log_msg(2, "There are _zero_ files in filelist '%s'", filelist_name);
+        log_msg(2, "This is a bit silly (ask dev-team to fix mondo_makefilelist, please)");
+        log_msg(2, "but it's non-critical. It's cosmetic. Don't worry about it.");
         retval = 0;
-        goto leave_sub;
-    }
-    if (count_lines_in_file(filelist_name) <= 0
-        || length_of_file(tarball_fname) <= 0) {
+        mr_free(filelist_name);
+        log_msg(5, "Leaving");
+        return(0);
+    }
+    if (count_lines_in_file(filelist_name) <= 0 || length_of_file(tarball_fname) <= 0) {
         log_msg(3, "length_of_file(%s) = %llu", tarball_fname, length_of_file(tarball_fname));
         log_msg(3, "count_lines_in_file(%s) = %llu", tarball_fname, count_lines_in_file(tarball_fname));
-        sprintf(tmp, "Unable to restore fileset #%ld (CD I/O error)",
-                current_tarball_number);
-        log_to_screen(tmp);
-        retval = 1;
-        goto leave_sub;
+        log_to_screen("Unable to restore fileset #%ld (CD I/O error)", current_tarball_number);
+        mr_free(filelist_name);
+        log_msg(5, "Leaving");
+        return(1);
     }
 
     if (filelist) {
-        sprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp",
-                current_tarball_number);
+        mr_asprintf(filelist_subset_fname, "/tmp/filelist-subset-%ld.tmp", current_tarball_number);
         if ((matches =
              save_filelist_entries_in_common(filelist_name, filelist,
                                              filelist_subset_fname,
-                                             use_star))
-            <= 0) {
-            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(1, tmp);
+                                             use_star)) <= 0) {
+            log_msg(1, "Skipping fileset %ld", current_tarball_number);
         } else {
-            log_msg(3, "Saved fileset %ld's subset to %s",
-                    current_tarball_number, filelist_subset_fname);
-        }
-        sprintf(screen_message, "Tarball #%ld --- %ld matches",
-                current_tarball_number, matches);
-        log_to_screen(screen_message);
-    } else {
-        filelist_subset_fname[0] = '\0';
-    }
+            log_msg(3, "Saved fileset %ld's subset to %s", current_tarball_number, filelist_subset_fname);
+        }
+        log_to_screen("Tarball #%ld --- %ld matches", current_tarball_number, matches);
+    }
+    mr_free(filelist_name);
 
     if (filelist == NULL || matches > 0) {
         if (g_getfattr) {
-            sprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ,
-                MNT_CDROM "/archives", current_tarball_number);
+            mr_asprintf(xattr_fname, XATTR_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (g_getfacl) {
-            sprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives",
-                current_tarball_number);
+            mr_asprintf(acl_fname, ACL_LIST_FNAME_RAW_SZ, MNT_CDROM "/archives", current_tarball_number);
         }
         if (strstr(tarball_fname, ".bz2")) {
-            strcpy(executable, "bzip2");
+            mr_asprintf(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".lzma")) {
+            mr_asprintf(executable, "lzma");
         } else if (strstr(tarball_fname, ".gz")) {
-            strcpy(executable, "gzip");
+            mr_asprintf(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
-            strcpy(executable, "lzop");
-        } else {
-            executable[0] = '\0';
-        }
-        if (executable[0]) {
-            sprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
-            if (run_program_and_log_output(tmp, FALSE)) {
-                log_to_screen
-                    ("(compare_a_tarball) Compression program %s not found - oh no!", executable);
+            mr_asprintf(executable, "lzop");
+        }
+        if (executable) {
+            mr_asprintf(tmp, "which %s > /dev/null 2> /dev/null", executable);
+            res = run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
+
+            if (res) {
+                log_to_screen("(compare_a_tarball) Compression program %s not found - oh no!", executable);
                 paranoid_MR_finish(1);
             }
-            strcpy(tmp, executable);
-            sprintf(executable, "-P %s -Z", tmp);
+            tmp = executable;
+            mr_asprintf(executable, "-P %s -Z", tmp);
+            mr_free(tmp);
         }
 #ifdef __FreeBSD__
@@ -1755 +1616 @@
 #endif
 
-//      if (strstr(tarball_fname, ".star."))
         if (use_star) {
             mr_asprintf(command, "star -x -force-remove -sparse -U " STAR_ACL_SZ " file=%s", tarball_fname);
@@ -1762 +1622 @@
             }
         } else {
-            if (filelist_subset_fname[0] != '\0') {
-                mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+            if (! executable) {
+                log_msg(2, "Mo executable, this shouldn't happen !");
             } else {
-                mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
-            }
-        }
+                if (filelist_subset_fname != NULL) {
+                    mr_asprintf(command, "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, filelist_subset_fname, tarball_fname);
+                } else {
+                    mr_asprintf(command, "afio -i -b %ld -c %ld -M 8m %s %s", TAPE_BLOCK_SIZE, BUFSIZE, executable, tarball_fname);
+                }
+            }
+        }
+        mr_free(executable);
 
 #undef BUFSIZE
+        mr_asprintf(temp_log, "/tmp/%d.%d", (int) (random() % 32768), (int) (random() % 32768));
+
         mr_strcat(command, " 2>> %s >> %s", temp_log, temp_log);
         log_msg(1, "command = '%s'", command);
@@ -1828 +1695 @@
             log_msg(2, "Fileset #%d processed OK", current_tarball_number);
         }
+        unlink(temp_log);
+        mr_free(temp_log);
     }
     if (does_file_exist("/PAUSE")) {
@@ -1834 +1703 @@
     }
     unlink(filelist_subset_fname);
-    unlink(xattr_fname);
-    unlink(acl_fname);
-    unlink(temp_log);
-
-  leave_sub:
-    paranoid_free(tmp);
-    paranoid_free(filelist_name);
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(executable);
-    paranoid_free(temp_log);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
+    mr_free(filelist_subset_fname);
+    if (g_getfattr) {
+        unlink(xattr_fname);
+        mr_free(xattr_fname);
+    }
+    if (g_getfacl) {
+        unlink(acl_fname);
+        mr_free(acl_fname);
+    }
+
     log_msg(5, "Leaving");
     return (retval);
@@ -1881 +1748 @@
 
   /** malloc add ***/
-    char *tmp;
     char *mds = NULL;
-    char *command;
-    char *afio_fname;
-    char *filelist_fname;
-    char *filelist_subset_fname;
-    char *executable;
+    char *command = NULL;
+    char *afio_fname = NULL;
+    char *filelist_fname = NULL;
+    char *filelist_subset_fname = NULL;
+    char *executable = NULL;
     long matches = 0;
     bool restore_this_fileset = FALSE;
@@ -1894 +1760 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(tarball_fname);
-    malloc_string(filelist_subset_fname);
-    malloc_string(filelist_fname);
-    malloc_string(afio_fname);
-    malloc_string(executable);
-    malloc_string(command);
-    malloc_string(tmp);
-    filelist_subset_fname[0] = '\0';
+
     /* to do it with a file... */
     use_star = (strstr(tarball_fname, ".star")) ? TRUE : FALSE;
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    sprintf(tmp,
-            "Restoring from fileset #%ld (%ld KB) on %s #%d",
+    log_msg(2, "Restoring from fileset #%ld (%ld KB) on %s #%d",
             current_tarball_number, (long) size >> 10, mds, g_current_media_number);
     mr_free(mds);
 
-    log_msg(2, tmp);
     run_program_and_log_output("mkdir -p " MNT_RESTORING "/tmp", FALSE);
 
@@ -1917 +1775 @@
    * in afio or someting; oh darn.. OK, use tmpfs :-)                         *
    ****************************************************************************/
-    filelist_fname[0] = filelist_subset_fname[0] = '\0';
-    sprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld",
-            current_tarball_number);
-    sprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir,
-            current_tarball_number);
-    sprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp",
-            bkpinfo->tmpdir, current_tarball_number);
-//  sprintf(filelist_fname, "/tmp/tmpfs/temp-filelist.%ld", current_tarball_number);
+    mr_asprintf(afio_fname, "/tmp/tmpfs/archive.tmp.%ld", current_tarball_number);
+    mr_asprintf(filelist_fname, "%s/filelist.%ld", bkpinfo->tmpdir, current_tarball_number);
+    mr_asprintf(filelist_subset_fname, "%s/filelist-subset-%ld.tmp", bkpinfo->tmpdir, current_tarball_number);
+
     res = read_file_from_stream_to_file(afio_fname, size);
     if (strstr(tarball_fname, ".star")) {
@@ -1933 +1787 @@
     }
     if (bkpinfo->compression_level == 0) {
-        executable[0] = '\0';
+        mr_asprintf(executable, "%s", "");
     } else {
         if (bkpinfo->use_star) {
-            strcpy(executable, " -bz");
+            mr_asprintf(executable, "%s", " -bz");
         } else {
-            sprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
+            mr_asprintf(executable, "-P %s -Z", bkpinfo->zip_exe);
         }
     }
@@ -1949 +1803 @@
         if (strstr(tarball_fname, ".star.")) {
             use_star = TRUE;
-            sprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
+            mr_asprintf(command, "star -sparse -t file=%s %s", afio_fname, executable);
         } else {
             use_star = FALSE;
-            sprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE,
-                    executable, afio_fname);
-        }
-        sprintf(command + strlen(command), " > %s 2>> %s", filelist_fname,
-                MONDO_LOGFILE);
+            mr_asprintf(command, "afio -t -M 8m -b %ld %s %s", TAPE_BLOCK_SIZE, executable, afio_fname);
+        }
+        mr_strcat(command, " > %s 2>> %s", filelist_fname, MONDO_LOGFILE);
         log_msg(1, "command = %s", command);
         if (system(command)) {
             log_msg(4, "Warning - error occurred while retrieving TOC");
         }
+        mr_free(command);
+
         if ((matches =
              save_filelist_entries_in_common(filelist_fname, filelist,
@@ -1970 +1824 @@
                         current_tarball_number);
             }
-            sprintf(tmp, "Skipping fileset %ld", current_tarball_number);
-            log_msg(2, tmp);
+            log_msg(2, "Skipping fileset %ld", current_tarball_number);
             restore_this_fileset = FALSE;
         } else {
@@ -1982 +1835 @@
 
 // Concoct the call to star/afio to restore files
-    if (strstr(tarball_fname, ".star."))    // star
-    {
-        sprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
+    if (strstr(tarball_fname, ".star.")) {
+        // star
+        mr_asprintf(command, "star -sparse -x file=%s %s", afio_fname, executable);
         if (filelist) {
-            sprintf(command + strlen(command), " list=%s",
-                    filelist_subset_fname);
-        }
-    } else                      // afio
-    {
-        sprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE,
-                executable);
+            mr_strcat(command, " list=%s", filelist_subset_fname);
+        }
+    } else {
+        // afio
+        mr_asprintf(command, "afio -i -M 8m -b %ld %s", TAPE_BLOCK_SIZE, executable);
         if (filelist) {
-            sprintf(command + strlen(command), " -w %s",
-                    filelist_subset_fname);
-        }
-        sprintf(command + strlen(command), " %s", afio_fname);
-    }
-    sprintf(command + strlen(command), " 2>> %s", MONDO_LOGFILE);
+            mr_strcat(command, " -w %s", filelist_subset_fname);
+        }
+        mr_strcat(command, " %s", afio_fname);
+    }
+    mr_strcat(command, " 2>> %s", MONDO_LOGFILE);
+    mr_free(executable);
 
 // Call if IF there are files to restore (selectively/unconditionally)
@@ -2031 +1882 @@
         log_msg(1, "NOT CALLING '%s'", command);
     }
+    mr_free(command);
 
     if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
@@ -2038 +1890 @@
 
     unlink(filelist_subset_fname);
+    mr_free(filelist_subset_fname);
     unlink(filelist_fname);
+    mr_free(filelist_fname);
     unlink(afio_fname);
-
-    paranoid_free(filelist_subset_fname);
-    paranoid_free(filelist_fname);
-    paranoid_free(afio_fname);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(afio_fname);
+
     return (retval);
 }
@@ -2065 +1915 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-restore_all_biggiefiles_from_CD(struct s_node *filelist)
-{
+int restore_all_biggiefiles_from_CD(struct s_node *filelist) {
+
     int retval = 0;
     int res = 0;
     long noof_biggiefiles, bigfileno = 0, total_slices;
   /** malloc **/
-    char *tmp;
+    char *tmp = NULL;
+    char *tmp1 = NULL;
     char *mds = NULL;
     bool just_changed_cds = FALSE;
-    char *xattr_fname;
-    char *acl_fname;
-    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
     char *pathname_of_last_biggie_restored;
     FILE *fbw = NULL;
 
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
+    malloc_string(pathname_of_last_biggie_restored);
     malloc_string(tmp);
-    malloc_string(biggies_whose_EXATs_we_should_set);
-    malloc_string(pathname_of_last_biggie_restored);
     assert(bkpinfo != NULL);
 
-    sprintf(biggies_whose_EXATs_we_should_set,
-            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
-                biggies_whose_EXATs_we_should_set);
+        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
     }
 
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
     total_slices = atol(tmp);
-    sprintf(tmp, "Reassembling large files      ");
-    mvaddstr_and_log_it(g_currentY, 0, tmp);
+    mr_free(tmp);
+
+    mr_asprintf(tmp1, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp1);
+    mr_free(tmp1);
+
     if (length_of_file(BIGGIELIST) < 6) {
         log_msg(1, "OK, no biggielist; not restoring biggiefiles");
@@ -2105 +1954 @@
     noof_biggiefiles = count_lines_in_file(BIGGIELIST);
     if (noof_biggiefiles <= 0) {
-        log_msg(2,
-                "OK, no biggiefiles in biggielist; not restoring biggiefiles");
+        log_msg(2, "OK, no biggiefiles in biggielist; not restoring biggiefiles");
         return (0);
     }
-    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
-            noof_biggiefiles);
-    log_msg(2, tmp);
+    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
 
     open_progress_form("Reassembling large files",
@@ -2120 +1966 @@
         log_msg(2, "Thinking about restoring bigfile %ld", bigfileno + 1);
         if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
-            log_msg(3,
-                    "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
+            log_msg(3, "...but its first slice isn't on this CD. Perhaps this was a selective restore?");
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d",
-                    bigfileno + 1, mds,
-                    g_current_media_number);
+            log_msg(3, "Cannot find bigfile #%ld 's first slice on %s #%d", bigfileno + 1, mds, g_current_media_number);
             log_msg(3, "Slicename would have been %s",
                     slice_fname(bigfileno, 0, ARCHIVES_PATH, ""));
@@ -2131 +1974 @@
             if (just_changed_cds) {
                 just_changed_cds = FALSE;
-                log_msg(3,
-                        "I'll continue to scan this CD for bigfiles to be restored.");
+                log_msg(3, "I'll continue to scan this CD for bigfiles to be restored.");
             } else if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
                 insist_on_this_cd_number(++g_current_media_number);
-                sprintf(tmp, "Restoring from %s #%d", mds,
-                        g_current_media_number);
-                log_to_screen(tmp);
+                log_to_screen("Restoring from %s #%d", mds, g_current_media_number);
                 just_changed_cds = TRUE;
             } else {
                 /* That big file doesn't exist, but the followings may */
                 /* So we need to continue looping */
-                log_msg(2, "There was no bigfile #%ld. That's OK.",
-                    bigfileno + 1);
+                log_msg(2, "There was no bigfile #%ld. That's OK.", bigfileno + 1);
                 log_msg(2, "I'm going to stop restoring bigfiles now.");
                 retval++;
@@ -2151 +1990 @@
         } else {
             just_changed_cds = FALSE;
-            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
-            update_progress_form(tmp);
-            res =
-                restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
+            mr_asprintf(tmp1, "Restoring big file %ld", bigfileno + 1);
+            update_progress_form(tmp1);
+            mr_free(tmp1);
+            res = restore_a_biggiefile_from_CD(bigfileno, filelist, pathname_of_last_biggie_restored);
             log_it("%s",pathname_of_last_biggie_restored);
             if (fbw && pathname_of_last_biggie_restored[0]) {
@@ -2168 +2007 @@
         fclose(fbw);
         if (g_getfattr) {
-            sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(xattr_fname) > 0) {
                 set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
             }
+            mr_free(xattr_fname);
         }
         if (g_getfacl) {
-            sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
+            mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, ARCHIVES_PATH);
             if (length_of_file(acl_fname) > 0) {
                 set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
             }
-        }
-    }
+            mr_free(acl_fname);
+        }
+    }
+    mr_free(biggies_whose_EXATs_we_should_set);
+
     if (does_file_exist("/PAUSE")) {
-        popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+        popup_and_OK("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
     }
     close_progress_form();
@@ -2190 +2032 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
-    paranoid_free(tmp);
-    paranoid_free(biggies_whose_EXATs_we_should_set);
     paranoid_free(pathname_of_last_biggie_restored);
     return (retval);
@@ -2220 +2058 @@
     int res;
     int attempts;
-    long current_tarball_number = 0;
+    long current_tarball_number = 0L;
     long max_val;
   /**malloc ***/
+    char *mds = NULL;
     char *tmp = NULL;
-    char *mds = NULL;
     char *tmp1 = NULL;
-    char *tarball_fname;
-    char *progress_str;
-    char *comment;
+    char *tarball_fname = NULL;
+    char *progress_str = NULL;
+
+    assert(bkpinfo != NULL);
 
     malloc_string(tmp);
-    malloc_string(tarball_fname);
-    malloc_string(progress_str);
-    malloc_string(comment);
-
-    assert(bkpinfo != NULL);
-
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
-    log_msg(2,
-            "Insisting on 1st media, so that I can have a look at LAST-FILELIST-NUMBER");
+    log_msg(2, "Insisting on 1st media, so that I can have a look at LAST-FILELIST-NUMBER");
     if (g_current_media_number != 1) {
         log_msg(3, "OK, that's jacked up.");
@@ -2250 +2082 @@
 
     mds = media_descriptor_string(bkpinfo->backup_media_type);
-    sprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from %s #%d", mds, g_current_media_number);
 
     log_to_screen(progress_str);
@@ -2260 +2092 @@
         insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
-        sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2",
-                current_tarball_number);
+        mr_free(progress_str);
+
+        mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.bz2", current_tarball_number);
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz",
-                current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.gz", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzma", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
-            sprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.",
-                    current_tarball_number);
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.bz2", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.star.", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {
@@ -2286 +2123 @@
                 log_to_screen
                     ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
+                mr_free(tarball_fname);
                 return (0);
             }
@@ -2295 +2133 @@
             }
             g_current_media_number++;
-            sprintf(progress_str, "Restoring from %s #%d",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            mr_asprintf(progress_str, "Restoring from %s #%d", media_descriptor_string(bkpinfo->backup_media_type), g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
-                    current_tarball_number, mds, g_current_media_number);
-//    log_msg(3, "progress_str = %s", progress_str);
-            for (res = 999, attempts = 0; attempts < 3 && res != 0;
-                 attempts++) {
-                res =
-                    restore_a_tarball_from_CD(tarball_fname,
-                                              current_tarball_number,
-                                              filelist);
-            }
-            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ",
-                    mds, g_current_media_number, current_tarball_number);
+            mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_tarball_number, mds, g_current_media_number);
+            for (res = 999, attempts = 0; attempts < 3 && res != 0; attempts++) {
+                res = restore_a_tarball_from_CD(tarball_fname, current_tarball_number, filelist);
+            }
+            mr_asprintf(tmp1, "%s #%d, fileset #%ld - restore ", mds, g_current_media_number, current_tarball_number);
             if (res) {
                 mr_strcat(tmp1, "reported errors");
@@ -2322 +2151 @@
                 mr_strcat(tmp1, " (%d attempts) - review logs", attempts);
             }
-            strcpy(comment, tmp1);
-            paranoid_free(tmp1);
             if (attempts > 1) {
-                log_to_screen(comment);
-            }
+                log_to_screen(tmp1);
+            }
+            mr_free(tmp1);
 
             retval += res;
@@ -2332 +2160 @@
             g_current_progress++;
         }
+        mr_free(tarball_fname);
+
         /* Now we need to umount the current media to have the next mounted by insist_on_this_cd_number */
         /*   run_program_and_log_output("umount " MNT_CDROM, FALSE); */
     }
     mr_free(mds);
+    mr_free(progress_str);
 
     close_progress_form();
@@ -2343 +2174 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(tarball_fname);
-    paranoid_free(progress_str);
-    paranoid_free(comment);
 
     return (retval);
@@ -2375 +2203 @@
 
   /** malloc add ****/
-    char *tmp;
+    char *tmp = NULL;
     char *biggie_fname;
     char *biggie_cksum;
-    char *xattr_fname;
-    char *acl_fname;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
     char *p;
     char *pathname_of_last_biggie_restored;
-    char *biggies_whose_EXATs_we_should_set;    // EXtended ATtributes
+    char *biggies_whose_EXATs_we_should_set = NULL; // EXtended ATtributes
     long long biggie_size;
     FILE *fbw = NULL;
@@ -2389 +2217 @@
     malloc_string(biggie_fname);
     malloc_string(biggie_cksum);
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
-    malloc_string(biggies_whose_EXATs_we_should_set);
     malloc_string(pathname_of_last_biggie_restored);
     assert(bkpinfo != NULL);
@@ -2398 +2223 @@
 
     total_slices = atol(tmp);
-    sprintf(tmp, "Reassembling large files      ");
+
     if (g_getfattr) {
-        sprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+        mr_asprintf(xattr_fname, XATTR_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
     }
     if (g_getfacl) {
-        sprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
-    }
-    mvaddstr_and_log_it(g_currentY, 0, tmp);
-    sprintf(biggies_whose_EXATs_we_should_set,
-            "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
+        mr_asprintf(acl_fname, ACL_BIGGLST_FNAME_RAW_SZ, bkpinfo->tmpdir);
+    }
+    mr_asprintf(tmp1, "Reassembling large files      ");
+    mvaddstr_and_log_it(g_currentY, 0, tmp1);
+    mr_free(tmp1);
+
+    mr_asprintf(biggies_whose_EXATs_we_should_set, "%s/biggies-whose-EXATs-we-should-set", bkpinfo->tmpdir);
     if (!(fbw = fopen(biggies_whose_EXATs_we_should_set, "w"))) {
-        log_msg(1, "Warning - cannot openout %s",
-                biggies_whose_EXATs_we_should_set);
-    }
-// get xattr and acl files if they're there
-    res =
-        read_header_block_from_stream(&biggie_size, biggie_fname,
-                                      &ctrl_chr);
+        log_msg(1, "Warning - cannot openout %s", biggies_whose_EXATs_we_should_set);
+    }
+
+    // get xattr and acl files if they're there
+    res = read_header_block_from_stream(&biggie_size, biggie_fname, &ctrl_chr);
     if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname,
-                                      &ctrl_chr, xattr_fname, acl_fname);
+        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname, &ctrl_chr, xattr_fname, acl_fname);
     }
 
     noof_biggiefiles = atol(biggie_fname);
-    sprintf(tmp, "OK, there are %ld biggiefiles in the archives",
-            noof_biggiefiles);
-    log_msg(2, tmp);
+    log_msg(2, "OK, there are %ld biggiefiles in the archives", noof_biggiefiles);
     open_progress_form("Reassembling large files",
                        "I am now reassembling all the large files.",
@@ -2447 +2269 @@
             p++;
         }
-        sprintf(tmp, "Restoring big file %ld (%lld K)",
-                current_bigfile_number + 1, biggie_size / 1024);
-        update_progress_form(tmp);
+        mr_asprintf(tmp1, "Restoring big file %ld (%lld K)", current_bigfile_number + 1, biggie_size / 1024);
+        update_progress_form(tmp1);
+        mr_free(tmp1);
         res = restore_a_biggiefile_from_stream(biggie_fname,
                                                current_bigfile_number,
@@ -2467 +2289 @@
     if (current_bigfile_number != noof_biggiefiles
         && noof_biggiefiles != 0) {
-        sprintf(tmp, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n",
-                current_bigfile_number, noof_biggiefiles);
-    } else {
-        sprintf(tmp,
-                "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.",
-                noof_biggiefiles, current_bigfile_number);
-    }
-    log_msg(1, tmp);
+        log_msg(1, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n", current_bigfile_number, noof_biggiefiles);
+    } else {
+        log_msg(1, "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.", noof_biggiefiles, current_bigfile_number);
+    }
 
     if (fbw) {
@@ -2482 +2300 @@
             if (g_getfattr) {
                 if (length_of_file(xattr_fname) > 0) {
-                    log_msg(1, "set_fattr_List(%s,%s)",
-                        biggies_whose_EXATs_we_should_set, xattr_fname);
-                    set_fattr_list(biggies_whose_EXATs_we_should_set,
-                               xattr_fname);
+                    log_msg(1, "set_fattr_List(%s,%s)", biggies_whose_EXATs_we_should_set, xattr_fname);
+                    set_fattr_list(biggies_whose_EXATs_we_should_set, xattr_fname);
                 }
             }
             if (g_getfacl) {
                 if (length_of_file(acl_fname) > 0) {
-                    log_msg(1, "set_acl_list(%s,%s)",
-                            biggies_whose_EXATs_we_should_set, acl_fname);
+                    log_msg(1, "set_acl_list(%s,%s)", biggies_whose_EXATs_we_should_set, acl_fname);
                     set_acl_list(biggies_whose_EXATs_we_should_set, acl_fname);
                 }
@@ -2499 +2314 @@
         }
     }
+    mr_free(xattr_fname);
+    mr_free(acl_fname);
+    mr_free(biggies_whose_EXATs_we_should_set);
+
     if (does_file_exist("/PAUSE")) {
         popup_and_OK
@@ -2510 +2329 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(biggies_whose_EXATs_we_should_set);
     paranoid_free(pathname_of_last_biggie_restored);
     paranoid_free(biggie_fname);
     paranoid_free(biggie_cksum);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
     paranoid_free(tmp);
     return (retval);
@@ -2539 +2355 @@
  * @return 0 for success, or the number of filesets that failed.
  */
-int
-restore_all_tarballs_from_stream(struct s_node *filelist)
+int restore_all_tarballs_from_stream(struct s_node *filelist)
 {
     int retval = 0;
@@ -2549 +2364 @@
 
   /** malloc **/
-    char *tmp;
+    char *tmp = NULL;
     char *mds = NULL;
-    char *progress_str;
+    char *progress_str = NULL;
     char *tmp_fname;
-    char *xattr_fname;
-    char *acl_fname;
+    char *xattr_fname = NULL;
+    char *acl_fname = NULL;
 
     long long tmp_size;
 
     malloc_string(tmp);
-    malloc_string(progress_str);
     malloc_string(tmp_fname);
     assert(bkpinfo != NULL);
-    malloc_string(xattr_fname);
-    malloc_string(acl_fname);
     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
@@ -2574 +2386 @@
     run_program_and_log_output("pwd", 5);
 
-    sprintf(progress_str, "Restoring from media #%d",
-            g_current_media_number);
+    mr_asprintf(progress_str, "Restoring from media #%d", g_current_media_number);
     log_to_screen(progress_str);
     open_progress_form("Restoring from archives",
@@ -2597 +2408 @@
         update_progress_form(progress_str);
         if (g_getfattr) {
-            sprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir,
-                current_afioball_number);
+            mr_asprintf(xattr_fname, "%s/xattr-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(xattr_fname);
         }
         if (g_getfacl) {
-            sprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir,
-                current_afioball_number);
+            mr_asprintf(acl_fname, "%s/acl-subset-%ld.tmp", bkpinfo->tmpdir, current_afioball_number);
             unlink(acl_fname);
         }
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             log_it("Reading EXAT files from tape");
-            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname,
-                                          &ctrl_chr, xattr_fname,
-                                          acl_fname);
+            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname, &ctrl_chr, xattr_fname, acl_fname);
         }
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
-        sprintf(tmp,
-                "Restoring from fileset #%ld (name=%s, size=%ld K)",
-                current_afioball_number, tmp_fname, (long) tmp_size >> 10);
-        res =
-            restore_a_tarball_from_stream(tmp_fname,
-                                          current_afioball_number,
-                                          filelist, tmp_size, xattr_fname,
-                                          acl_fname);
+        log_msg(4, "Restoring from fileset #%ld (name=%s, size=%ld K)", current_afioball_number, tmp_fname, (long) tmp_size >> 10);
+        res = restore_a_tarball_from_stream(tmp_fname, current_afioball_number, filelist, tmp_size, xattr_fname, acl_fname);
         retval += res;
         if (res) {
-            sprintf(tmp, "Fileset %ld - errors occurred",
-                    current_afioball_number);
-            log_to_screen(tmp);
+            log_to_screen("Fileset %ld - errors occurred", current_afioball_number);
         }
         res =
@@ -2638 +2437 @@
         g_current_progress++;
         mds = media_descriptor_string(bkpinfo->backup_media_type),
-        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
-                current_afioball_number, mds,
-                g_current_media_number);
+
+        mr_free(progress_str);
+        mr_asprintf(progress_str, "Restoring from fileset #%ld on %s #%d", current_afioball_number, mds, g_current_media_number);
         mr_free(mds);
-        res =
-            read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
+        res = read_header_block_from_stream(&tmp_size, tmp_fname, &ctrl_chr);
         if (g_getfattr) {
             unlink(xattr_fname);
@@ -2651 +2449 @@
         }
     }                           // next
+    mr_free(progress_str);
+    if (g_getfattr) {
+        mr_free(xattr_fname);
+    }
+    if (g_getfacl) {
+        mr_free(acl_fname);
+    }
+
     log_msg(1, "All done with afioballs");
     close_progress_form();
@@ -2659 +2465 @@
     }
     paranoid_free(tmp);
-    paranoid_free(progress_str);
     paranoid_free(tmp_fname);
-    paranoid_free(xattr_fname);
-    paranoid_free(acl_fname);
     return (retval);
 }
@@ -2689 +2492 @@
     char *cwd;
     char *newpath;
-    char *tmp;
+    char *tmp = NULL;
     assert(bkpinfo != NULL);
 
     malloc_string(cwd);
     malloc_string(newpath);
-    malloc_string(tmp);
     log_msg(2, "restore_everything() --- starting");
     g_current_media_number = 1;
@@ -2700 +2502 @@
         // FIXME
     }
-    sprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
+    mr_asprintf(tmp, "mkdir -p %s", bkpinfo->restore_path);
     run_program_and_log_output(tmp, FALSE);
+    mr_free(tmp);
+
     log_msg(1, "Changing dir to %s", bkpinfo->restore_path);
     if (chdir(bkpinfo->restore_path)) {
@@ -2755 +2559 @@
     paranoid_free(cwd);
     paranoid_free(newpath);
-    paranoid_free(tmp);
     return (resA + resB);
 }
@@ -2776 +2579 @@
 {
     log_msg(0, "-------------- Mondo Restore v%s -------------", PACKAGE_VERSION);
-    log_msg(0,
-            "DON'T PANIC! Mondorestore logs almost everything, so please ");
-    log_msg(0,
-            "don't break out in a cold sweat just because you see a few  ");
-    log_msg(0,
-            "error messages in the log. Read them; analyze them; see if  ");
-    log_msg(0,
-            "they are significant; above all, verify your backups! Please");
-    log_msg(0,
-            "attach a compressed copy of this log to any e-mail you send ");
-    log_msg(0,
-            "to the Mondo mailing list when you are seeking technical    ");
-    log_msg(0,
-            "support. Without it, we can't help you.            - DevTeam");
-    log_msg(0,
-            "------------------------------------------------------------");
-    log_msg(0,
-            "BTW, despite (or perhaps because of) the wealth of messages,");
-    log_msg(0,
-            "some users are inclined to stop reading this log.  If Mondo ");
-    log_msg(0,
-            "stopped for some reason, chances are it's detailed here.    ");
-    log_msg(0,
-            "More than likely there's a message at the very end of this  ");
-    log_msg(0,
-            "log that will tell you what is wrong.  Please read it!      ");
-    log_msg(0,
-            "------------------------------------------------------------");
+    log_msg(0, "DON'T PANIC! Mondorestore logs almost everything, so please ");
+    log_msg(0, "don't break out in a cold sweat just because you see a few  ");
+    log_msg(0, "error messages in the log. Read them; analyze them; see if  ");
+    log_msg(0, "they are significant; above all, verify your backups! Please");
+    log_msg(0, "attach a compressed copy of this log to any e-mail you send ");
+    log_msg(0, "to the Mondo mailing list when you are seeking technical    ");
+    log_msg(0, "support. Without it, we can't help you.            - DevTeam");
+    log_msg(0, "------------------------------------------------------------");
+    log_msg(0, "BTW, despite (or perhaps because of) the wealth of messages,");
+    log_msg(0, "some users are inclined to stop reading this log.  If Mondo ");
+    log_msg(0, "stopped for some reason, chances are it's detailed here.    ");
+    log_msg(0, "More than likely there's a message at the very end of this  ");
+    log_msg(0, "log that will tell you what is wrong.  Please read it!      ");
+    log_msg(0, "------------------------------------------------------------");
 }
 
@@ -2818 +2607 @@
     int retval = 0;
     int res;
-//  int c;
-    char *tmp;
+    char *tmp = NULL;
 
     struct mountlist_itself *mountlist;
     struct raidlist_itself *raidlist;
     struct s_node *filelist;
-    char *a, *b;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
     bool run_postnuke = FALSE;
 
@@ -2838 +2627 @@
 
     g_loglevel = DEFAULT_MR_LOGLEVEL;
-    malloc_string(tmp);
 
 /* Configure global variables */
@@ -2863 +2651 @@
     }
 
+    /* Init GUI */
+    setup_newt_stuff();         /* call newtInit and setup screen log */
+
     malloc_libmondo_global_strings();
 
     strcpy(g_mondo_home,
            call_program_and_get_last_line_of_output("which mondorestore"));
-    /*
-    sprintf(g_tmpfs_mountpt, "/tmp/tmpfs");
-    make_hole_for_dir(g_tmpfs_mountpt);
-    */
     g_current_media_number = 1; // precaution
 
     run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);
 
-    malloc_string(a);
-    malloc_string(b);
     setup_MR_global_filenames();    // malloc() and set globals, using bkpinfo->tmpdir etc.
     bkpinfo->backup_media_type = none;  // in case boot disk was made for one backup type but user wants to restore from another backup type
@@ -2897 +2682 @@
 
     /* Backup original mountlist.txt */
-    sprintf(tmp, "%s.orig", g_mountlist_fname);
+    mr_asprintf(tmp, "%s.orig", g_mountlist_fname);
     if (!does_file_exist(g_mountlist_fname)) {
-        log_msg(2,
-                "%ld: Warning - g_mountlist_fname (%s) does not exist yet",
-                __LINE__, g_mountlist_fname);
+        log_msg(2, "%ld: Warning - g_mountlist_fname (%s) does not exist yet", __LINE__, g_mountlist_fname);
     } else if (!does_file_exist(tmp)) {
-        sprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname,
-                g_mountlist_fname);
+        mr_free(tmp);
+        mr_asprintf(tmp, "cp -f %s %s.orig", g_mountlist_fname, g_mountlist_fname);
         run_program_and_log_output(tmp, FALSE);
     }
+    mr_free(tmp);
 
     /* Init directories */
@@ -2912 +2696 @@
     make_hole_for_dir("/tmp/tmpfs");    /* just in case... */
     run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
-    /*
-    run_program_and_log_output("ln -sf /var/log/mondo-archive.log /tmp/mondorestore.log",
-         FALSE);
-         */
 
     run_program_and_log_output("rm -Rf /tmp/tmpfs/mondo.tmp.*", FALSE);
 
-    /* Init GUI */
-    setup_newt_stuff();         /* call newtInit and setup screen log */
     welcome_to_mondorestore();
     if (bkpinfo->disaster_recovery) {
@@ -2954 +2732 @@
     }
 
-    if (argc >= 2 && strcmp(argv[1], "--pih") == 0) {
-        if (system("mount | grep cdrom 2> /dev/null > /dev/null")) {
-            paranoid_system("mount " MNT_CDROM);
-        }
-        bkpinfo->compression_level = 1;
-        g_current_media_number = 2;
-        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
-        bkpinfo->backup_media_type = dvd;
-        open_progress_form("Reassembling /dev/hda1",
-                           "Shark is a bit of a silly person.",
-                           "Please wait. This may take some time.",
-                           "", 1999);
-        paranoid_system("rm -Rf /tmp/*pih*");
-
-        restore_a_biggiefile_from_CD(42, NULL, tmp);
-    }
-
     if (argc == 5 && strcmp(argv[1], "--common") == 0) {
         g_loglevel = 6;
@@ -2981 +2742 @@
         // BERLIOS: /usr/lib ???
         toggle_path_selection(filelist, "/usr/share", TRUE);
-//      show_filelist(filelist);
         save_filelist(filelist, "/tmp/out.txt");
-//      finish(0);
-//      toggle_path_selection (filelist, "/root/stuff", TRUE);
-        strcpy(a, argv[3]);
-        strcpy(b, argv[4]);
-
-        res = save_filelist_entries_in_common(a, filelist, b, FALSE);
+        mr_asprintf(tmp1, "%s", argv[3]);
+        mr_asprintf(tmp2, "%s", argv[4]);
+
+        res = save_filelist_entries_in_common(tmp1, filelist, tmp2, FALSE);
+        mr_free(tmp1);
+        mr_free(tmp2);
+
         free_filelist(filelist);
         printf("res = %d", res);
@@ -3096 +2857 @@
         log_msg(2, "Still here. Yay.");
         if ((strlen(bkpinfo->tmpdir) > 0) && (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL)) {
-            sprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
+            mr_asprintf(tmp, "rm -Rf %s/*", bkpinfo->tmpdir);
             run_program_and_log_output(tmp, FALSE);
+            mr_free(tmp);
         }
         unmount_boot_if_necessary();    /* for Gentoo users */
@@ -3115 +2877 @@
         // BCO:To be reviewed
         if ((bkpinfo->restore_mode == compare) || (bkpinfo->restore_mode == nuke)) {
-            if (bkpinfo->backup_media_type == netfs
-                && !is_this_device_mounted(bkpinfo->netfs_mount)) {
+            if ((bkpinfo->backup_media_type == netfs) && bkpinfo->netfs_mount && !is_this_device_mounted(bkpinfo->netfs_mount)) {
                 log_msg(1, "Mounting remote %s dir", bkpinfo->netfs_proto);
                 sprintf(bkpinfo->isodir, "/tmp/isodir");
@@ -3122 +2883 @@
                 if (strstr(bkpinfo->netfs_proto, "sshfs")) {
                     if (bkpinfo->netfs_user) {
-                        sprintf(tmp, "sshfs -o ro %s@%s /tmp/isodir",
-                            bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                        mr_asprintf(tmp, "sshfs -o ro %s@%s /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
                     } else {
-                        sprintf(tmp, "sshfs -o ro %s /tmp/isodir",
-                            bkpinfo->netfs_mount);
+                        mr_asprintf(tmp, "sshfs -o ro %s /tmp/isodir", bkpinfo->netfs_mount);
                     }
                 } else  {
                     if (strstr(bkpinfo->netfs_proto, "smbfs")) {
                         if (bkpinfo->netfs_user) {
-                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ",
-                                bkpinfo->netfs_mount,bkpinfo->netfs_user);
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o user=%s,nolock,ro ", bkpinfo->netfs_mount,bkpinfo->netfs_user);
                         } else {
-                            sprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ",
-                                bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount -t cifs %s /tmp/isodir -o nolock,ro ", bkpinfo->netfs_mount);
                         }
                     } else {
                         if (bkpinfo->netfs_user) {
-                            sprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir",
-                                bkpinfo->netfs_user,bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount %s@%s -o nolock,ro /tmp/isodir", bkpinfo->netfs_user,bkpinfo->netfs_mount);
                         } else {
-                            sprintf(tmp, "mount %s -o nolock,ro /tmp/isodir",
-                                bkpinfo->netfs_mount);
+                            mr_asprintf(tmp, "mount %s -o nolock,ro /tmp/isodir", bkpinfo->netfs_mount);
                         }
                     }
                 }
                 run_program_and_log_output(tmp, 1);
+                mr_free(tmp);
             }
         }
 
         if (retval) {
-            log_to_screen
-                ("Warning - load_raidtab_into_raidlist returned an error");
+            log_to_screen("Warning - load_raidtab_into_raidlist returned an error");
         }
 
@@ -3205 +2960 @@
                                 "Run complete. Please remove media and reboot.");
         } else {
-            run_program_and_log_output("sync", FALSE);
+            sync();
             if (is_this_device_mounted(MNT_CDROM)) {
                 run_program_and_log_output("umount -d " MNT_CDROM, FALSE);
@@ -3242 +2997 @@
       } else {
         log_msg(1, "Re-mounted partitions for post-nuke stuff");
-        sprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path,
-            retval);
+        mr_asprintf(tmp, "post-nuke %s %d", bkpinfo->restore_path, retval);
         log_msg(2, "Calling '%s'", tmp);
         if ((res = run_program_and_log_output(tmp, 0))) {
           log_OS_error(tmp);
         }
+        mr_free(tmp);
         log_msg(1, "post-nuke returned w/ res=%d", res);
       }
@@ -3263 +3018 @@
     set_signals(FALSE);
     log_to_screen("Restore log (%s) copied to /var/log on your hard disk", MONDO_LOGFILE);
-    sprintf(tmp,
-            "Mondo-restore is exiting (retval=%d)                                      ",
-            retval);
-    log_to_screen(tmp);
-    sprintf(tmp, "umount -d %s", bkpinfo->isodir);
+    log_to_screen("Mondo-restore is exiting (retval=%d)                                      ", retval);
+
+    mr_asprintf(tmp, "umount -d %s", bkpinfo->isodir);
     run_program_and_log_output(tmp, 5);
+    mr_free(tmp);
+
     paranoid_free(mountlist);
     paranoid_free(raidlist);
@@ -3275 +3030 @@
     }                           // for b0rken distros
     if (strstr(bkpinfo->tmpdir,"mondo.tmp.") != NULL) {
-        sprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
+        mr_asprintf(tmp, "rm -Rf %s", bkpinfo->tmpdir);
         paranoid_system(tmp);
+        mr_free(tmp);
     }
     paranoid_MR_finish(retval); // frees global stuff plus bkpinfo
     free_libmondo_global_strings(); // it's fine to have this here :) really :)
-    paranoid_free(a);
-    paranoid_free(b);
-    paranoid_free(tmp);
 
     unlink("/tmp/filelist.full");

branches/3.2/mondo/src/mondorestore/mr-externs.h

@@ -9 +9 @@
 #define BIGGIELIST MNT_CDROM"/archives/biggielist.txt"
 #define ARCHIVES_PATH MNT_CDROM"/archives"
+#define BIGGIELIST ARCHIVES_PATH"/biggielist.txt"
 
 #ifdef __FreeBSD__
@@ -79 +80 @@
 extern int verify_tape_backups();
 extern char which_restore_mode(void);
-extern int which_format_command_do_i_need(char *, char *);
 extern int write_cfg_var(char *, char *, char *);
 extern void wrong_marker(int, int);