Changeset 3263 in MondoRescue for branches

Timestamp:

Apr 22, 2014, 11:06:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug due to lack of memory allocation for a tmp var to display
• Fix another bug in the call to labeling which used a bad variable

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-mountlist.c (modified) (6 diffs)
• mondorestore/mondo-prep.c (modified) (2 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (7 diffs)
• mondorestore/mondorestore.c (modified) (2 diffs)

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

@@ -3283 +3283 @@
     mr_free(tmp);
 
-    log_msg(0, "Found %s partition table format type", output);
+    log_msg(0, "Found %s partition table format type on %s", output, drive);
     paranoid_free(command);
     paranoid_free(fdisk);

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

@@ -413 +413 @@
     }
 
+    /* GPT allows more than 4 primary partitions - detect partition type now */
+    part_table_fmt = which_partition_format(drive);
+
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
         build_partition_name(device, drive, curr_part_no);
@@ -428 +431 @@
                 mr_free(tmp);
                 res++;
-            } else if (curr_part_no > 5
-                       || (curr_part_no <= 4 && prev_part_no > 0)) {
+            } else if (curr_part_no > 5 || (curr_part_no <= 4 && prev_part_no > 0)) {
                 mr_asprintf(tmp, " Gap on %s between %d and %d.", drive, prev_part_no, curr_part_no);
                 log_it(tmp);
@@ -437 +439 @@
             }
         }
-        /* GPT allows more than 4 primary partitions */
-        part_table_fmt = which_partition_format(drive);
         /* no spare primary partitions to help accommodate the logical(s)? */
         if ((curr_part_no >= 5 && prev_part_no == 4) && (strcmp(part_table_fmt, "MBR") == 0)) {
@@ -447 +447 @@
             res++;
         }
-        mr_free(part_table_fmt);
 
         /* does partition /dev/hdNX exist more than once in the mountlist? */
@@ -498 +497 @@
         prev_part_no = curr_part_no;
     }
+    mr_free(part_table_fmt);
 
     /* Over-allocated the disk? Unallocated space on disk? */
@@ -589 +589 @@
             }
         }
-        if (copies > 1 && last_copy == currline
-            && strcmp(curr_mountpoint, "raid")) {
+        if (copies > 1 && last_copy == currline && strcmp(curr_mountpoint, "raid")) {
             mr_asprintf(tmp, " %s %s's.", number_to_text(copies), curr_mountpoint);
             mr_strcat(flaws_str, "%s", tmp);

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

@@ -2616 +2616 @@
 
     if (g_mountlist_fname[0] == '\0') {
-        log_it
-            ("resize_mountlist_prop...() - warning - mountlist fname is blank");
+        log_it("resize_mountlist_prop...() - warning - mountlist fname is blank");
         log_it("That does NOT affect the functioning of this subroutine.");
         log_it("--- Hugo, 2002/11/20");
@@ -2625 +2624 @@
     log_it("Back from MLoDiM");
     for (driveno = 0; driveno < drivelist->entries; driveno++) {
-        resize_drive_proportionately_to_suit_new_drives(mountlist,
-                                                        drivelist->
-                                                        el[driveno].
-                                                        device);
+        resize_drive_proportionately_to_suit_new_drives(mountlist, drivelist->el[driveno].device);
     }
     log_to_screen("Mountlist adjusted to suit current hard drive(s)");

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

@@ -185 +185 @@
 {
 while (get_cfg_file_from_archive()) {
-if (!ask_me_yes_or_no
-    ("Failed to find config file/archives. Choose another source?"))
-{
-    fatal_error("Could not find config file/archives. Aborting.");
-}
-interactively_obtain_media_parameters_from_user(FALSE);
-}
+    if (!ask_me_yes_or_no("Failed to find config file/archives. Choose another source?")) {
+        fatal_error("Could not find config file/archives. Aborting.");
+    }
+    interactively_obtain_media_parameters_from_user(FALSE);
+    }
 }
 
@@ -2118 +2116 @@
             log_msg(2, "gcffa --- calling mount_media now :)");
             if (!mount_media()) {
-                log_msg(2,
-                        "gcffa --- managed to mount CD; so, no need for Plan B");
+                log_msg(2, "gcffa --- managed to mount CD; so, no need for Plan B");
                 try_plan_B = FALSE;
             } else {
@@ -2176 +2173 @@
                 }
 
-                log_msg(2,
-                        "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
+                log_msg(2, "gcffa --- Plan B, a.k.a. untarring some file from all.tar.gz");
                 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);
@@ -2200 +2196 @@
         mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
-        if (strcmp(tmp, cfg_file)
-            && run_program_and_log_output(command, 1)) {
+        if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
             log_msg(1,
                     "... but an error occurred when I tried to move it to %s",
@@ -2213 +2208 @@
         log_it("%s",command);
         if (extract_mountlist_stub) {
-            if (strcmp(tmp, cfg_file)
-                && run_program_and_log_output(command, 1)) {
+            if (strcmp(tmp, cfg_file) && run_program_and_log_output(command, 1)) {
                 log_msg(1, "Failed to get mountlist");
             } else {
@@ -2238 +2232 @@
         log_it("%s",cfg_file);
         log_msg(1, "%s not found", cfg_file);
-        log_to_screen
-            ("Oh dear. Unable to recover configuration file from boot disk");
+        log_to_screen("Oh dear. Unable to recover configuration file from boot disk");
         return (1);
     }
@@ -2246 +2239 @@
     if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
         log_to_screen("...but not mountlist.txt - a pity, really...");
-    }
-    else {
+    } else {
             /* Is this code really useful ??? */
         if (extract_mountlist_stub) {

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

@@ -760 +760 @@
     flaws_str = evaluate_mountlist(mountlist);
     if (flaws_str != NULL) {
-        sprintf(tmp,
-                "Mountlist analyzed. Result: \"%s\" Switch to Interactive Mode?",
-                flaws_str);
+        mr_asprintf(tmp, "Mountlist analyzed. Result: \"%s\" Switch to Interactive Mode?", flaws_str);
         mr_free(flaws_str);
         if (ask_me_yes_or_no(tmp)) {
             retval = interactive_mode(mountlist, raidlist);
+            mr_free(tmp);
             goto after_the_nuke;
         } else {
@@ -846 +845 @@
 
     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);
+    res = run_program_and_log_output(tmp1, TRUE);
     mr_free(tmp1);
     if (res) {