Changeset 465 in MondoRescue

Timestamp:

Apr 8, 2006, 10:58:50 PM (19 years ago)

Author:

bcornec

Message:

options -I and -E of mondoarchive were not working. Now fixed

File:

• branches/stable/mondo/mondo/mondoarchive/mondo-cli.c (modified) (3 diffs)

branches/stable/mondo/mondo/mondoarchive/mondo-cli.c

@@ -356 +356 @@
     /*@ buffers ** */
     char *tmp;
+    char *tmp1;
     char *psz;
 
@@ -442 +443 @@
             strcat(bkpinfo->include_paths, " ");
         }
-        if (stat(flag_val['I'], &buf) != 0) {
-            log_msg(1, "ERROR ! %s doesn't exist", flag_val['I']);
-            fatal_error("ERROR ! You specified a directory to include which doesn't exist");
-        }
+        asprintf(&tmp1, flag_val['I']);
+        char *p = tmp1;
+        char *q = tmp1;
+
+        /* Cut the flag_val['I'] in parts containing all paths to test them */
+        while (p != NULL) {
+            q = strchr(p, ' ');
+            if (q != NULL) {
+                *q = '\0';
+                p = q+1 ;
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    fatal_error("ERROR ! You specified a directory to include which doesn't exist");
+                }
+            } else {
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "ERROR ! %s doesn't exist", p);
+                    fatal_error("ERROR ! You specified a directory to include which doesn't exist");
+                }
+                p = NULL;
+            }
+        }
+        paranoid_free(tmp1);
+
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
                 flag_val['I'],
@@ -659 +680 @@
             strcat(bkpinfo->exclude_paths, " ");
         }
-        if (stat(flag_val['E'], &buf) != 0) {
-            log_msg(1, "WARNING ! %s doesn't exist", flag_val['E']);
-        }
+        asprintf(&tmp1, flag_val['E']);
+        char *p = tmp1;
+        char *q = tmp1;
+
+        /* Cut the flag_val['E'] in parts containing all paths to test them */
+        while (p != NULL) {
+            q = strchr(p, ' ');
+            if (q != NULL) {
+                *q = '\0';
+                p = q+1 ;
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                }
+            } else {
+                if (stat(p, &buf) != 0) {
+                    log_msg(1, "WARNING ! %s doesn't exist", p);
+                }
+                p = NULL;
+            }
+        }
+        paranoid_free(tmp1);
+
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
                 flag_val['E'],