- Got rid of the filesystem_dev variable now that --one-file-system

  is handled in a new way.
- Moved a stat out of delete_in_dir() into do_delete_pass() to make
  --delete-during more efficient.
- Added a missing "#ifdef SUPPORT_LINKS...#endif" block around some
  symlink code.

diff --git a/generator.c b/generator.c
index b31c033..1a22794 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -83,9 +83,7 @@ extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
 extern int max_delete;
 extern int force_delete;
-extern int one_file_system;
 extern struct stats stats;
-extern dev_t filesystem_dev;
 extern char *backup_dir;
 extern char *backup_suffix;
 extern int backup_suffix_len;
@@ -224,7 +222,6 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
        static int already_warned = 0;
        struct file_list *dirlist;
        char delbuf[MAXPATHLEN];
-       STRUCT_STAT st;
        int dlen, i;
 
        if (!flist) {
@@ -261,24 +258,23 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
        dlen = strlen(fbuf);
        filt_array[cur_depth] = push_local_filters(fbuf, dlen);
 
-       if (link_stat(fbuf, &st, keep_dirlinks) < 0 || !S_ISDIR(st.st_mode))
+       if (file->flags & FLAG_MOUNT_POINT)
                return;
 
-       if (one_file_system) {
-               if (file->flags & FLAG_TOP_DIR)
-                       filesystem_dev = st.st_dev;
-               else if (filesystem_dev != st.st_dev)
-                       return;
-       }
-
        dirlist = get_dirlist(fbuf, dlen, 0);
 
        /* If an item in dirlist is not found in flist, delete it
         * from the filesystem. */
        for (i = dirlist->count; i--; ) {
                struct file_struct *fp = dirlist->files[i];
-               if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
+               if (!fp->basename)
+                       continue;
+               if (fp->flags & FLAG_MOUNT_POINT) {
+                       int j = flist_find(flist, fp);
+                       if (j >= 0)
+                               flist->files[j]->flags |= FLAG_MOUNT_POINT;
                        continue;
+               }
                if (flist_find(flist, fp) < 0) {
                        int mode = fp->mode;
                        f_name(fp, delbuf);
@@ -294,6 +290,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 static void do_delete_pass(struct file_list *flist)
 {
        char fbuf[MAXPATHLEN];
+       STRUCT_STAT st;
        int j;
 
        if (dry_run > 1 /* destination doesn't exist yet */
@@ -310,6 +307,10 @@ static void do_delete_pass(struct file_list *flist)
                if (verbose > 1 && file->flags & FLAG_TOP_DIR)
                        rprintf(FINFO, "deleting in %s\n", fbuf);
 
+               if (link_stat(fbuf, &st, keep_dirlinks) < 0
+                || !S_ISDIR(st.st_mode))
+                       continue;
+
                delete_in_dir(flist, fbuf, file);
        }
        delete_in_dir(NULL, NULL, NULL);
@@ -715,10 +716,12 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
                 || !unchanged_attrs(file, &st))
                        continue;
                if (S_ISLNK(file->mode)) {
+#ifdef SUPPORT_LINKS
                        if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
                                continue;
                        lnk[len] = '\0';
                        if (strcmp(lnk, file->u.link) != 0)
+#endif
                                continue;
                } else {
                        if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)