Changeset 3193 in MondoRescue for branches/3.1/mondo

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/3.1/mondo/src

Files:

• include/mr_str.h (modified) (1 diff)
• include/my-stuff.h (modified) (1 diff)
• lib/mr_str.c (modified) (9 diffs)
• mondoarchive/mondoarchive.c (modified) (5 diffs)
• mondorestore/mondo-prep.c (modified) (16 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (10 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (12 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (23 diffs)
• mondorestore/mondoprep.h (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (6 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");