Changeset 1303 in MondoRescue for branches/2.2.2/mondo/src/common/libmondo-mountlist.c

Timestamp:

Apr 15, 2007, 2:33:22 AM (17 years ago)

Author:

Bruno Cornec

Message:

• Some FreeBSD fixes
• Better messages for partition names
• May improve the gap issue on cciss

File:

• branches/2.2.2/mondo/src/common/libmondo-mountlist.c (modified) (8 diffs)

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

@@ -202 +202 @@
     npos = pos = 0;
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        sprintf(device, "%ss%d", drive, curr_part_no);
+        build_partition_name(device, drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         npos = 0;
@@ -216 +216 @@
         }
 
-        sprintf(device, "%ss%d", drive, curr_part_no);
+        build_partition_name(device, drive, curr_part_no);
         strcpy(mountpoint, mountlist->el[pos].mountpoint);
         if (pos > 0 && !npos) {
@@ -397 +397 @@
     char *tmp;
     char *device;
-    char *mountpoint;
 
     /*@ long *********************************************************** */
@@ -413 +412 @@
     malloc_string(tmp);
     malloc_string(device);
-    malloc_string(mountpoint);
     flaws_str[0] = '\0';
     prev_part_no = 0;
@@ -438 +436 @@
             continue;
         }
-        strcpy(mountpoint, mountlist->el[pos].mountpoint);
         /* gap in the partition list? */
         if (curr_part_no - prev_part_no > 1) {
@@ -448 +445 @@
             } else if (curr_part_no > 5
                        || (curr_part_no <= 4 && prev_part_no > 0)) {
-                sprintf(tmp, " Gap between %s%d and %d.", drive,
+                sprintf(tmp, " Gap on %s between %d and %d.", drive,
                         prev_part_no, curr_part_no);
                 log_it(tmp);
@@ -460 +457 @@
         if ((curr_part_no >= 5 && prev_part_no == 4)
             && (strcmp(part_table_fmt, "MBR") == 0)) {
-            sprintf(tmp, " Partition %s4 is occupied.", drive);
+            sprintf(tmp, " Partition 4 of %s is occupied.", drive);
             log_it(tmp);
             strcat(flaws_str, tmp);
@@ -531 +528 @@
     paranoid_free(tmp);
     paranoid_free(device);
-    paranoid_free(mountpoint);
 
     if (res) {