Changeset 2204 in MondoRescue

Timestamp:

May 13, 2009, 12:26:33 PM (15 years ago)

Author:

Bruno Cornec

Message:

First set of improvements for mountlist management (test with valgrind). Fix errors on scanf usage. More to come.

Location:

branches/2.2.9/mondo

Files:

• src/common/libmondo-mountlist.c (modified) (25 diffs)
• test/Makefile.am (modified) (1 diff)
• test/test-mountlist.c (modified) (5 diffs)

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

@@ -357 +357 @@
 
     /*@ pointers ******************************************************* */
-    char *part_table_fmt;
+    char *part_table_fmt = NULL;
 
     /*@ initialize ***************************************************** */
@@ -490 +490 @@
 
 
-
 /**
  * Evaluate a whole mountlist for flaws. Calls evaluate_drive_within_mountlist()
@@ -565 +564 @@
     /*@ int ************************************************************** */
     int i = 0;
-    char *tmp;
-    char *flaws_str;
-
-    malloc_string(tmp);
-    malloc_string(flaws_str);
 
     assert(mountlist != NULL);
@@ -577 +571 @@
          && strcmp(mountlist->el[i].device, device) != 0; i++);
 
-    paranoid_free(tmp);
-    paranoid_free(flaws_str);
-
     if (i == mountlist->entries) {
         return (-1);
@@ -586 +577 @@
     }
 }
-
-
-
 
 
@@ -610 +598 @@
 
     /*@ buffetr ********************************************************* */
-    char *curr_mountpoint;
-    char *tmp;
-
-    malloc_string(curr_mountpoint);
-    malloc_string(tmp);
+    char *curr_mountpoint = NULL;
+    char *tmp = NULL;
+
     assert(mountlist != NULL);
     assert(flaws_str != NULL);
+
     for (currline = 0; currline < mountlist->entries; currline++) {
-        strcpy(curr_mountpoint, mountlist->el[currline].mountpoint);
+        asprintf(&curr_mountpoint, "%s", mountlist->el[currline].mountpoint);
         for (i = 0, copies = 0, last_copy = -1; i < mountlist->entries;
              i++) {
@@ -630 +617 @@
         if (copies > 1 && last_copy == currline
             && strcmp(curr_mountpoint, "raid")) {
-            sprintf(tmp, " %s %s's.", number_to_text(copies),
+            asprintf(&tmp, " %s %s's.", number_to_text(copies),
                     curr_mountpoint);
             strcat(flaws_str, tmp);
             log_it(tmp);
+            paranoid_free(tmp);
             res++;
         }
-    }
-    paranoid_free(curr_mountpoint);
-    paranoid_free(tmp);
+        paranoid_free(curr_mountpoint);
+    }
     return (res);
 }
@@ -660 +647 @@
 
     /*@ buffers ********************************************************* */
-    char *drive;
-    char *tmp;
+    char *drive = NULL;
 
     long long size;
 
-    malloc_string(drive);
-    malloc_string(tmp);
     assert(mountlist != NULL);
     assert(drivelist != NULL);
