Changeset 3237 in MondoRescue

Timestamp:

Jan 3, 2014, 5:44:13 PM (11 years ago)

Author:

Bruno Cornec

Message:

which_partition_format now returns a dynamically allocated string which is then used consistently across the project

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-mountlist.c (modified) (3 diffs)
• mondorestore/mondo-prep.c (modified) (2 diffs)

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -3264 +3264 @@
 char *which_partition_format(const char *drive)
 {
-    static char output[4];
+    char *output = NULL;
     char *tmp = NULL;
     char *command;
@@ -3277 +3277 @@
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     if (strstr(tmp, "GPT") == NULL) {
-        strcpy(output, "MBR");
+        mr_asprintf(output, "%s", "MBR");
     } else {
-        strcpy(output, "GPT");
+        mr_asprintf(output, "%s", "GPT");
     }
     mr_free(tmp);

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

@@ -67 +67 @@
 
     /*@ pointers ******************************************************* */
-    char *part_table_fmt;
+    char *part_table_fmt = NULL;
 
     /*@ initialize ***************************************************** */
@@ -195 +195 @@
             part_table_fmt = which_partition_format(drive);
             /* no spare primary partitions to help accommodate the logical(s)? */
-            if ((curr_part_no >= 5 && prev_part_no == 4)
-                && (strcmp(part_table_fmt, "MBR") == 0)) {
+            if ((curr_part_no >= 5 && prev_part_no == 4) && (strcmp(part_table_fmt, "MBR") == 0)) {
                 mr_asprintf(tmp, " Partition %ss4 is occupied.", drive);
                 log_it(tmp);
@@ -203 +202 @@
                 res++;
             }
+            mr_free(part_table_fmt);
+
             /* does partition /dev/adXsY exist more than once in the mountlist? */
             for (i = 0, device_copies = 0;

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

@@ -1755 +1755 @@
     /** pointers **********************************************************/
     char *p;
-    char *part_table_fmt;
+    char *part_table_fmt = NULL;
     FILE *fout;
 
@@ -1844 +1844 @@
         }
     }
+    mr_free(part_table_fmt);
+
     mr_strcat(output, "\n");    /*start block (ENTER for next free blk */
     if (partsize > 0) {