Changeset 2715 in MondoRescue

Timestamp:

Feb 2, 2011, 1:18:23 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Document in man page and HOWTO the previous syntax modifications for -E/-I options and '|' separator
• Fix #444. mondoarchive now supports inclusion/exclusion of dirs with spaces in their name. this required a syntax change for the -E/-I options where the list of dirs needs to be separated by '|' now instead of ' '.
• Fix issus with mindi when launched from a dir containing spaces
• Fix a but when no -E option is give on CLI (null) string generated
• Fix #459 by correcting an old README containing info on the edit-mountlist binary which doesn't exist.

svn merge -r 2709:2714 ​svn+ssh://bruno@svn.mondorescue.org/mondo/svn/mondorescue/branches/2.2.9 .

Location:

branches/2.2.10

Files:

• mindi/mindi (modified) (14 diffs)
• mindi/rootfs/README (modified) (1 diff)
• mondo-doc/mondoarchive.8 (modified) (2 diffs)
• mondo-doc/mondorescue-howto.sgml (modified) (5 diffs)
• mondo-doc/mondorestore.8 (modified) (1 diff)
• mondo/src/common/libmondo-cli.c (modified) (3 diffs)
• mondo/src/common/libmondo-devices-EXT.h (modified) (1 diff)
• mondo/src/common/libmondo-devices.c (modified) (12 diffs)
• mondo/src/common/libmondo-devices.h (modified) (1 diff)
• mondo/src/common/libmondo-filelist.c (modified) (9 diffs)

branches/2.2.10/mindi/mindi

@@ -222 +222 @@
 
     mkdir -p $bigdir/etc
-    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd $bigdir ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
+    tar cf - -C / $mappath 2>> $MINDI_TMP/$$.log | (cd "$bigdir" ; tar xf -) || LogAll "AKMF -- Could not copy $mappath to $bigdir" $MINDI_TMP/$$.log
     if [ "`echo $mappath | grep -F ".gz"`" ] ; then
         included_list=`gzip -dc $mappath | grep -Fi include | sed s/'"'// | sed s/'"'// | cut -d' ' -f2`
