Changeset 2825 in MondoRescue

Timestamp:

May 20, 2011, 2:38:14 AM (14 years ago)

Author:

Bruno Cornec

Message:

• if -E option for mondoarchive was not specified, variable excp points to NULL, so string exclude_pathes contained '(null)' instead of being avoided (derived from a patch from taguchi_at_ff.iij4u.or.jp)

File:

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

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

@@ -1616 +1616 @@
         paranoid_free(tmp1);
 
-        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);
+        mr_asprintf(&exclude_paths, MONDO_CACHE"|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        if (excp != NULL) {
+            mr_strcat(exclude_paths,"|%s",excp);
+        }
         paranoid_free(tmp2);