Changeset 2334 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

Timestamp:

Aug 18, 2009, 5:28:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3369@localhost: bruno | 2009-08-18 16:57:27 +0200

• Transform bout 100 strcpy in dyn. allocation. Quality is improving
• function figure_out_kernel_path_interactively_if_necessary now return a dynamically allocated string
• mondoarchive checked with valgrind in text an newt modes

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-prep.c (modified) (19 diffs)

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

@@ -192 +192 @@
     char *incoming;
     char *command;
-    char *lvscan_sz;
-    char *lvremove_sz;
-    char *pvscan_sz;
-    char *vgscan_sz;
-    char *vgcreate_sz;
-    char *vgchange_sz;
-    char *vgremove_sz;
-//  char *do_this_last;
+    char *lvscan_sz = NULL;
+    char *lvremove_sz = NULL;
+    char *pvscan_sz = NULL;
+    char *vgscan_sz = NULL;
+    char *vgchange_sz = NULL;
+    char *vgremove_sz = NULL;
 
     /** char **************************************************/
@@ -229 +227 @@
     malloc_string(tmp);
     malloc_string(incoming);
-    malloc_string(lvscan_sz);
-    malloc_string(lvremove_sz);
-    malloc_string(vgscan_sz);
-    malloc_string(pvscan_sz);
-    malloc_string(vgcreate_sz);
-    malloc_string(vgchange_sz);
-    malloc_string(vgremove_sz);
-    command = malloc(512);
+    command = malloc(1024);
 
     log_it("STARTING");
@@ -243 +234 @@
     if (tmp1)   // found it :) cool
     {
-        strcpy(lvscan_sz, "lvm lvscan");
-        strcpy(lvremove_sz, "lvm lvremove");
-        strcpy(vgscan_sz, "lvm vgscan");
-        strcpy(pvscan_sz, "lvm pvscan");
-        strcpy(vgcreate_sz, "lvm vgcreate");
-        strcpy(vgchange_sz, "lvm vgchange");
-        strcpy(vgremove_sz, "lvm vgremove -f");
+        mr_asprintf(lvscan_sz, "lvm lvscan");
+        mr_asprintf(lvremove_sz, "lvm lvremove");
+        mr_asprintf(vgscan_sz, "lvm vgscan");
+        mr_asprintf(pvscan_sz, "lvm pvscan");
+        mr_asprintf(vgchange_sz, "lvm vgchange");
+        mr_asprintf(vgremove_sz, "lvm vgremove -f");
     } else {
-        strcpy(lvscan_sz, "lvscan");
-        strcpy(lvremove_sz, "lvremove");
-        strcpy(vgscan_sz, "vgscan");
-        strcpy(pvscan_sz, "pvscan");
-        strcpy(vgcreate_sz, "vgcreate");
-        strcpy(vgchange_sz, "vgchange");
-        strcpy(vgremove_sz, "vgremove");
+        mr_asprintf(lvscan_sz, "lvscan");
+        mr_asprintf(lvremove_sz, "lvremove");
+        mr_asprintf(vgscan_sz, "vgscan");
+        mr_asprintf(pvscan_sz, "pvscan");
+        mr_asprintf(vgchange_sz, "vgchange");
+        mr_asprintf(vgremove_sz, "vgremove");
     }
     mr_free(tmp1);
 
     mr_asprintf(tmp1, "for i in `%s | cut -d\"'\" -f2 | sort -r` ; do echo \"Shutting down lv $i\" >> %s ; %s -f $i; done", lvscan_sz, MONDO_LOGFILE, lvremove_sz);
+    mr_free(lvscan_sz);
+    mr_free(lvremove_sz);
+
     run_program_and_log_output(tmp1, 5);
     mr_free(tmp1);
 
     sleep(1);
-    sprintf(command,
-            "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> %s ; done", vgscan_sz, vgchange_sz, vgremove_sz, MONDO_LOGFILE);
+    sprintf(command, "for i in `%s | grep -i lvm | cut -d'\"' -f2` ; do %s -a n $i ; %s $i; echo \"Shutting down vg $i\" >> %s ; done", vgscan_sz, vgchange_sz, vgremove_sz, MONDO_LOGFILE);
+    mr_free(vgchange_sz);
+    mr_free(vgremove_sz);
+
     run_program_and_log_output(command, 5);
     if (just_erase_existing_volumes) {
@@ -401 +395 @@
         sleep(1);
     }