@@ -266 +266 @@
             find $incoming/* -maxdepth 0 2> /dev/null | CopyDependenciesToDirectory $outdir 0
         elif [ -e "$incoming" ] && [ $found = "false" ]; then
-            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd $outdir ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
+            tar cf - -C / $incoming 2>> $MINDI_TMP/$$.log | (cd "$outdir" ; tar xf -) || Die "Cannot copy $incoming to $outdir - did you run out of disk space?" $MINDI_TMP/$$.log
 
             # Only uncompress modules if not using udevd
@@ -468 +468 @@
     fi
     # Find all files and links (required for some VMWare VMs)
-    modpaths=`find $1 -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2 -type f -o -type l`
+    modpaths=`find "$1" -name $2.*o -o -name $2.o.gz -o -name $2.ko.gz -o -name $2 -type f -o -type l`
     echo "$modpaths"
 }
@@ -580 +580 @@
             LogAll "\nIncorporating post-nuke tarball"
             old_pwd=`pwd`
-            cd $bigdir
+            cd "$bigdir"
             tar -zxf $MINDI_TMP/post-nuke.tgz 2>> $MINDI_TMP/$$.log || LogAll "Error occurred when untarring post-nuke tarball" $MINDI_TMP/$$.log
-            cd $old_pwd
+            cd "$old_pwd"
         fi
         cp -f $MINDI_TMP/BOOTLOADER.* $bigdir 2>> $LOGFILE || LogAll "\nMondo v1.2x defaults to LILO as the bootloader, BTW."
@@ -1408 +1408 @@
     fi
     old_pwd=`pwd`
-    cd $MINDI_TMP/iso
+    cd "$MINDI_TMP/iso"
     LogFile "-------------------"
     LogFile "Content of the ISO:"
@@ -1437 +1437 @@
     fi
     rm -f $MINDI_TMP/mkisofs.log
-    cd $old_pwd
+    cd "$old_pwd"
 }
 
@@ -1783 +1783 @@
         echo -en "Kernel size = `du -sk $kernelpath | cut -f1` K\nRamdisk free = $free_space K\n" >> $LOGFILE
         [ "$mountpoint" != "" ] && rm -f $mountpoint/vmlinuz
-        cd $old_pwd
+        cd "$old_pwd"
         umount $mountpoint || Die "Cannot unmount mountpoint ($mountpoint)"
         rmdir $mountpoint || LogAll "Cannot rmdir (PBDI)"
@@ -1894 +1894 @@
 
     old_pwd=`pwd`
-    cd $bigdir
+    cd "$bigdir"
 
     # Get terminfo content
@@ -1909 +1909 @@
         tar cf - -C / ./lib/dev-state 2>> $MINDI_TMP/$$.log | tar xf - || LogAll "Unable to handle /lib/dev-state" $MINDI_TMP/$$.log
     fi
-    cd $old_pwd
+    cd "$old_pwd"
     echo -e "$DONE"
     TOTAL_BIGDIR_SIZE=`du -sk $bigdir | cut -f1`
@@ -1929 +1929 @@
     echo -en "Tarring and zipping the data content..."
     size_of_all_tools=`du -sk $bigdir | cut -f1`
-    (cd $bigdir ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogAll "Problem creating all.tar.gz" $MINDI_TMP/$$.log)
+    (cd "$bigdir" ; tar -b 4096 -cf - . 2>> $MINDI_TMP/$$.log | gzip -9 > $imagesdir/all.tar.gz || LogAll "Problem creating all.tar.gz" $MINDI_TMP/$$.log)
     LogFile "Size of the data content"
     LogFile "------------------------"
@@ -2340 +2340 @@
     fi
 
-    cd $old_pwd
+    cd "$old_pwd"
     if [ _"$MONDO_SHARE" != _"" ]; then
         MakeMondoConfigFile $MINDI_CACHE/mondorestore.cfg
@@ -2403 +2403 @@
     LogFile "Content of initial ramdisk:"
     LogFile "---------------------------"
-    (cd $mountpoint ; ls -Rla ) >> $LOGFILE
+    (cd "$mountpoint" ; ls -Rla ) >> $LOGFILE
     LogFile "---------------------------"
 
@@ -2414 +2414 @@
         LogFile "Creating an $gvFileSystem initrd image..."
         # kernel expects linuxrc in ext2 filesystem
-        ( cd $mountpoint && ln -sf sbin/init linuxrc )
+        ( cd "$mountpoint" && ln -sf sbin/init linuxrc )
         # unmount loop filesystem and create image file using the standard approach
         umount $mountpoint || Die "Cannot unmount $tempfile"
@@ -2430 +2430 @@
         which cpio &> /dev/null; [ $? -eq 0 ] || Die "cpio not found. Please install package cpio and try again."
         # go into filesystem
-        cd $mountpoint
+        cd "$mountpoint"
         # kernel expects init in cpio filesystem
         ln -sf sbin/init init
         # create cpio image file and unmount loop filesystem
         find . -print | cpio -o -H newc | gzip -9 > $rdz_fname 2> /dev/null
-        cd $old_pwd
+        cd "$old_pwd"
         umount $mountpoint || Die "Cannot unmount $tempfile"
         # log that we are done

branches/2.2.10/mindi/rootfs/README

@@ -14 +14 @@
 
 To edit the mountlist, type:-
-# edit-mountlist
+# mondorestore --edit-mountlist
 
 The archives can be accessed manually using the afio command, like so:-

branches/2.2.10/mondo-doc/mondoarchive.8

@@ -158 +158 @@
 .TP
 .BI "\-E " "\*(lqpath ...\*(rq"
-Exclude path(s) from backup. The paths should be separated with a whitespace and surrounded by quotes.
+Exclude path(s) from backup. The paths should be separated with a pipe and surrounded by quotes.
 This is the prefered and recommended option when doing partial archiving.
 Note that mondo automatically excludes removable media (/mnt/floppy,
@@ -170 +170 @@
 archived so it won't do what you expect.
 You may also specify full disk device to this option as with \-E
-\*(lq/dev/sda /dev/cciss/c0d0\*(rq
+\*(lq/dev/sda|/dev/cciss/c0d0\*(rq
 
 .TP
 .BI "-I " "\*(lqpath ...\*(rq"
-Include paths(s) in backup. This option is mainly use to perform tests
+Include paths(s) in backup. The paths should be separated with a pipe and surrounded by quotes.
+This option is mainly use to perform tests
 in order to reduce the time taken by the archiving operation.
 The default backup path is \*(lq/\*(rq but you may specify alternatives,
-e.g. \-I \*(lq/home /etc\*(rq to override that.
+e.g. \-I \*(lq/home|/etc\*(rq to override that.
 You may also specify full disk device to this option as with \-I
-\*(lq/dev/sda /dev/cciss/c0d0\*(rq
+\*(lq/dev/sda|/dev/cciss/c0d0\*(rq
 N.B.: When using the
 .BR \-I

branches/2.2.10/mondo-doc/mondorescue-howto.sgml

@@ -1334 +1334 @@
 <entry>
 
-bash# mondoarchive -E "/mnt/dos /mnt/cdrom" -9 -Oc 8
+bash# mondoarchive -E "/mnt/dos|/mnt/cdrom" -9 -Oc 8
 
 </entry>
@@ -1561 +1561 @@
 
         # mondoarchive -D -Ow 10 -S /home/mondo/ -T /home/mondo/ -g \
-        -E "\"/home/cdaly/GIS/W2K /home/mondo/\"" -9
+        -E "/home/cdaly/GIS/W2K|/home/mondo" -9
 
 </entry>
@@ -1575 +1575 @@
     # at now + 5 min 
 mondoarchive -D -Ow 10 -S /home/mondo/ -T /home/mondo/ -g \
--E "\"/home/cdaly/GIS/W2K /home/mondo/\"" -9 
+-E "/home/cdaly/GIS/W2K|/home/mondo" -9 
 &lt;CTRL&gt;-d
 </entry>
@@ -1653 +1653 @@
 } 
 screen -m -d mondoarchive -D -Ow 10 -S /home/mondo/ \
--T /home/mondo/ -g -E "\"/home/cdaly/GIS/W2K /home/mondo/\"" -9
+-T /home/mondo/ -g -E "/home/cdaly/GIS/W2K|/home/mondo" -9
 #done
 
@@ -1663 +1663 @@
 <row>
 <entry>
-        screen -m -d mondoarchive -D -Ow 10 -S /home/mondo/ -T /home/mondo/ -g -E "\"/home/cdaly/GIS/W2K /home/mondo/\"" -9
+        screen -m -d mondoarchive -D -Ow 10 -S /home/mondo/ -T /home/mondo/ -g -E "/home/cdaly/GIS/W2K|/home/mondo" -9
 </entry>
 </row>

branches/2.2.10/mondo-doc/mondorestore.8

@@ -87 +87 @@
 .TP
 .BI "-E " "\*(lqpath ...\*(rq"
-Exclude path(s) from restore (future dev). The paths should be separated with a whitespace.
-/mnt/cdrom, /proc, /sys, /tmp). For example, if you are restoring up
+Exclude path(s) from restore (future dev). The paths should be separated with a pipe.
+For example, if you are restoring up
 from an NFS mount but you do not want to restore some content, exclude it with that switch.
 

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -268 +268 @@
         /* Cut the flag_val['I'] in parts containing all paths to test them */
         while (p != NULL) {
-            q = strchr(p, ' ');
+            q = strchr(p, '|');
             if (q != NULL) {
                 *q = '\0';
@@ -590 +590 @@
         /* Cut the flag_val['E'] in parts containing all paths to test them */
         while (p != NULL) {
-            q = strchr(p, ' ');
+            q = strchr(p, '|');
             if (q != NULL) {
                 *q = '\0';
@@ -625 +625 @@
     if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude Network mounts & devices
     {
-        mr_asprintf(psz, "%s", list_of_NETFS_mounts_only());
-        mr_strcat(bkpinfo->exclude_paths, " %s ", psz);
-        mr_free(psz);
+        psz = list_of_NETFS_mounts_only();
+        log_msg(5, "-N means we'll exclude %s", psz);
+        if (bkpinfo->exclude_paths) {
+            mr_strcat(bkpinfo->exclude_paths, "|%s", psz);
+            mr_free(psz);
+        } else {
+            bkpinfo->exclude_paths = psz;
+        }
 
         if (bkpinfo->exclude_paths != NULL) {

branches/2.2.10/mondo/src/common/libmondo-devices-EXT.h

@@ -46 +46 @@
 extern int eject_device(char *);
 
-extern char *list_of_NETFS_devices_and_mounts();
 extern char *list_of_NETFS_mounts_only(void);
 

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

@@ -1956 +1956 @@
             log_msg (4, "%s is mounted on %s and is on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*included_dsf_list, DSFptr->mount_point);
-            strcat(*included_dsf_list, " ");
+            strcat(*included_dsf_list, "|");
         } else {
             log_msg (4, "%s is mounted on %s and is NOT on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*excluded_dsf_list, DSFptr->mount_point);
-            strcat(*excluded_dsf_list, " ");
+            strcat(*excluded_dsf_list, "|");
         }
         DSFptr = DSFptr->next;
@@ -1980 +1980 @@
 char *mounted_on_dsf = NULL;
 char *not_mounted_on_dsf = NULL;
-char token_chars[] =" \t\r\f\a\0\n";
+char token_chars[] ="|\t\r\f\a\0\n";
 char *tmp = NULL;
 char *tmp1 = NULL;
@@ -2001 +2001 @@
                 log_to_screen("==> %s", mounted_on_dsf);
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
-                mr_strcat(bkpinfo->exclude_paths, " %s ", mounted_on_dsf);
-                mr_strcat(bkpinfo->exclude_devs, " %s ", token);
+                if (bkpinfo->exclude_paths) {
+                    mr_strcat(bkpinfo->exclude_paths,"|%s",mounted_on_dsf);
+                } else {
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",mounted_on_dsf);
+                }
+                if (bkpinfo->exclude_devs) {
+                    mr_strcat(bkpinfo->exclude_devs,"|%s",token);
+                } else {
+                    mr_asprintf(bkpinfo->exclude_devs,"%s",token);
+                }
             }
         } else {
@@ -2013 +2021 @@
                 log_to_screen("Not archiving the following file systems:");
                 log_to_screen("==> %s", not_mounted_on_dsf);
-                mr_strcat(bkpinfo->exclude_paths, " %s ", not_mounted_on_dsf);
+                if (bkpinfo->exclude_paths) {
+                    mr_strcat(bkpinfo->exclude_paths, "|%s",not_mounted_on_dsf);
+                } else {
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",not_mounted_on_dsf);
+                }
             }
         }
@@ -2023 +2035 @@
     /* 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);
+        /*  Adds a | to ensure correct detection even at both ends */
+        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) {
-                mr_strcat(bkpinfo->exclude_paths, "%s", tmp1);
+                if (bkpinfo->exclude_paths) {
+                    mr_strcat(bkpinfo->exclude_paths,tmp1);
+                    mr_free(tmp1);
+                } else {
+                    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) {
                 mr_strcat(bkpinfo->include_paths, "%s", tmp1);
             }
+            mr_free(tmp1);
         }
         mr_free(tmp);
-        mr_free(tmp1);
         break;
     }
@@ -2045 +2062 @@
 
     if (bkpinfo->include_paths != NULL) {
-        mr_strip_spaces(bkpinfo->include_paths);
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
     }
     if (bkpinfo->exclude_paths != NULL) {
-        mr_strip_spaces(bkpinfo->exclude_paths);
         log_msg(1, "exclude_paths is now '%s'", bkpinfo->exclude_paths);
     }
     if (bkpinfo->exclude_devs != NULL) {
-        mr_strip_spaces(bkpinfo->exclude_devs);
         log_msg(1, "exclude_devs is now '%s'", bkpinfo->exclude_devs);
     }
@@ -2061 +2075 @@
 
 /**
- * @addtogroup utilityGroup
- * @{
- */
-/**
- * Get a space-separated list of NETFS devices and mounts.
+ * Get a |-separated list of NETFS mounts.
  * @return The list created.
- * @note The return value points to static data that will be overwritten with each call.
- */
-char *list_of_NETFS_devices_and_mounts(void)
-{
-    char *exclude_these_devices = NULL;
+ * @note The return value points to allocated string that needs to be freed
+ * @bug Even though we only want the mounts, the devices are still checked.
+ */
+char *list_of_NETFS_mounts_only(void)
+{
     char *exclude_these_directories = NULL;
-    static char result_sz[1024];
-
-    mr_asprintf(exclude_these_directories,"%s",list_of_NETFS_mounts_only());
-    exclude_these_devices = call_program_and_get_last_line_of_output("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|sshfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'",TRUE);
-    snprintf(result_sz, 1023, "%s %s", exclude_these_directories, exclude_these_devices);
-    mr_free(exclude_these_devices);
-    mr_free(exclude_these_directories);
-    return (result_sz);
-}
-
-
-
-
-/**
- * Get a space-separated list of NETFS mounts.
- * @return The list created.
- * @note The return value points to static data that will be overwritten with each call.
- * @bug Even though we only want the mounts, the devices are still checked.
- */
-char *list_of_NETFS_mounts_only(void)
-{
-    char *exclude_these_directories = NULL;
-    static char result_sz[512];
-
-    exclude_these_directories = call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'",TRUE);
-    snprintf(result_sz, 511, "%s", exclude_these_directories);
-    mr_free(exclude_these_directories);
-    return (result_sz);
+
+    exclude_these_directories = call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' '|' | awk '{print $0;}'",TRUE);
+    log_msg(9,"list_of_NETFS_mounts_only returns %s\n",exclude_these_directories);
+    return(exclude_these_directories);
 }
 
@@ -3106 +3092 @@
         bkpinfo->include_paths = p;
 
-        p = popup_and_get_string("Backup paths", "Please enter paths which you want me to backup. The default is '/' (i.e. everything).", bkpinfo->include_paths);
+        p = popup_and_get_string("Backup paths", "Please enter paths which you want me to backup separated by '|'. The default is '/' (i.e. everything).", bkpinfo->include_paths);
         if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
@@ -3114 +3100 @@
         bkpinfo->include_paths = p;
 
-        mr_asprintf(tmp, "%s", list_of_NETFS_mounts_only());
+        tmp = list_of_NETFS_mounts_only();
         if (strlen(tmp) > 2) {
-            mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
+            mr_strcat(bkpinfo->exclude_paths, "|%s",tmp);
         }
         mr_free(tmp);
@@ -3133 +3119 @@
 
 
-        p = popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", bkpinfo->exclude_paths);
+        p = popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with pipes. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.", bkpinfo->exclude_paths);
         if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
@@ -3140 +3126 @@
         mr_free(bkpinfo->exclude_paths);
         bkpinfo->exclude_paths = p;
-        /* Always needs to be finished by a space */
-        mr_strcat(bkpinfo->exclude_paths, " ");
+        /* Always needs to be finished by a pipe */
+        mr_strcat(bkpinfo->exclude_paths, "|");
 
         p = popup_and_get_string("Temporary directory", "Please enter your temporary directory.", bkpinfo->tmpdir);
@@ -3217 +3203 @@
     /*  the mr_make_devlist_from_pathlist function appends
     *  to the *_paths variables so copy before */
-    mr_asprintf(tmp, "%s ", bkpinfo->exclude_paths);
+    mr_asprintf(tmp, "%s|", bkpinfo->exclude_paths);
     mr_make_devlist_from_pathlist(tmp, 'E');
     mr_free(tmp);
-    mr_asprintf(tmp, "%s ", bkpinfo->include_paths);
+    mr_asprintf(tmp, "%s|", bkpinfo->include_paths);
     mr_make_devlist_from_pathlist(tmp, 'I');
     mr_free(tmp);

branches/2.2.10/mondo/src/common/libmondo-devices.h

@@ -38 +38 @@
 int eject_device(char *);
 
-char *list_of_NETFS_devices_and_mounts();
 char *list_of_NETFS_mounts_only();
 

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

@@ -1283 +1283 @@
     mr_asprintf(sz_res, "%s", incoming);
     p = sz_res;
-    while ((*p != ' ' || in_quotes) && *p != '\0') {
+    while ((*p != '|' || in_quotes) && *p != '\0') {
         if (*p == '\"') {
             in_quotes = !in_quotes;
@@ -1311 +1311 @@
 int open_and_list_dir(char *dir1, char *sth, FILE * fout, time_t time_of_last_full_backup) {
 
-    const char delims[] = " ";
+    const char delims[] = "|";
 
     DIR *dip;
@@ -1322 +1322 @@
     static int percentage = 0;
     char *skip_these = NULL;
-    char *new_with_spaces = NULL;
+    char *new_with_pipe;
     char *strtmp;
     char *token;
@@ -1347 +1347 @@
         }
     }
+    mr_asprintf(&find_excludes, "|");
 
     if (!depth) {
-        mr_asprintf(find_excludes, " ");
+        mr_asprintf(find_excludes, "|");
         if (sth != NULL) {
             while((token = mr_strtok(sth, delims, &lastpos))) {
@@ -1417 +1418 @@
 
 //  log_msg(0, "Cataloguing %s", dir);
-    if (sth[0] == ' ') {
-        mr_asprintf(skip_these, "%s", sth);
-    } else {
-        mr_asprintf(skip_these, " %s ", sth);
-    }
-    mr_asprintf(new_with_spaces, " %s ", dir1);
+    mr_asprintf(skip_these, "|%s|", sth);
+    mr_asprintf(new_with_pipe, "|%s|", dir1);
     if ((dip = opendir(dir1)) == NULL) {
         mr_asprintf(tmp,"opendir %s", dir1);
         log_OS_error(tmp);
         mr_free(tmp);
-    } else if (strstr(skip_these, new_with_spaces)) {
+    } else if (strstr(skip_these, new_with_pipe)) {
         log_msg(10, "Found dir ***%s**** excluded", dir1);
         fprintf(fout, "%s\n", dir1);    // if excluded dir then print dir ONLY
@@ -1440 +1437 @@
                 mr_asprintf(new,"%s%s",dir1,dit->d_name);
             }
-            mr_free(new_with_spaces);
-            mr_asprintf(new_with_spaces, " %s ", new);
-            if (strstr(skip_these, new_with_spaces)) {
+            mr_free(new_with_pipe);
+            mr_asprintf(new_with_spaces, "|%s|", new);
+            if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
                 log_msg(10, "Found child dir ***%s**** excluded", new);
-                mr_free(new_with_spaces);
+                mr_free(new_with_pipe);
             } else {
-                mr_free(new_with_spaces);
+                mr_free(new_with_pipe);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
@@ -1474 +1471 @@
         }
     }
-    mr_free(new_with_spaces);
+    mr_free(new_with_pipe);
     mr_free(skip_these);
     mr_free(dir);
@@ -1584 +1581 @@
         mr_free(tmp1);
 
-        mr_asprintf(exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys /dev/shm " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
-        mr_free(tmp2);
+        mr_asprintf(exclude_paths, MONDO_CACHE"|%s|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE,(excp == NULL) ? "" : excp, tmp2, (bkpinfo->tmpdir[0] == '/' && bkpinfo->tmpdir[1] == '/') ? (bkpinfo->tmpdir + 1) : bkpinfo->tmpdir, (bkpinfo->scratchdir[0] == '/' && bkpinfo->scratchdir[1] == '/') ? (bkpinfo->scratchdir + 1) : bkpinfo->scratchdir);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
@@ -1610 +1606 @@
                 p += strlen(q);
                 paranoid_free(q);
-                while (*p == ' ') {
+                while (*p == '|') {
                     p++;
                 }