@@ -672 +656 @@
     for (lino = 0, noof_drives = 0; lino < mountlist->entries; lino++) {
 
-        strcpy(drive, mountlist->el[lino].device);
+        asprintf(&drive, "%s", mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
-            sprintf(tmp,
-                    "Not putting %s in list of drives: it's a virtual drive",
+            log_msg(8, "Not putting %s in list of drives: it's a virtual drive",
                     drive);
-            log_msg(8, tmp);
             continue;
         }
@@ -683 +665 @@
         size = mountlist->el[lino].size;
         if (size == 0) {
-            sprintf(tmp,
+            log_msg(8,
                     "Not putting %s in list of drives: it has zero size (maybe an LVM volume)",
                     drive);
-            log_msg(8, tmp);
             continue;
         }
 
-        sprintf(tmp,
-                "Putting %s with size %lli in list of drives",
+        log_msg(8, "Putting %s with size %lli in list of drives",
                 drive, size);
-        log_msg(8, tmp);
 
         (void) truncate_to_drive_name(drive);
@@ -706 +685 @@
     drivelist->entries = noof_drives;
     log_msg(8, "Made list of drives");
-    paranoid_free(drive);
-    paranoid_free(tmp);
 
     return (noof_drives);
 }
-
-
-
-
 
 
@@ -738 +711 @@
 
     /*@ buffers ********************************************************* */
-    char *tmp;
-
-    malloc_string(tmp);
+    char *tmp = NULL;
+
     assert(output_list != NULL);
     assert(mountlist != NULL);
@@ -758 +730 @@
                        (void *) &mountlist->el[i],
                        sizeof(struct mountlist_line));
-                sprintf(tmp,
-                        "%s is available; user may choose to add it to raid device",
-                        output_list->el[items - 1].device);
-                log_it(tmp);
+                asprintf(&tmp,
+                         "%s is available; user may choose to add it to raid device",
+                         output_list->el[items - 1].device);
+                log_it(tmp);
+                paranoid_free(tmp);
             }
         }
@@ -767 +740 @@
     output_list->entries = items;
     log_it("MLUORP -- ending");
-    paranoid_free(tmp);
-}
-
-
-
+}
 
 
@@ -800 +769 @@
     }
 }
-
-
 
 
@@ -816 +783 @@
 int load_mountlist(struct mountlist_itself *mountlist, char *fname)
 {
-    FILE *fin;
+    FILE *fin = NULL;
     /* malloc ** */
-    char *incoming;
-    char *siz;
-    char *tmp;
-    char *p;
-
-    int items;
-    int j;
+    char *incoming = NULL;
+    char *siz = NULL;
+    char *tmp = NULL;
+    char *p = NULL;
+
+    int items = 0;
+    int j = 0;
+    int res = 0;
 
     assert(mountlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(fname);
-    malloc_string(incoming);
-    malloc_string(siz);
-    malloc_string(tmp);
+
     if (!(fin = fopen(fname, "r"))) {
         log_it("Unable to open mountlist - '%s'", fname);
         log_to_screen("Cannot open mountlist");
-        paranoid_free(incoming);
-        paranoid_free(siz);
-        paranoid_free(tmp);
         return (1);
     }
-    items = 0;
+    malloc_string(incoming);
+    malloc_string(siz);
     (void) fgets(incoming, MAX_STR_LEN - 1, fin);
     log_it("Loading mountlist...");
     while (!feof(fin)) {
 #if linux
-        sscanf(incoming,
+        res = sscanf(incoming,
                "%s %s %s %s %s",
                mountlist->el[items].device,
@@ -850 +814 @@
                mountlist->el[items].format,
                siz, mountlist->el[items].label);
+        if (res < 5) {
+            /* no label found */
+            asprintf(&(mountlist->el[items].label), "%s", "");
+        }
 #elif __FreeBSD__
-        sscanf(incoming,
+        res = sscanf(incoming,
                "%s %s %s %s",
                mountlist->el[items].device,
                mountlist->el[items].mountpoint,
                mountlist->el[items].format, siz);
-        strcpy(mountlist->el[items].label, "");
+        asprintf(&(mountlist->el[items].label), "%s", "");
 #endif
 
@@ -885 +853 @@
             if (j < items) {
                 strcat(mountlist->el[items].device, "_dup");
-                sprintf(tmp,
-                        "Duplicate entry in mountlist - renaming to %s",
-                        mountlist->el[items].device);
-                log_it(tmp);
-            }
-            strcpy(tmp, mountlist->el[items].device);
+                asprintf(&tmp,
+                         "Duplicate entry in mountlist - renaming to %s",
+                         mountlist->el[items].device);
+                log_it(tmp);
+                paranoid_free(tmp);
+            }
+            asprintf(&tmp, "%s", mountlist->el[items].device);
             if (strstr(tmp, "/dev/md/")) {
                 log_it("format_device() --- Contracting %s", tmp);
@@ -903 +872 @@
                 strcpy(mountlist->el[items].device, tmp);
             }
-
-            sprintf(tmp,
-                    "%s %s %s %lld %s",
-                    mountlist->el[items].device,
-                    mountlist->el[items].mountpoint,
-                    mountlist->el[items].format,
-                    mountlist->el[items].size,
-                    mountlist->el[items].label);
-
-            log_it(tmp);
+            paranoid_free(tmp);
+
+            log_it("%s %s %s %lld %s",
+                     mountlist->el[items].device,
+                     mountlist->el[items].mountpoint,
+                     mountlist->el[items].format,
+                     mountlist->el[items].size,
+                     mountlist->el[items].label);
             items++;
         }
@@ -921 +888 @@
 
     log_it("Mountlist loaded successfully.");
-    sprintf(tmp, "%d entries in mountlist", items);
-    log_it(tmp);
+    log_it("%d entries in mountlist", items);
+
     paranoid_free(incoming);
     paranoid_free(siz);
-    paranoid_free(tmp);
     return (0);
 }
@@ -961 +927 @@
     return (0);
 }
-
 
 
@@ -989 +954 @@
 }
 
