Changeset 2206 in MondoRescue

Timestamp:

May 14, 2009, 4:23:28 AM (16 years ago)

Author:

Bruno Cornec

Message:

-Improvements in tests for mountlist

• escape remaining chars [{&...

Location:

branches/2.2.9/mondo

Files:

• src/common/libmondo-filelist.c (modified) (2 diffs)
• src/common/libmondo-mountlist.c (modified) (5 diffs)
• src/mondorestore/mondo-rstr-tools.c (modified) (1 diff)
• test/test-mountlist.c (modified) (2 diffs)

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

@@ -483 +483 @@
         }
         log_msg(8, "Analyzing %s", file_to_analyze);
-        tmp = mr_stresc(file_to_analyze, "`$\\\"()'|!#~", '\\');
+        tmp = mr_stresc(file_to_analyze, "`$\\\"(){}[]'*?&|!#~", '\\');
         (void)asprintf(&strtmp, syscall_sprintf, tmp);
         paranoid_free(tmp);
@@ -1378 +1378 @@
     time_t this_time;
 
-    dir = mr_stresc(dir1, "`$\\\"()'|!#~", '\\');
+    dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
     p = strrchr(dir, '/');
     if (p) {

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

@@ -673 +673 @@
 
         (void) truncate_to_drive_name(drive);
+        log_msg(8, "drive truncated to %s", drive);
+
         for (j = 0;
              j < noof_drives
              && strcmp(drivelist->el[j].device, drive) != 0; j++) {
-            paranoid_free(drive);
             continue;
         }
         if (j == noof_drives) {
-            strcpy(drivelist->el[noof_drives++].device, drive);
+            strncpy(drivelist->el[noof_drives++].device, drive, 63);
         }
         paranoid_free(drive);
@@ -817 +818 @@
         if (res < 5) {
             /* no label found */
-            asprintf(&tmp, "%s", "");
-            mountlist->el[items].label = tmp;
+            log_msg(4, "no label found for %s",mountlist->el[items].device);
+            strcpy(mountlist->el[items].label,"");
         }
 #elif __FreeBSD__
@@ -826 +827 @@
                mountlist->el[items].mountpoint,
                mountlist->el[items].format, siz);
-        asprintf(&tmp, "%s", "");
-        mountlist->el[items].label = tmp;
+        strcpy(mountlist->el[items].label,"");
 #endif
 
@@ -846 +846 @@
         if (mountlist->el[items].device[0] != '\0'
             && mountlist->el[items].device[0] != '#') {
-            if (items >= ARBITRARY_MAXIMUM) {
-                log_to_screen("Too many lines in mountlist.. ABORTING");
-                finish(1);
-            }
             for (j = 0;
                  j < items
@@ -884 +880 @@
                      mountlist->el[items].label);
             items++;
+            if (items >= MAX_MOUNTLIST_ENTRIES) {
+                log_to_screen("Too many lines in mountlist.. ABORTING");
+                finish(1);
+            }
         }
         (void) fgets(incoming, MAX_STR_LEN - 1, fin);

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -2205 +2205 @@
     char *ramdisk_fname;
     char *mountlist_file;
-    bool extract_mountlist_stub;
-    bool extract_i_want_my_lvm;
+    bool extract_mountlist_stub = FALSE;
+    bool extract_i_want_my_lvm = FALSE;
 
     bool try_plan_B;

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

@@ -45 +45 @@
     asprintf(&MONDO_LOGFILE,"/tmp/mrtest-mountlist.log");
 
+    /* Globals */
     g_loglevel = 99;
     g_text_mode = FALSE;
+    g_main_pid = getpid();
+
     if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
         fatal_error("Cannot malloc mountlist");
@@ -57 +60 @@
 setup_newt_stuff();
 asprintf(&g_mountlist_fname, "/tmp/mountlist.txt");
+log_it("before mountlist");
 load_mountlist(mountlist, g_mountlist_fname);
+log_it("after mountlist");
 resize_mountlist_proportionately_to_suit_new_drives(mountlist);
+log_it("after resize_mountlist_proportionately_to_suit_new_drives");
 load_raidtab_into_raidlist(raidlist, RAIDTAB_FNAME);
+log_it("after load_raidtab_into_raidlist");
 edit_mountlist(g_mountlist_fname, mountlist, raidlist);
+log_it("after edit_mountlist");
 exit(0);
 }