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

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

@@ -1295 +1295 @@
     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;
@@ -1326 +1326 @@
                       time_t time_of_last_full_backup)
 {
-    const char delims[] = " ";
+    const char delims[] = "|";
 
     DIR *dip;
@@ -1336 +1336 @@
     static int percentage = 0;
     char *skip_these;
-    char *new_with_spaces;
+    char *new_with_pipe;
     char *strtmp;
     char *token;
@@ -1434 +1434 @@
 
 //  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);
         paranoid_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
@@ -1457 +1454 @@
                 mr_asprintf(&new,"%s%s",dir1,dit->d_name);
             }
-            paranoid_free(new_with_spaces);
-            mr_asprintf(&new_with_spaces, " %s ", new);
-            if (strstr(skip_these, new_with_spaces)) {
+            paranoid_free(new_with_pipe);
+            mr_asprintf(&new_with_pipe, "|%s|", new);
+            if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
                 log_msg(10, "Found child dir ***%s**** excluded", new);
-                paranoid_free(new_with_spaces);
+                paranoid_free(new_with_pipe);
             } else {
-                paranoid_free(new_with_spaces);
+                paranoid_free(new_with_pipe);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
@@ -1497 +1494 @@
         }
     }
-    paranoid_free(new_with_spaces);
+    paranoid_free(new_with_pipe);
     paranoid_free(skip_these);
     mr_free(dir);
@@ -1538 +1535 @@
     char *p, *q;
     char *sz_datefile;
-    char *sz_filelist, *exclude_paths, *tmp;
+    char *sz_filelist, *tmp;
+    char *exclude_paths = NULL;
     int i;
     FILE *fout;
@@ -1549 +1547 @@
     malloc_string(tmp);
     malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
     mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
@@ -1619 +1614 @@
         paranoid_free(tmp1);
 
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media /tmp \
-/proc /sys /dev/shm " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(&exclude_paths, MONDO_CACHE"|%s|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE,excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
         paranoid_free(tmp2);
 
@@ -1648 +1641 @@
                 p += strlen(q);
                 paranoid_free(q);
-                while (*p == ' ') {
+                while (*p == '|') {
                     p++;
                 }