Changeset 3859 in MondoRescue for branches/3.3/mondo/src/mondorestore

Timestamp:

Mar 7, 2024, 1:33:54 AM (14 months ago)

Author:

Bruno Cornec

Message:

Fix build_partition_name to allocate dynamically and change proto accordingly

Location:

branches/3.3/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (15 diffs)
• mondo-rstr-mountlist.c (modified) (10 diffs)

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

@@ -1323 +1323 @@
 
 /** buffers *********************************************************/
-char *device_str;
+char *device_str = NULL;
 char *format = NULL;
 char *tmp = NULL;
@@ -1351 +1351 @@
 #endif
 
-malloc_string(device_str);
-
 for (current_devno = 1; current_devno < 99; current_devno++) {
-    build_partition_name(device_str, drivename, current_devno);
+    device_str = build_partition_name(drivename, current_devno);
     lino = find_device_in_mountlist(mountlist, device_str);
 
@@ -1377 +1375 @@
                                                  drivename,
                                                  0);
-                    char command[MAX_STR_LEN];
-                    sprintf(command, "disklabel -B %s",
-                            basename(drivename));
+                    mr_asprintf(command, "disklabel -B %s", basename(drivename));
                     if (system(command)) {
                         log_to_screen
                             ("Warning! Unable to make the drive bootable.");
                     }
-                    paranoid_free(device_str);
+                    mr_free(command);
+                    mr_free(device_str);
                     return r;
                 }
             }
             for (c = 'a'; c <= 'z'; c++) {
-                mr_assprintf(subdev_str, "%s%c", device_str, c);
+                mr_asprintf(subdev_str, "%s%c", device_str, c);
                 if (find_device_in_mountlist(mountlist, subdev_str) > 0) {
                     fbsd_part = TRUE;
@@ -1469 +1466 @@
         if (current_devno == 5 && previous_devno == 4) {
             log_to_screen("You must leave at least one partition spare as the Extended partition.");
-            paranoid_free(device_str);
+            mr_free(device_str);
             mr_free(format);
             return (1);
@@ -1492 +1489 @@
 
     previous_devno = current_devno;
+    mr_free(device_str);
 }
 
@@ -1529 +1527 @@
     }
 }
-paranoid_free(device_str);
 return (retval);
 }
@@ -1550 +1547 @@
 /** buffers **********************************************************/
 char *program = NULL;
-char *partition_name;
+char *partition_name = NULL;
 char *tmp = NULL;
 char *output = NULL;
@@ -1570 +1567 @@
 }
 
-malloc_string(partition_name);
-build_partition_name(partition_name, drive, partno);
+partition_name = build_partition_name(drive, partno);
 if (partsize <= 0) {
     mr_asprintf(tmp, "Partitioning device %s (max size)", partition_name);
@@ -1583 +1579 @@
 if (is_this_device_mounted(partition_name)) {
     log_to_screen("%s is mounted, and should not be partitioned", partition_name);
-    paranoid_free(partition_name);
+    mr_free(partition_name);
     return (1);
 }
@@ -1603 +1599 @@
             if (prev_partno >= 4) {
                 log_to_screen("You need to leave at least one partition free, for 'extended/logical'");
-                paranoid_free(partition_name);
+                mr_free(partition_name);
                 paranoid_free(output);
                 return (1);
@@ -1712 +1708 @@
 mr_free(program);
 mr_free(output);
+mr_free(partition_name);
 
 g_current_progress++;
 log_it("partition_device() --- leaving");
-paranoid_free(partition_name);
 return (retval);
 }
@@ -1804 +1800 @@
 
 /** buffers *********************************************************/
-char *partition;
+char *partition = NULL;
 char *command = NULL;
 char *output = NULL;
@@ -1821 +1817 @@
 assert(format != NULL);
 
-malloc_string(partition);
-
-build_partition_name(partition, drive, partno);
+partition = build_partition_name(drive, partno);
 if (strcmp(format, "swap") == 0) {
     mr_asprintf(partcode, "82");
@@ -1872 +1866 @@
 }
 log_msg(1, "Setting %s's type to %s (%s)", partition, format, partcode);
+mr_free(partition);
+
 if ((strcmp(partcode,"") != 0) && strcmp(partcode, "83")) { /* no need to set type if 83: 83 is default */
 
@@ -1925 +1921 @@
 }
 mr_free(partcode);
-
-paranoid_free(partition);
 
 return (res);

branches/3.3/mondo/src/mondorestore/mondo-rstr-mountlist.c

@@ -54 +54 @@
 
     /*@ buffers ******************************************************** */
-    char tmp = NULL;
-    char tmp1 = NULL;
-    char device[MAX_STR_LEN];
+    char *tmp = NULL;
+    char *tmp1 = NULL;
+    char *device = NULL;
 
     char *flaws_str = NULL;
@@ -86 +86 @@
     /* check DD */
     for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-        sprintf(device, "%s%c", drive, cur_sp_no);
+        mr_asprintf(device, "%s%c", drive, cur_sp_no);
         if (find_device_in_mountlist(mountlist, device) >= 0)
             foundsome = TRUE;
@@ -92 +92 @@
     if (foundsome) {
         for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-            sprintf(device, "%s%c", drive, cur_sp_no);
+            mr_asprintf(device, "%s%c", drive, cur_sp_no);
             pos = find_device_in_mountlist(mountlist, device);
             if (pos < 0) {
@@ -160 +160 @@
     npos = pos = 0;
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        build_partition_name(device, drive, curr_part_no);
+        device = build_partition_name(drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         npos = 0;
         for (cur_sp_no = 'a'; cur_sp_no <= 'h'; cur_sp_no++) {
-            sprintf(device, "%ss%i%c", device, curr_part_no, cur_sp_no);
+            mr_asprintf(device, "%ss%i%c", device, curr_part_no, cur_sp_no);
             if (find_device_in_mountlist(mountlist, device) >= 0)
                 npos++;
@@ -170 +170 @@
         if (((pos >= 0) || npos) && foundsome) {
             mr_strcat(flaws_str, " %s has both DD and PC-style partitions.", drive);
+            mr_free(device);
             return(flaws_str);      // fatal error
         }
 
-        build_partition_name(device, drive, curr_part_no);
         if (pos > 0 && !npos) {
             /* gap in the partition list? */
@@ -255 +255 @@
             /* Check subpartitions */
             for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-                sprintf(device, "%ss%d%c", drive, curr_part_no, cur_sp_no);
+                mr_asprintf(device, "%ss%d%c", drive, curr_part_no, cur_sp_no);
                 pos = find_device_in_mountlist(mountlist, device);
                 if (pos < 0) {
@@ -344 +344 @@
         }
         prev_part_no = curr_part_no;
+        mr_free(device);
     }
 
@@ -397 +398 @@
     mr_asprintf(flaws_str, "%s", "");
 
-    malloc_string(device);
     prev_part_no = 0;
 
@@ -421 +421 @@
 
     for (curr_part_no = 1; curr_part_no < 99; curr_part_no++) {
-        build_partition_name(device, drive, curr_part_no);
+        device = build_partition_name(drive, curr_part_no);
         pos = find_device_in_mountlist(mountlist, device);
         if (pos < 0) {
@@ -520 +520 @@
 
   endoffunc:
-    paranoid_free(device);
+    mr_free(device);
 
     if (res == 0) {