Changeset 2683 in MondoRescue

Timestamp:

Sep 14, 2010, 2:20:27 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix a bug on exclusion of path with common content (/home and /path/home e.g.) which was handled correctly only in a certain order (John Pearson <johnp_at_gtagalenco.com.au>)

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (1 diff)

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

@@ -2089 +2089 @@
     /* A device special file was not passed in. Process it as a path. */
     case -1:
-        /* we need to add a space after token to be sure our strstr test works correctly */
-        mr_asprintf(&tmp1,"%s ",token);
+        /* we need to add a space efore and after token to be sure our strstr test works correctly */
+        mr_asprintf(&tmp1," %s ",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
-            mr_asprintf(&tmp,"%s ",bkpinfo->exclude_paths);
+            mr_asprintf(&tmp," %s ",bkpinfo->exclude_paths);
             if (strstr(tmp,tmp1) == NULL) {
-                strcat(bkpinfo->exclude_paths, " ");
                 strcat(bkpinfo->exclude_paths, tmp1);
             }
         } else {
             /*  Add the token if not already in the list */
-            mr_asprintf(&tmp,"%s ",bkpinfo->include_paths);
+            mr_asprintf(&tmp," %s ",bkpinfo->include_paths);
             if (strstr(tmp,tmp1) == NULL) {
-                strcat(bkpinfo->include_paths, " ");
                 strcat(bkpinfo->include_paths, tmp1);
             }