+    mr_free(vgscan_sz);
+    mr_free(pvscan_sz);
+
     paranoid_fclose(fin);
     log_msg(1, "Closed i-want-my-lvm. Finished doing funky stuff.");
@@ -407 +404 @@
     paranoid_free(incoming);
     paranoid_free(command);
-    paranoid_free(lvscan_sz);
-    paranoid_free(lvremove_sz);
-    paranoid_free(vgscan_sz);
-    paranoid_free(pvscan_sz);
-    paranoid_free(vgcreate_sz);
-    paranoid_free(vgchange_sz);
-    paranoid_free(vgremove_sz);
     system("sync");
     system("sync");
@@ -829 +819 @@
 
     if (res && strstr(program, "kludge")) {
-        mr_asprintf(&tmp, "Kludge failed; using regular mkfs.%s to format %s", format, device);
+        mr_asprintf(tmp, "Kludge failed; using regular mkfs.%s to format %s", format, device);
         mr_free(program);
 #ifdef __FreeBSD__
@@ -895 +885 @@
 
     assert(mountlist != NULL);
-    mr_asprintf(tmp, "format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
-    log_it(tmp);
-    mr_free(tmp);
+    log_it("format_everything (mountlist, interactively = %s", (interactively) ? "true" : "false");
 
     mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
@@ -1423 +1411 @@
     /** buffers *********************************************************/
     char *device_str = NULL;
-    char *format;
+    char *format = NULL;
     char *tmp = NULL;
 
@@ -1430 +1418 @@
     assert(mountlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(drivename);
-
-    malloc_string(format);
 
     log_it("Partitioning drive %s", drivename);
@@ -1445 +1431 @@
     if (!pout_to_fdisk) {
         log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
-        paranoid_free(format);
         return (1);
     }
@@ -1480 +1465 @@
                     mr_free(command);
                     mr_free(device_str);
-                    paranoid_free(format);
                     return r;
                 }
@@ -1495 +1479 @@
                 int i, line;
 
-                strcpy(format, "ufs");
+                mr_asprintf(format, "ufs");
                 partsize = 0;
                 for (i = 'a'; i < 'z'; ++i) {
@@ -1552 +1536 @@
 #ifdef __FreeBSD__
         if (!fbsd_part) {
-#endif
-
-            strcpy(format, mountlist->el[lino].format);
+            mr_free(format);
+#endif
+
+            mr_asprintf(format, "%s", mountlist->el[lino].format);
             partsize = mountlist->el[lino].size;
 
@@ -1566 +1551 @@
                 ("You must leave at least one partition spare as the Extended partition.");
             mr_free(device_str);
-            paranoid_free(format);
+            mr_free(format);
             return (1);
         }
 #endif
 
-        retval +=
-            partition_device(pout_to_fdisk, drivename, current_devno,
-                             previous_devno, format, partsize);
+        retval += partition_device(pout_to_fdisk, drivename, current_devno, previous_devno, format, partsize);
+        mr_free(format);
 
 #ifdef __FreeBSD__
@@ -1626 +1610 @@
         }
     }
-    paranoid_free(format);
     return (retval);
 }
@@ -1978 +1961 @@
         mr_asprintf(partcode, "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
-        mr_asprintf(partcode, format);
+        mr_asprintf(partcode, "%s", format);
     } else {
         /* probably an image */
@@ -1985 +1968 @@
         mr_free(tmp);
 #ifdef __FreeBSD__
-        mr_asprintf(partcode, format);  // was a5
+        mr_asprintf(partcode, "%s", format);    // was a5
 #else
-        mr_asprintf(partcode, format);  // was 83
+        mr_asprintf(partcode, "%s", format);    // was 83
 #endif
     }
@@ -2260 +2243 @@
 
     /** buffers *********************************************************/
-    char *tmp = NULL;
     char *program = NULL;
 
@@ -2311 +2293 @@
         mr_asprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
 #endif
-        mr_asprintf(tmp, "Unknown format (%s) - assuming '%s' will do", format, program);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Unknown format (%s) - assuming '%s' will do", format, program);
         res = 0;
     }