Changeset 3859 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondo-rstr-mountlist.c

Timestamp:

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

Author:

Bruno Cornec

Message:

Fix build_partition_name to allocate dynamically and change proto accordingly

File:

• branches/3.3/mondo/src/mondorestore/mondo-rstr-mountlist.c (modified) (10 diffs)

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) {