Changeset 2316 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.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/mondorestore/mondo-prep.c (modified) (21 diffs)

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

@@ -1457 +1457 @@
 
     /** buffers *********************************************************/
-    char *device_str;
+    char *device_str = NULL;
     char *format;
     char *tmp = NULL;
@@ -1466 +1466 @@
     assert_string_is_neither_NULL_nor_zerolength(drivename);
 
-    malloc_string(device_str);
     malloc_string(format);
 
@@ -1483 +1482 @@
     if (!pout_to_fdisk) {
         log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
-        paranoid_free(device_str);
         paranoid_free(format);
         return (1);
@@ -1489 +1487 @@
 #endif
     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);
 
@@ -1518 +1516 @@
                     }
                     mr_free(command);
-                    paranoid_free(device_str);
+                    mr_free(device_str);
                     paranoid_free(format);
                     return r;
@@ -1547 +1545 @@
                 }
             } else {
+                mr_free(device_str);
                 continue;
             }
 #else
+            mr_free(device_str);
             continue;
 #endif
@@ -1606 +1606 @@
             log_to_screen
                 ("You must leave at least one partition spare as the Extended partition.");
-            paranoid_free(device_str);
+            mr_free(device_str);
             paranoid_free(format);
             return (1);
@@ -1627 +1627 @@
         }
 #endif
+        mr_free(device_str);
 
         previous_devno = current_devno;
@@ -1666 +1667 @@
         }
     }
-    paranoid_free(device_str);
     paranoid_free(format);
     return (retval);
@@ -1690 +1690 @@
     /** buffers **********************************************************/
     char *program = NULL;
-    char *partition_name;
+    char *partition_name = NULL;
     char *tmp = NULL;
     char *output = NULL;
@@ -1701 +1701 @@
     /** end ***************************************************************/
 
-    malloc_string(partition_name);
-
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(format != NULL);
@@ -1714 +1712 @@
         mr_free(tmp);
 
-        paranoid_free(partition_name);
         return (0);
     }
-    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);
@@ -1731 +1728 @@
         log_to_screen(tmp);
         mr_free(tmp);
-        paranoid_free(partition_name);
+        mr_free(partition_name);
         return (1);
     }
@@ -1749 +1746 @@
             if (partno == 5) {
                 if (prev_partno >= 4) {
-                    log_to_screen
-                        ("You need to leave at least one partition free, for 'extended/logical'");
-                    paranoid_free(partition_name);
+                    log_to_screen("You need to leave at least one partition free, for 'extended/logical'");
+                    mr_free(partition_name);
                     paranoid_free(output);
                     return (1);
@@ -1776 +1772 @@
     log_it(tmp);
     mr_free(tmp);
+
     log_it("---fdisk command---");
     log_it(output);
@@ -1867 +1864 @@
     }
     mr_free(program);
+    mr_free(partition_name);
     paranoid_free(output);
 
     g_current_progress++;
     log_it("partition_device() --- leaving");
-    paranoid_free(partition_name);
     return (retval);
 }
@@ -1979 +1976 @@
 {
     /** buffers *********************************************************/
-    char *partition;
+    char *partition = NULL;
     char *command = NULL;
     char *output = NULL;
     char *tmp = NULL;
-    char *partcode;
+    char *partcode = NULL;
 
     /** pointers *********************************************************/
@@ -1997 +1994 @@
     assert(format != NULL);
 
-    malloc_string(partition);
-    malloc_string(partcode);
-
-    build_partition_name(partition, drive, partno);
+    partition = build_partition_name(drive, partno);
     p = (char *) strrchr(partition, '/');
     if (strcmp(format, "swap") == 0) {
-        strcpy(partcode, "82");
+        mr_asprintf(&partcode, "82");
     } else if (strcmp(format, "vfat") == 0) {
         if (partsize / 1024 > 8192) {
-            strcpy(partcode, "c");
+            mr_asprintf(&partcode, "c");
         } else {
-            strcpy(partcode, "b");
+            mr_asprintf(&partcode, "b");
         }
     } else if (strcmp(format, "ext2") == 0
@@ -2016 +2010 @@
                || strcmp(format, "xfs") == 0
                || strcmp(format, "jfs") == 0) {
-        strcpy(partcode, "83");
+        mr_asprintf(&partcode, "83");
     } else if (strcmp(format, "minix") == 0) {
-        strcpy(partcode, "81");
+        mr_asprintf(&partcode, "81");
     } else if (strcmp(format, "vmfs3") == 0) {
-        strcpy(partcode, "fb");
+        mr_asprintf(&partcode, "fb");
     } else if (strcmp(format, "vmkcore") == 0) {
-        strcpy(partcode, "fc");
+        mr_asprintf(&partcode, "fc");
     } else if (strcmp(format, "raid") == 0) {
-        strcpy(partcode, "fd");
+        mr_asprintf(&partcode, "fd");
     } else if (strcmp(format, "ntfs") == 0) {
-        strcpy(partcode, "7");
+        mr_asprintf(&partcode, "7");
     } else if ((strcmp(format, "ufs") == 0)
                || (strcmp(format, "ffs") == 0)) {   /* raid autodetect */
-        strcpy(partcode, "a5");
+        mr_asprintf(&partcode, "a5");
     } else if (strcmp(format, "lvm") == 0) {
-        strcpy(partcode, "8e");
+        mr_asprintf(&partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        partcode[0] = '\0';
+        mr_asprintf(&partcode, "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
-        strcpy(partcode, format);
+        mr_asprintf(&partcode, format);
     } else {
         /* probably an image */
@@ -2042 +2036 @@
         mr_free(tmp);
 #ifdef __FreeBSD__
-        strcpy(partcode, format);   // was a5
+        mr_asprintf(&partcode, format); // was a5
 #else
-        strcpy(partcode, format);   // was 83
+        mr_asprintf(&partcode, format); // was 83
 #endif
     }
     log_msg(1, tmp, "Setting %s's type to %s (%s)", partition, format, partcode);
-    if (partcode[0] != '\0' && strcmp(partcode, "83")) {    /* no need to set type if 83: 83 is default */
+    mr_free(partition);
+
+    if (partcode != NULL && strcmp(partcode, "83")) {   /* no need to set type if 83: 83 is default */
 
         if (pout_to_fdisk) {
@@ -2104 +2100 @@
     }
 
-    paranoid_free(partition);
-    paranoid_free(partcode);
-
+    mr_free(partcode);
     return (res);
 }