Changeset 2715 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.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-filelist.c (modified) (9 diffs)

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

@@ -1283 +1283 @@
     mr_asprintf(sz_res, "%s", incoming);
     p = sz_res;
-    while ((*p != ' ' || in_quotes) && *p != '\0') {
+    while ((*p != '|' || in_quotes) && *p != '\0') {
         if (*p == '\"') {
             in_quotes = !in_quotes;
@@ -1311 +1311 @@
 int open_and_list_dir(char *dir1, char *sth, FILE * fout, time_t time_of_last_full_backup) {
 
-    const char delims[] = " ";
+    const char delims[] = "|";
 
     DIR *dip;
@@ -1322 +1322 @@
     static int percentage = 0;
     char *skip_these = NULL;
-    char *new_with_spaces = NULL;
+    char *new_with_pipe;
     char *strtmp;
     char *token;
@@ -1347 +1347 @@
         }
     }
+    mr_asprintf(&find_excludes, "|");
 
     if (!depth) {
-        mr_asprintf(find_excludes, " ");
+        mr_asprintf(find_excludes, "|");
         if (sth != NULL) {
             while((token = mr_strtok(sth, delims, &lastpos))) {
@@ -1417 +1418 @@
 
 //  log_msg(0, "Cataloguing %s", dir);
-    if (sth[0] == ' ') {
-        mr_asprintf(skip_these, "%s", sth);
-    } else {
-        mr_asprintf(skip_these, " %s ", sth);
-    }
-    mr_asprintf(new_with_spaces, " %s ", dir1);
+    mr_asprintf(skip_these, "|%s|", sth);
+    mr_asprintf(new_with_pipe, "|%s|", dir1);
     if ((dip = opendir(dir1)) == NULL) {
         mr_asprintf(tmp,"opendir %s", dir1);
         log_OS_error(tmp);
         mr_free(tmp);
-    } else if (strstr(skip_these, new_with_spaces)) {
+    } else if (strstr(skip_these, new_with_pipe)) {
         log_msg(10, "Found dir ***%s**** excluded", dir1);
         fprintf(fout, "%s\n", dir1);    // if excluded dir then print dir ONLY
@@ -1440 +1437 @@
                 mr_asprintf(new,"%s%s",dir1,dit->d_name);
             }
-            mr_free(new_with_spaces);
-            mr_asprintf(new_with_spaces, " %s ", new);
-            if (strstr(skip_these, new_with_spaces)) {
+            mr_free(new_with_pipe);
+            mr_asprintf(new_with_spaces, "|%s|", new);
+            if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
                 log_msg(10, "Found child dir ***%s**** excluded", new);
-                mr_free(new_with_spaces);
+                mr_free(new_with_pipe);
             } else {
-                mr_free(new_with_spaces);
+                mr_free(new_with_pipe);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
@@ -1474 +1471 @@
         }
     }
-    mr_free(new_with_spaces);
+    mr_free(new_with_pipe);
     mr_free(skip_these);
     mr_free(dir);
@@ -1584 +1581 @@
         mr_free(tmp1);
 
-        mr_asprintf(exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys /dev/shm " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
-        mr_free(tmp2);
+        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE,(excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
@@ -1610 +1606 @@
                 p += strlen(q);
                 paranoid_free(q);
-                while (*p == ' ') {
+                while (*p == '|') {
                     p++;
                 }