Changeset 2525 in MondoRescue

Timestamp:

Jan 7, 2010, 5:45:43 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3732@localhost: bruno | 2010-01-07 13:25:24 +0100

• Fix #381 by postfixing spaces at the end of the strings to be cheked in strstr

File:

• branches/2.2.9/mondo/src/common/libmondo-devices.c (modified) (2 diffs)

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

@@ -1947 +1947 @@
 char *not_mounted_on_dsf = NULL;
 char token_chars[] =" \t\r\f\a\0\n";
+char *tmp = NULL;
+char *tmp1 = NULL;
 
 while ((token = mr_strtok(pathlist, token_chars, &lastpos)) != NULL) {
@@ -1990 +1992 @@
     /* 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);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
-            if (strstr(bkpinfo->exclude_paths,token) == NULL) {
+            mr_asprintf(&tmp,"%s ",bkpinfo->exclude_paths);
+            if (strstr(tmp,tmp1) == NULL) {
                 strcat(bkpinfo->exclude_paths, " ");
-                strcat(bkpinfo->exclude_paths, token);
-                strcat(bkpinfo->exclude_paths, " ");
+                strcat(bkpinfo->exclude_paths, tmp1);
             }
         } else {
             /*  Add the token if not already in the list */
-            if (strstr(bkpinfo->include_paths,token) == NULL) {
+            mr_asprintf(&tmp,"%s ",bkpinfo->include_paths);
+            if (strstr(tmp,tmp1) == NULL) {
                 strcat(bkpinfo->include_paths, " ");
-                strcat(bkpinfo->include_paths, token);
-                strcat(bkpinfo->include_paths, " ");
-            }
-        }
+                strcat(bkpinfo->include_paths, tmp1);
+            }
+        }
+        mr_free(tmp);
+        mr_free(tmp1);
         break;
     }