Changeset 2715 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-cli.c

Timestamp:

Feb 2, 2011, 1:18:23 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Document in man page and HOWTO the previous syntax modifications for -E/-I options and '|' separator
• 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 ' '.
• Fix issus with mindi when launched from a dir containing spaces
• Fix a but when no -E option is give on CLI (null) string generated
• Fix #459 by correcting an old README containing info on the edit-mountlist binary which doesn't exist.

svn merge -r 2709:2714 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.9 .

File:

• branches/2.2.10/mondo/src/common/libmondo-cli.c (modified) (3 diffs)

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

@@ -268 +268 @@
         /* 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';
@@ -590 +590 @@
         /* 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';
@@ -625 +625 @@
     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) {