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

Timestamp:

Aug 18, 2009, 2:34:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3327@localhost: bruno | 2009-08-04 00:17:46 +0200
popup_and_get_string and build_partition_name now return an allocated string

File:

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

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

@@ -59 +59 @@
     /*@ buffers ******************************************************** */
     char tmp = NULL;
-    char device[MAX_STR_LEN];
+    char *device = NULL;
     char mountpoint[MAX_STR_LEN];
 
@@ -90 +90 @@
     /* check DD */
     for (cur_sp_no = 'a'; cur_sp_no < 'z'; ++cur_sp_no) {
-        sprintf(device, "%s%c", drive, cur_sp_no);
-        if (find_device_in_mountlist(mountlist, device) >= 0)
+        mr_asprintf(&device, "%s%c", drive, cur_sp_no);
+        if (find_device_in_mountlist(mountlist, device) >= 0) {
             foundsome = TRUE;
+        }
+        mr_free(device);
     }
     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) {
+                mr_free(device);
                 continue;
             }
@@ -156 +159 @@
                 res++;
             }
+            mr_free(device);
+
             amount_allocated += mountlist->el[pos].size / 1024L;
             prev_sp_no = cur_sp_no;
@@ -163 +168 @@
     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);
-            if (find_device_in_mountlist(mountlist, device) >= 0)
+            mr_asprintf(&tmp, "%ss%i%c", device, curr_part_no, cur_sp_no);
+            if (find_device_in_mountlist(mountlist, tmp) >= 0) {
                 npos++;
-        }
+            }
+            mr_free(tmp);
+        }
+        mr_free(device);
+
         if (((pos >= 0) || npos) && foundsome) {
             mr_strcat(flaws_str, " %s has both DD and PC-style partitions.", drive);
@@ -176 +185 @@
         }
 
-        build_partition_name(device, drive, curr_part_no);
+        device = build_partition_name(drive, curr_part_no);
         strcpy(mountpoint, mountlist->el[pos].mountpoint);
         if (pos > 0 && !npos) {
@@ -256 +265 @@
             /* 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_free(device);
+                mr_asprintf(device, "%ss%d%c", drive, curr_part_no, cur_sp_no);
                 pos = find_device_in_mountlist(mountlist, device);
                 if (pos < 0) {
@@ -321 +331 @@
             }
         }
+        mr_free(device);
 
         /* OK, continue with main loop */
@@ -380 +391 @@
     mr_asprintf(&flaws_str, "%s", "");
 
-    malloc_string(device);
     prev_part_no = 0;
 
@@ -391 +401 @@
         log_msg(1, tmp);
         mr_free(tmp);
-        goto endoffunc;
+        return(flaws_str);
     } else {
         mr_asprintf(&tmp, "%s is %ld MB", drive, physical_drive_size);
@@ -399 +409 @@
 
     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) {
@@ -441 +451 @@
         }
         if (device_copies > 1) {
-            mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies),
-                    device);
+            mr_asprintf(&tmp, " %s %s's.", number_to_text(device_copies), device);
             if (!strstr(flaws_str, tmp)) {
                 log_it(tmp);
@@ -482 +491 @@
         amount_allocated += mountlist->el[pos].size / 1024L;
         prev_part_no = curr_part_no;
+        mr_free(device);
     }
 
@@ -499 +509 @@
         mr_free(tmp);
     }
-
-  endoffunc:
-    paranoid_free(device);
 
     if (res) {