Changeset 783 in MondoRescue for trunk/mondo/mondo/mondorestore/mondo-prep.c

Timestamp:

Aug 31, 2006, 5:09:20 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Massive rewrite continues for memory management.
• main structure should now have all parameters allocated dynamically
• new lib libmr.a + dir + build process reviewed to support it.
• new include subdir to host external definitions of the new lib
• code now compiles. Still one remaining link issues for mondorestore. This should allow for some tests soon.

(goal is to separate completely reviewed code and functions and provide clean interfaces)

File:

• trunk/mondo/mondo/mondorestore/mondo-prep.c (modified) (23 diffs)

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -9 +9 @@
 
 
-#include "../common/my-stuff.h"
+#include "my-stuff.h"
 #include "../common/mondostructures.h"
 #include "mondoprep.h"
@@ -53 +53 @@
     char *command;
     int lino;
-    int i;
     FILE *fout;
     char *buf;
-    const int blocksize = 512;
     struct list_of_disks *drivelist = NULL;
 // If LVMs are present and a zero-and-reboot wasn't recently undertaken
 // then zero & insist on reboot.
-    buf = malloc(blocksize);
     if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
     {
@@ -89 +86 @@
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
-                for (i = 0; i < blocksize; i++) {
-                    buf[i] = 0;
-                }
-                sprintf(buf, "%s\n", MONDO_WAS_HERE);
+                asprintf(&buf, "%s\n", MONDO_WAS_HERE);
                 fout = fopen(drivelist->el[lino].device, "w+");
                 if (!fout) {
@@ -98 +92 @@
                             drivelist->el[lino].device);
                 } else {
-                    if (1 != fwrite(buf, blocksize, 1, fout)) {
+                    if (1 != fwrite(buf, strlen(buf)+1, 1, fout)) {
                         log_msg(1, "Failed to wipe %s",
                                 drivelist->el[lino].device);
@@ -107 +101 @@
                     fclose(fout);
                 }
+                paranoid_free(buf);
             }
             sync();
@@ -257 +252 @@
     for (getline(&incoming, &n1, fin); !feof(fin); getline(&incoming, &n1, fin)) {
         fgetpos(fin, &orig_pos);
-        /* BERLIOS : Strange no ? */
+        /* we want to execute lines begining with a # */
         if (incoming[0] != '#') {
             continue;
@@ -268 +263 @@
         }
         if ((p = strstr(incoming, "vgcreate"))) {
-// include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
+            // include next line(s) if they end in /dev (cos we've got a broken i-want-my-lvm)
             for (getline(&tmp, &n, fin); !feof(fin); getline(&tmp, &n, fin)) {
                 if (tmp[0] == '#') {
@@ -287 +282 @@
                 }
             }
-            malloc_string(tmp1);
-            strcpy(tmp1, p + strlen("vgcreate") + 1);
+            asprintf(&tmp1, p + strlen("vgcreate") + 1);
             for (q = tmp1; *q > 32; q++);
             *q = '\0';
@@ -294 +288 @@
             asprintf(&tmp, "rm -Rf /dev/%s", tmp1);
             paranoid_free(tmp1);
+
             run_program_and_log_output(tmp, 1);
             paranoid_free(tmp);
@@ -304 +299 @@
         }
         for (p = incoming + 1; *p == ' '; p++);
-        paranoid_free(command);
-        asprintf(&command, p);
+        paranoid_alloc(command,p);
         for (p = command; *p != '\0'; p++);
         for (; *(p - 1) < 32; p--);
         *p = '\0';
+
+        /* BERLIOS: we should rather define LVMv1 or v2 and use it */
         res = run_program_and_log_output(command, 5);
         if (res > 0 && (p = strstr(command, "lvm "))) {
@@ -338 +334 @@
             log_msg(5, "p='%s' --> extents=%ld", p, extents);
             paranoid_free(tmp);
+
             p = strstr(command, "-L");
             if (!p) {
@@ -349 +346 @@
                         *q = ' ';
                     }
+                    /* BERLIOS: Dangerous: no size control !! */
                     sprintf(p, "%ld", extents);
                     i = strlen(p);
@@ -359 +357 @@
                         *(q - 1) = ' ';
                     }
+                    /* BERLIOS: Dangerous: no size control !! */
                     sprintf(p, "%ld%c", extents, 'm');
                     i = strlen(p);
@@ -673 +672 @@
     char *tmp = NULL;
     char *tmp1 = NULL;
+#ifdef __FreeBSD__
     char *line = NULL;
     char *status = NULL;
@@ -679 +679 @@
     size_t n = 0;
     size_t n1 = 0;
+#endif
 
     /** end ****************************************************************/
@@ -1525 +1526 @@
             // If so, then we just call label_drive_or_slice() and return.
             char c;
+            char *command;
+
             if (current_devno == 1) {
                 // try DangerouslyDedicated mode
@@ -1538 +1541 @@
                                                  drivename,
                                                  0);
-                    char command[MAX_STR_LEN];
-                    sprintf(command, "disklabel -B %s",
+                    asprintf(&command, "disklabel -B %s",
                             basename(drivename));
                     if (system(command)) {
@@ -1546 +1548 @@
                              ("Warning! Unable to make the drive bootable."));
                     }
+                    paranoid_free(command);
                     paranoid_free(device_str);
 
@@ -2077 +2080 @@
         asprintf(&partcode, "8e");
     } else if (format[0] == '\0') { /* LVM physical partition */
-        asprintf(&partcode, "");
+        asprintf(&partcode, "%s", "");
     } else if (strlen(format) >= 1 && strlen(format) <= 2) {
         asprintf(&partcode, format);
@@ -2375 +2378 @@
 
     assert_string_is_neither_NULL_nor_zerolength(format);
-    assert(program != NULL);
 
     if (strcmp(format, "swap") == 0) {
 #ifdef __FreeBSD__
-        strcpy(program, "true");
+        asprintf(&program, "true");
 #else
-        strcpy(program, "mkswap");
+        asprintf(&program, "mkswap");
 #endif
     } else if (strcmp(format, "vfat") == 0) {
-        strcpy(program, "format-and-kludge-vfat");
+        asprintf(&program, "format-and-kludge-vfat");
 #ifndef __FreeBSD__
     } else if (strcmp(format, "reiserfs") == 0) {
-        strcpy(program, "mkreiserfs -ff");
+        asprintf(&program, "mkreiserfs -ff");
     } else if (strcmp(format, "xfs") == 0) {
-        strcpy(program, "mkfs.xfs -f -q");
+        asprintf(&program, "mkfs.xfs -f -q");
     } else if (strcmp(format, "jfs") == 0) {
-        strcpy(program, "mkfs.jfs");
+        asprintf(&program, "mkfs.jfs");
     } else if (strcmp(format, "ext3") == 0) {
-        strcpy(program, "mkfs -t ext2 -F -j -q");
+        asprintf(&program, "mkfs -t ext2 -F -j -q");
     } else if (strcmp(format, "minix") == 0) {
-        strcpy(program, "mkfs.minix");
+        asprintf(&program, "mkfs.minix");
 #endif
     } else if (strcmp(format, "ext2") == 0) {
-        strcpy(program, "mke2fs -F -q");
+        asprintf(&program, "mke2fs -F -q");
     } else {
 #ifdef __FreeBSD__
-        sprintf(program, "newfs_%s", format);
+        asprintf(&program, "newfs_%s", format);
 #else
-        sprintf(program, "mkfs -t %s -c", format);  // -c checks for bad blocks
+        asprintf(&program, "mkfs -t %s -c", format);    // -c checks for bad blocks
 #endif
         asprintf(&tmp, "Unknown format (%s) - assuming '%s' will do", format,
@@ -2504 +2506 @@
     }
 
-    /*
-       sprintf (tmp, "cp -f %s %s.pre-resize", g_mountlist_fname, g_mountlist_fname);
-       run_program_and_log_output (tmp, FALSE);
-     */
-
     current_size_of_drive = get_phys_size_of_drive(drive_name);
 
@@ -2600 +2597 @@
     assert(mountlist != NULL);
 
-    if (g_mountlist_fname[0] == '\0') {
+    if (g_mountlist_fname == NULL) {
         log_it
             ("resize_mountlist_prop...() - warning - mountlist fname is blank");
@@ -2648 +2645 @@
     if (c && strncmp(c, "/disc", 5) == 0) {
         /* yup its devfs, change the "disc" to "part" so the existing code works */
-        strcpy(c + 1, "part");
+        strncpy(c + 1, "part", (size_t)5);
     }
     drivemntlist->entries = 0;