Changeset 2330 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-mountlist.c

Timestamp:

Aug 18, 2009, 3:20:49 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3341@localhost: bruno | 2009-08-13 22:36:24 +0200

• Replacement of some strcpy
• Change allocation done in resolve_softlinks_to_get_to_actual_device_file(), where_is_root_mounted(), bkptype_to_string(), which_boot_loader()

File:

• branches/2.2.10/mondo/src/common/libmondo-mountlist.c (modified) (2 diffs)

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

@@ -430 +430 @@
         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)) {
+        if ((curr_part_no >= 5 && prev_part_no == 4) && (strcmp(part_table_fmt, "MBR") == 0)) {
             mr_asprintf(tmp, " Partition 4 of %s is occupied.", drive);
             log_it(tmp);
@@ -438 +437 @@
             res++;
         }
+        mr_free(part_table_fmt);
+
         /* does partition /dev/hdNX exist more than once in the mountlist? */
         for (i = 0, mountpoint_copies = 0, device_copies = 0;