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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2.2/mondo/src/common/libmondo-mountlist.c
r1298 r1303 202 202 npos = pos = 0; 203 203 for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) { 204 sprintf(device, "%ss%d", drive, curr_part_no);204 build_partition_name(device, drive, curr_part_no); 205 205 pos = find_device_in_mountlist(mountlist, device); 206 206 npos = 0; … … 216 216 } 217 217 218 sprintf(device, "%ss%d", drive, curr_part_no);218 build_partition_name(device, drive, curr_part_no); 219 219 strcpy(mountpoint, mountlist->el[pos].mountpoint); 220 220 if (pos > 0 && !npos) { … … 397 397 char *tmp; 398 398 char *device; 399 char *mountpoint;400 399 401 400 /*@ long *********************************************************** */ … … 413 412 malloc_string(tmp); 414 413 malloc_string(device); 415 malloc_string(mountpoint);416 414 flaws_str[0] = '\0'; 417 415 prev_part_no = 0; … … 438 436 continue; 439 437 } 440 strcpy(mountpoint, mountlist->el[pos].mountpoint);441 438 /* gap in the partition list? */ 442 439 if (curr_part_no - prev_part_no > 1) { … … 448 445 } else if (curr_part_no > 5 449 446 || (curr_part_no <= 4 && prev_part_no > 0)) { 450 sprintf(tmp, " Gap between %s%d and %d.", drive,447 sprintf(tmp, " Gap on %s between %d and %d.", drive, 451 448 prev_part_no, curr_part_no); 452 449 log_it(tmp); … … 460 457 if ((curr_part_no >= 5 && prev_part_no == 4) 461 458 && (strcmp(part_table_fmt, "MBR") == 0)) { 462 sprintf(tmp, " Partition %s4is occupied.", drive);459 sprintf(tmp, " Partition 4 of %s is occupied.", drive); 463 460 log_it(tmp); 464 461 strcat(flaws_str, tmp); … … 531 528 paranoid_free(tmp); 532 529 paranoid_free(device); 533 paranoid_free(mountpoint);534 530 535 531 if (res) {
Note:
See TracChangeset
for help on using the changeset viewer.