Changeset 2934 in MondoRescue

Timestamp:

Jan 25, 2012, 12:46:02 AM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix #579 by checking with pipes on both sides of the string

File:

• branches/3.0/mondo/src/common/libmondo-devices.c (modified) (4 diffs)

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

@@ -2063 +2063 @@
 char *tmp = NULL;
 char *tmp1 = NULL;
+char *tmp2 = NULL;
 
 if (pathlist == NULL) {
@@ -2119 +2120 @@
         /*  Adds a | to ensure correct detection even at both ends */
         mr_asprintf(&tmp1,"|%s",token);
+        mr_asprintf(&tmp2,"|%s|",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
             mr_asprintf(&tmp,"|%s|",bkpinfo->exclude_paths);
-            if (strstr(tmp,tmp1) == NULL) {
+            if (strstr(tmp,tmp2) == NULL) {
                 if (bkpinfo->exclude_paths) {
                     mr_strcat(bkpinfo->exclude_paths,tmp1);
@@ -2133 +2135 @@
             /*  Add the token if not already in the list */
             mr_asprintf(&tmp,"|%s|",bkpinfo->include_paths);
-            if (strstr(tmp,tmp1) == NULL) {
+            if (strstr(tmp,tmp2) == NULL) {
                 strcat(bkpinfo->include_paths,tmp1);
             }
@@ -2139 +2141 @@
         }
         mr_free(tmp);
+        mr_free(tmp2);
         break;
     }