Changeset 2473 in MondoRescue for branches/2.2.9/mondo/src/common

Timestamp:

Nov 10, 2009, 2:13:10 PM (16 years ago)

Author:

Bruno Cornec

Message:

• Fix #363 where exclude_paths was extended up to memory limit dumping core

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (5 diffs)

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

@@ -1946 +1946 @@
 char *mounted_on_dsf = NULL;
 char *not_mounted_on_dsf = NULL;
-char token_chars[] =" \t\r\f\a\0";
+char token_chars[] =" \t\r\f\a\0\n";
 
 while ((token = mr_strtok(pathlist, token_chars, &lastpos)) != NULL) {
@@ -1965 +1965 @@
                 log_to_screen("  %s\n", mounted_on_dsf);
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
+                strcat(bkpinfo->exclude_paths, " ");
                 strcat(bkpinfo->exclude_paths, mounted_on_dsf);
                 strcat(bkpinfo->exclude_paths, " ");
@@ -1977 +1978 @@
                 log_to_screen("Not archiving the following file systems:\n");
                 log_to_screen("  %s\n", not_mounted_on_dsf);
+                strcat(bkpinfo->exclude_paths, " ");
                 strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
                 strcat(bkpinfo->exclude_paths, "");
@@ -1989 +1991 @@
     case -1:
         if (mode == 'E') {
-            strcat(bkpinfo->exclude_paths, token);
-            strcat(bkpinfo->exclude_paths, " ");
+            /*  Add the token if not already in the list */
+            if (strstr(bkpinfo->exclude_paths,token) == NULL) {
+                strcat(bkpinfo->exclude_paths, " ");
+                strcat(bkpinfo->exclude_paths, token);
+                strcat(bkpinfo->exclude_paths, " ");
+            }
         } else {
-            strcat(bkpinfo->include_paths, token);
-            strcat(bkpinfo->include_paths, " ");
+            /*  Add the token if not already in the list */
+            if (strstr(bkpinfo->include_paths,token) == NULL) {
+                strcat(bkpinfo->include_paths, " ");
+                strcat(bkpinfo->include_paths, token);
+                strcat(bkpinfo->include_paths, " ");
+            }
         }
         break;
@@ -2636 +2646 @@
     log_it("prefix = %s", bkpinfo->prefix);
     log_it("compression = %ld", bkpinfo->compression_level);
+    log_it("exclude_path = %s", bkpinfo->exclude_paths);
+    log_it("include_path = %s", bkpinfo->include_paths);
 
     /* Handle devices passed in bkpinfo and print result */
-    mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
-    mr_make_devlist_from_pathlist(bkpinfo->include_paths, 'I');
+    /*  the mr_make_devlist_from_pathlist function appends 
+     *  to the *_paths variables so copy before */
+    mr_asprintf(&tmp, "%s ", bkpinfo->exclude_paths);
+    mr_make_devlist_from_pathlist(tmp, 'E');
+    mr_free(tmp);
+    mr_asprintf(&tmp, "%s ", bkpinfo->include_paths);
+    mr_make_devlist_from_pathlist(tmp, 'I');
+    mr_free(tmp);
 
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);