+
 /**
  * Sort the mountlist alphabetically by mountpoint.
@@ -1028 +994 @@
 {
     /*@ mallocs *** */
-    char device[64];
-    char mountpoint[256];
-    char format[64];
+    char *device = NULL;
+    char *mountpoint = NULL;
+    char *format = NULL;
 
     long long size;
@@ -1038 +1004 @@
     assert(b >= 0);
 
-    strcpy(device, mountlist->el[a].device);
-    strcpy(mountpoint, mountlist->el[a].mountpoint);
-    strcpy(format, mountlist->el[a].format);
+    asprintf(&device, "%s", mountlist->el[a].device);
+    asprintf(&mountpoint, "%s", mountlist->el[a].mountpoint);
+    asprintf(&format, "%s", mountlist->el[a].format);
 
     size = mountlist->el[a].size;
@@ -1055 +1021 @@
 
     mountlist->el[b].size = size;
+    paranoid_free(device);
+    paranoid_free(mountpoint);
+    paranoid_free(format);
 }
 

branches/2.2.9/mondo/test/Makefile.am

@@ -3 +3 @@
 ## The program
 sbin_PROGRAMS         = mrtest_mountlist
-mrtest_mountlist_SOURCES  = test-mountlist.c
+mrtest_mountlist_SOURCES  = test-mountlist.c ${top_builddir}/src/mondorestore/mondo-prep.c ${top_builddir}/src/mondorestore/mondo-rstr-newt.c ${top_builddir}/src/mondorestore/mondo-rstr-tools.c
 mrtest_mountlist_LDADD    = ${top_builddir}/src/common/libmondo.a @MONDORESTORE_STATIC@

branches/2.2.9/mondo/test/test-mountlist.c

@@ -4 +4 @@
 #include "../common/libmondo.h"
 #include "../mondorestore/mondorestore.h"
+#include "../mondorestore/mr-externs.h"
 
 extern void twenty_seconds_til_yikes(void);
@@ -34 +35 @@
 
 extern char *MONDO_LOGFILE;
-
-void free_MR_global_filenames(void) {
-}
-
 extern int copy_from_src_to_dest(FILE * f_orig, FILE * f_archived,
                                  char direction);
@@ -44 +41 @@
 
     struct mountlist_itself *mountlist = NULL;
+    struct raidlist_itself *raidlist;
+
     asprintf(&MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
 
@@ -51 +50 @@
         fatal_error("Cannot malloc mountlist");
     }
+    if (!(raidlist = malloc(sizeof(struct raidlist_itself)))) {
+        fatal_error("Cannot malloc raidlist");
+    }
     malloc_libmondo_global_strings();
 
@@ -56 +58 @@
 asprintf(&g_mountlist_fname, "/tmp/mountlist.txt");
 load_mountlist(mountlist, g_mountlist_fname);
-finish(0);
+resize_mountlist_proportionately_to_suit_new_drives(mountlist);
+load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+exit(0);
 }