Changeset 2713 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-cli.c

Timestamp:

Feb 2, 2011, 12:35:51 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #444. mondoarchive now supports inclusion/exclusion of dirs with spaces in their name. this required a syntax change for the -E/-I options where the list of dirs needs to be separated by '|' now instead of ' '.

File:

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

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

@@ -277 +277 @@
         }
         if (bkpinfo->include_paths[0]) {
-            strcat(bkpinfo->include_paths, " ");
+            strcat(bkpinfo->include_paths, "|");
         }
 
@@ -286 +286 @@
         /* Cut the flag_val['I'] in parts containing all paths to test them */
         while (p != NULL) {
-            q = strchr(p, ' ');
+            q = strchr(p, '|');
             if (q != NULL) {
                 *q = '\0';
@@ -612 +612 @@
             log_to_screen("Please supply a sensible value with '-E'\n");
         }
-        mr_strcat(bkpinfo->exclude_paths, " ");
         mr_asprintf(&tmp1, "%s", flag_val['E']);
 
@@ -620 +619 @@
         /* Cut the flag_val['E'] in parts containing all paths to test them */
         while (p != NULL) {
-            q = strchr(p, ' ');
+            q = strchr(p, '|');
             if (q != NULL) {
                 *q = '\0';
@@ -655 +654 @@
     if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude Network mounts & devices
     {
-        mr_asprintf(&psz, "%s", list_of_NETFS_mounts_only());
-        mr_strcat(bkpinfo->exclude_paths, "%s ", psz);
-        mr_free(psz);
+        psz = list_of_NETFS_mounts_only();
+        log_msg(5, "-N means we'll exclude %s", psz);
+        if (bkpinfo->exclude_paths) {
+            mr_strcat(bkpinfo->exclude_paths, "|%s", psz);
+            mr_free(psz);
+        } else {
+            bkpinfo->exclude_paths = psz;
+        }
 
         if (bkpinfo->exclude_paths != NULL) {