Mention the EEXIST fix.
[rsync.git] / flist.c
diff --git a/flist.c b/flist.c
index 0890f9eb2b0280619466cd157a8c504faa1c60f4..64ff00771249678b6b7e4daf875ee2da4d597fd0 100644 (file)
--- a/flist.c
+++ b/flist.c
 
 #include "rsync.h"
 
-extern struct stats stats;
-
 extern int verbose;
-extern int do_progress;
+extern int dry_run;
+extern int list_only;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
+extern int am_sender;
+extern int do_progress;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
 extern int numeric_ids;
-
-extern int cvs_exclude;
-
 extern int recurse;
-extern char curr_dir[MAXPATHLEN];
-extern char *files_from;
+extern int xfer_dirs;
 extern int filesfrom_fd;
-
 extern int one_file_system;
+extern int keep_dirlinks;
 extern int preserve_links;
 extern int preserve_hard_links;
 extern int preserve_perms;
 extern int preserve_devices;
 extern int preserve_uid;
 extern int preserve_gid;
-extern int preserve_times;
 extern int relative_paths;
 extern int implied_dirs;
 extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
 extern int sanitize_paths;
+extern int orig_umask;
+extern struct stats stats;
+extern struct file_list *the_file_list;
 
-extern int read_batch;
-extern int write_batch;
+extern char curr_dir[MAXPATHLEN];
 
-extern struct exclude_struct **exclude_list;
-extern struct exclude_struct **server_exclude_list;
-extern struct exclude_struct **local_exclude_list;
+extern struct filter_list_struct filter_list;
+extern struct filter_list_struct server_filter_list;
 
 int io_error;
+dev_t filesystem_dev; /* used to implement -x */
 
 static char empty_sum[MD4_SUM_LENGTH];
+static int flist_count_offset;
 static unsigned int file_struct_len;
+static struct file_list *sorting_flist;
 
 static void clean_flist(struct file_list *flist, int strip_root, int no_dups);
 static void output_flist(struct file_list *flist);
@@ -87,28 +87,28 @@ void init_flist(void)
 
 static int show_filelist_p(void)
 {
-       return verbose && (recurse || files_from) && !am_server;
+       return verbose && xfer_dirs && !am_server;
 }
 
 static void start_filelist_progress(char *kind)
 {
        rprintf(FINFO, "%s ... ", kind);
-       if ((verbose > 1) || do_progress)
+       if (verbose > 1 || do_progress)
                rprintf(FINFO, "\n");
        rflush(FINFO);
 }
 
 
-static void emit_filelist_progress(const struct file_list *flist)
+static void emit_filelist_progress(int count)
 {
-       rprintf(FINFO, " %d files...\r", flist->count);
+       rprintf(FINFO, " %d files...\r", count);
 }
 
 
-static void maybe_emit_filelist_progress(const struct file_list *flist)
+static void maybe_emit_filelist_progress(int count)
 {
-       if (do_progress && show_filelist_p() && ((flist->count % 100) == 0))
-               emit_filelist_progress(flist);
+       if (do_progress && show_filelist_p() && (count % 100) == 0)
+               emit_filelist_progress(count);
 }
 
 
@@ -132,24 +132,27 @@ static void list_file_entry(struct file_struct *f)
 {
        char perms[11];
 
-       if (!f->basename)
+       if (!f->basename) {
                /* this can happen if duplicate names were removed */
                return;
+       }
 
        permstring(perms, f->mode);
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {
                rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
                        perms,
-                       (double) f->length, timestring(f->modtime),
-                       f_name(f), f->u.link);
+                       (double)f->length, timestring(f->modtime),
+                       safe_fname(f_name(f)), safe_fname(f->u.link));
        } else
 #endif
+       {
                rprintf(FINFO, "%s %11.0f %s %s\n",
                        perms,
-                       (double) f->length, timestring(f->modtime),
-                       f_name(f));
+                       (double)f->length, timestring(f->modtime),
+                       safe_fname(f_name(f)));
+       }
 }
 
 
@@ -167,22 +170,22 @@ static void list_file_entry(struct file_struct *f)
  * @post @p buffer contains information about the link or the
  * referrent as appropriate, if they exist.
  **/
-int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
+static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 {
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (copy_links)
                return do_stat(path, buffer);
-       if (do_lstat(path, buffer) == -1)
+       if (link_stat(path, buffer, 0) < 0)
                return -1;
        if (S_ISLNK(buffer->st_mode)) {
-               int l = readlink((char *) path, linkbuf, MAXPATHLEN - 1);
+               int l = readlink((char *)path, linkbuf, MAXPATHLEN - 1);
                if (l == -1)
                        return -1;
                linkbuf[l] = 0;
                if (copy_unsafe_links && unsafe_symlink(linkbuf, path)) {
                        if (verbose > 1) {
                                rprintf(FINFO,"copying unsafe symlink \"%s\" -> \"%s\"\n",
-                                       path, linkbuf);
+                                       safe_fname(path), safe_fname(linkbuf));
                        }
                        return do_stat(path, buffer);
                }
@@ -193,26 +196,31 @@ int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 #endif
 }
 
-int link_stat(const char *path, STRUCT_STAT * buffer)
+int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks)
 {
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (copy_links)
                return do_stat(path, buffer);
-       return do_lstat(path, buffer);
+       if (do_lstat(path, buffer) < 0)
+               return -1;
+       if (follow_dirlinks && S_ISLNK(buffer->st_mode)) {
+               STRUCT_STAT st;
+               if (do_stat(path, &st) == 0 && S_ISDIR(st.st_mode))
+                       *buffer = st;
+       }
+       return 0;
 #else
        return do_stat(path, buffer);
 #endif
 }
 
-/*
- * This function is used to check if a file should be included/excluded
+/* This function is used to check if a file should be included/excluded
  * from the list of files based on its name and type etc.  The value of
- * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES.
- */
-static int check_exclude_file(char *fname, int is_dir, int exclude_level)
+ * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */
+static int is_excluded(char *fname, int is_dir, int filter_level)
 {
 #if 0 /* This currently never happens, so avoid a useless compare. */
-       if (exclude_level == NO_EXCLUDES)
+       if (filter_level == NO_FILTERS)
                return 0;
 #endif
        if (fname) {
@@ -226,49 +234,36 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level)
                                return 0;
                }
        }
-       if (server_exclude_list
-        && check_exclude(server_exclude_list, fname, is_dir))
+       if (server_filter_list.head
+           && check_filter(&server_filter_list, fname, is_dir) < 0)
                return 1;
-       if (exclude_level != ALL_EXCLUDES)
+       if (filter_level != ALL_FILTERS)
                return 0;
-       if (exclude_list && check_exclude(exclude_list, fname, is_dir))
-               return 1;
-       if (local_exclude_list
-        && check_exclude(local_exclude_list, fname, is_dir))
+       if (filter_list.head
+           && check_filter(&filter_list, fname, is_dir) < 0)
                return 1;
        return 0;
 }
 
-/* used by the one_file_system code */
-static dev_t filesystem_dev;
-
-static void set_filesystem(char *fname)
-{
-       STRUCT_STAT st;
-       if (link_stat(fname, &st) != 0)
-               return;
-       filesystem_dev = st.st_dev;
-}
-
-
 static int to_wire_mode(mode_t mode)
 {
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (S_ISLNK(mode) && (_S_IFLNK != 0120000))
                return (mode & ~(_S_IFMT)) | 0120000;
 #endif
-       return (int) mode;
+       return (int)mode;
 }
 
 static mode_t from_wire_mode(int mode)
 {
        if ((mode & (_S_IFMT)) == 0120000 && (_S_IFLNK != 0120000))
                return (mode & ~(_S_IFMT)) | _S_IFLNK;
-       return (mode_t) mode;
+       return (mode_t)mode;
 }
 
 
-static void send_directory(int f, struct file_list *flist, char *dir);
+static void send_directory(int f, struct file_list *flist,
+                          char *fbuf, int len);
 
 static char *flist_dir;
 static int flist_dir_len;
@@ -280,7 +275,7 @@ static int flist_dir_len;
  **/
 void flist_expand(struct file_list *flist)
 {
-       void *new_ptr;
+       struct file_struct **new_ptr;
 
        if (flist->count < flist->malloced)
                return;
@@ -299,21 +294,17 @@ void flist_expand(struct file_list *flist)
        if (flist->malloced < flist->count)
                flist->malloced = flist->count;
 
-       if (flist->files) {
-               new_ptr = realloc_array(flist->files,
-                   struct file_struct *, flist->malloced);
-       } else {
-               new_ptr = new_array(struct file_struct *, flist->malloced);
-       }
+       new_ptr = realloc_array(flist->files, struct file_struct *,
+                               flist->malloced);
 
-       if (verbose >= 2) {
+       if (verbose >= 2 && flist->malloced != FLIST_START) {
                rprintf(FINFO, "[%s] expand file_list to %.0f bytes, did%s move\n",
                    who_am_i(),
-                   (double) sizeof flist->files[0] * flist->malloced,
+                   (double)sizeof flist->files[0] * flist->malloced,
                    (new_ptr == flist->files) ? " not" : "");
        }
 
-       flist->files = (struct file_struct **) new_ptr;
+       flist->files = new_ptr;
 
        if (!flist->files)
                out_of_memory("flist_expand");
@@ -324,21 +315,23 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        unsigned short flags;
        static time_t modtime;
        static mode_t mode;
-       static DEV64_T rdev, rdev_high;
-       static DEV64_T dev;
+       static int64 dev;
+       static dev_t rdev;
+       static uint32 rdev_major;
        static uid_t uid;
        static gid_t gid;
        static char lastname[MAXPATHLEN];
-       char *fname, fbuf[MAXPATHLEN];
+       char fname[MAXPATHLEN];
        int l1, l2;
 
-       if (f == -1)
+       if (f < 0)
                return;
 
        if (!file) {
                write_byte(f, 0);
                modtime = 0, mode = 0;
-               rdev = 0, rdev_high = 0, dev = 0;
+               dev = 0, rdev = makedev(0, 0);
+               rdev_major = 0;
                uid = 0, gid = 0;
                *lastname = '\0';
                return;
@@ -346,7 +339,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
        io_write_phase = "send_file_entry";
 
-       fname = f_name_to(file, fbuf);
+       f_name_to(file, fname);
 
        flags = base_flags;
 
@@ -357,22 +350,20 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        if (preserve_devices) {
                if (protocol_version < 28) {
                        if (IS_DEVICE(mode)) {
-                               if (file->u.rdev == rdev) {
-                                       /* Set both flags to simplify the test
-                                        * when writing the data. */
-                                       flags |= XMIT_SAME_RDEV_pre28
-                                           | XMIT_SAME_HIGH_RDEV;
-                               } else
+                               if (file->u.rdev == rdev)
+                                       flags |= XMIT_SAME_RDEV_pre28;
+                               else
                                        rdev = file->u.rdev;
                        } else
-                               rdev = 0;
+                               rdev = makedev(0, 0);
                } else if (IS_DEVICE(mode)) {
-                       if ((file->u.rdev & ~(DEV64_T)0xFF) == rdev_high)
-                               flags |= XMIT_SAME_HIGH_RDEV;
-                       else {
-                               rdev = file->u.rdev;
-                               rdev_high = rdev & ~(DEV64_T)0xFF;
-                       }
+                       rdev = file->u.rdev;
+                       if ((uint32)major(rdev) == rdev_major)
+                               flags |= XMIT_SAME_RDEV_MAJOR;
+                       else
+                               rdev_major = major(rdev);
+                       if ((uint32)minor(rdev) <= 0xFFu)
+                               flags |= XMIT_RDEV_MINOR_IS_SMALL;
                }
        }
        if (file->uid == uid)
@@ -388,7 +379,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        else
                modtime = file->modtime;
 
-#if SUPPORT_HARD_LINKS
+#ifdef SUPPORT_HARD_LINKS
        if (file->link_u.idev) {
                if (file->F_DEV == dev) {
                        if (protocol_version >= 28)
@@ -453,15 +444,20 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
                write_int(f, gid);
        }
        if (preserve_devices && IS_DEVICE(mode)) {
-               /* If XMIT_SAME_HIGH_RDEV is off, XMIT_SAME_RDEV_pre28 is
-                * also off. */
-               if (!(flags & XMIT_SAME_HIGH_RDEV))
-                       write_int(f, rdev);
-               else if (protocol_version >= 28)
-                       write_byte(f, rdev);
+               if (protocol_version < 28) {
+                       if (!(flags & XMIT_SAME_RDEV_pre28))
+                               write_int(f, (int)rdev);
+               } else {
+                       if (!(flags & XMIT_SAME_RDEV_MAJOR))
+                               write_int(f, major(rdev));
+                       if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+                               write_byte(f, minor(rdev));
+                       else
+                               write_int(f, minor(rdev));
+               }
        }
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(mode)) {
                int len = strlen(file->u.link);
                write_int(f, len);
@@ -469,7 +465,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
        }
 #endif
 
-#if SUPPORT_HARD_LINKS
+#ifdef SUPPORT_HARD_LINKS
        if (flags & XMIT_HAS_IDEV_DATA) {
                if (protocol_version < 26) {
                        /* 32-bit dev_t and ino_t */
@@ -506,17 +502,20 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 
 
-void receive_file_entry(struct file_struct **fptr, unsigned short flags,
-    struct file_list *flist, int f)
+static struct file_struct *receive_file_entry(struct file_list *flist,
+                                             unsigned short flags, int f)
 {
        static time_t modtime;
        static mode_t mode;
-       static DEV64_T rdev, rdev_high;
-       static DEV64_T dev;
+       static int64 dev;
+       static dev_t rdev;
+       static uint32 rdev_major;
        static uid_t uid;
        static gid_t gid;
        static char lastname[MAXPATHLEN], *lastdir;
-       static int lastdir_len = -1;
+       static int lastdir_depth, lastdir_len = -1;
+       static unsigned int del_hier_name_len = 0;
+       static int in_del_hier = 0;
        char thisname[MAXPATHLEN];
        unsigned int l1 = 0, l2 = 0;
        int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
@@ -524,12 +523,15 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        char *basename, *dirname, *bp;
        struct file_struct *file;
 
-       if (!fptr) {
+       if (!flist) {
                modtime = 0, mode = 0;
-               rdev = 0, rdev_high = 0, dev = 0;
+               dev = 0, rdev = makedev(0, 0);
+               rdev_major = 0;
                uid = 0, gid = 0;
                *lastname = '\0';
-               return;
+               lastdir_len = -1;
+               in_del_hier = 0;
+               return NULL;
        }
 
        if (flags & XMIT_SAME_NAME)
@@ -543,7 +545,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        if (l2 >= MAXPATHLEN - l1) {
                rprintf(FERROR,
                        "overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
-                       flags, l1, l2, lastname);
+                       flags, l1, l2, safe_fname(lastname));
                overflow("receive_file_entry");
        }
 
@@ -553,10 +555,10 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 
        strlcpy(lastname, thisname, MAXPATHLEN);
 
-       clean_fname(thisname);
+       clean_fname(thisname, 0);
 
        if (sanitize_paths)
-               sanitize_path(thisname, NULL);
+               sanitize_path(thisname, thisname, "", 0);
 
        if ((basename = strrchr(thisname, '/')) != NULL) {
                dirname_len = ++basename - thisname; /* counts future '\0' */
@@ -588,19 +590,22 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                if (protocol_version < 28) {
                        if (IS_DEVICE(mode)) {
                                if (!(flags & XMIT_SAME_RDEV_pre28))
-                                       rdev = (DEV64_T)read_int(f);
+                                       rdev = (dev_t)read_int(f);
                        } else
-                               rdev = 0;
+                               rdev = makedev(0, 0);
                } else if (IS_DEVICE(mode)) {
-                       if (!(flags & XMIT_SAME_HIGH_RDEV)) {
-                               rdev = (DEV64_T)read_int(f);
-                               rdev_high = rdev & ~(DEV64_T)0xFF;
-                       } else
-                               rdev = rdev_high | (DEV64_T)read_byte(f);
+                       uint32 rdev_minor;
+                       if (!(flags & XMIT_SAME_RDEV_MAJOR))
+                               rdev_major = read_int(f);
+                       if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+                               rdev_minor = read_byte(f);
+                       else
+                               rdev_minor = read_int(f);
+                       rdev = makedev(rdev_major, rdev_minor);
                }
        }
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(mode)) {
                linkname_len = read_int(f) + 1; /* count the '\0' */
                if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
@@ -619,11 +624,11 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                  + linkname_len + sum_len;
        bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
 
-       file = *fptr = (struct file_struct *)bp;
+       file = (struct file_struct *)bp;
        memset(bp, 0, file_struct_len);
        bp += file_struct_len;
 
-       file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
+       file->flags = 0;
        file->modtime = modtime;
        file->length = file_length;
        file->mode = mode;
@@ -636,8 +641,33 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
                memcpy(bp, dirname, dirname_len - 1);
                bp += dirname_len;
                bp[-1] = '\0';
-       } else if (dirname)
-               file->dirname = dirname;
+               lastdir_depth = count_dir_elements(lastdir);
+               file->dir.depth = lastdir_depth + 1;
+       } else if (dirname) {
+               file->dirname = dirname; /* we're reusing lastname */
+               file->dir.depth = lastdir_depth + 1;
+       } else
+               file->dir.depth = 1;
+
+       if (S_ISDIR(mode)) {
+               if (basename_len == 1+1 && *basename == '.') /* +1 for '\0' */
+                       file->dir.depth--;
+               if (flags & XMIT_TOP_DIR) {
+                       in_del_hier = 1;
+                       del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2;
+                       if (relative_paths && del_hier_name_len > 2
+                           && basename_len == 1+1 && *basename == '.')
+                               del_hier_name_len -= 2;
+                       file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE;
+               } else if (in_del_hier) {
+                       if (!relative_paths || !del_hier_name_len
+                        || (l1 >= del_hier_name_len
+                         && thisname[del_hier_name_len] == '/'))
+                               file->flags |= FLAG_DEL_HERE;
+                       else
+                               in_del_hier = 0;
+               }
+       }
 
        file->basename = bp;
        memcpy(bp, basename, basename_len);
@@ -646,21 +676,21 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        if (preserve_devices && IS_DEVICE(mode))
                file->u.rdev = rdev;
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (linkname_len) {
                file->u.link = bp;
                read_sbuf(f, bp, linkname_len - 1);
                if (sanitize_paths)
-                       sanitize_path(bp, lastdir);
+                       sanitize_path(bp, bp, "", lastdir_depth);
                bp += linkname_len;
        }
 #endif
 
-#if SUPPORT_HARD_LINKS
+#ifdef SUPPORT_HARD_LINKS
        if (preserve_hard_links && protocol_version < 28 && S_ISREG(mode))
                flags |= XMIT_HAS_IDEV_DATA;
        if (flags & XMIT_HAS_IDEV_DATA) {
-               INO64_T inode;
+               int64 inode;
                if (protocol_version < 26) {
                        dev = read_int(f);
                        inode = read_int(f);
@@ -695,11 +725,12 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
        }
 
        if (!preserve_perms) {
-               extern int orig_umask;
                /* set an appropriate set of permissions based on original
                 * permissions and umask. This emulates what GNU cp does */
                file->mode &= ~orig_umask;
        }
+
+       return file;
 }
 
 
@@ -718,8 +749,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
  * statting directories if we're not recursing, but this is not a very
  * important case.  Some systems may not have d_type.
  **/
-struct file_struct *make_file(char *fname,
-    struct file_list *flist, int exclude_level)
+struct file_struct *make_file(char *fname, struct file_list *flist,
+                             int filter_level)
 {
        static char *lastdir;
        static int lastdir_len = -1;
@@ -732,51 +763,58 @@ struct file_struct *make_file(char *fname,
        char *basename, *dirname, *bp;
        unsigned short flags = 0;
 
-       if (!flist)     /* lastdir isn't valid if flist is NULL */
+       if (!flist || !flist->count)    /* Ignore lastdir when invalid. */
                lastdir_len = -1;
 
        if (strlcpy(thisname, fname, sizeof thisname)
            >= sizeof thisname - flist_dir_len) {
-               rprintf(FINFO, "skipping overly long name: %s\n", fname);
+               rprintf(FINFO, "skipping overly long name: %s\n",
+                       safe_fname(fname));
                return NULL;
        }
-       clean_fname(thisname);
+       clean_fname(thisname, 0);
        if (sanitize_paths)
-               sanitize_path(thisname, NULL);
+               sanitize_path(thisname, thisname, "", 0);
 
        memset(sum, 0, SUM_LENGTH);
 
        if (readlink_stat(thisname, &st, linkname) != 0) {
                int save_errno = errno;
-               if (errno == ENOENT) {
-                       enum logcode c = am_daemon && protocol_version < 28
-                           ? FERROR : FINFO;
-                       /* either symlink pointing nowhere or file that
-                        * was removed during rsync run; see if excluded
-                        * before reporting an error */
-                       if (exclude_level != NO_EXCLUDES
-                           && check_exclude_file(thisname, 0, exclude_level)) {
-                               /* file is excluded anyway, ignore silently */
-                               return NULL;
+               /* See if file is excluded before reporting an error. */
+               if (filter_level != NO_FILTERS
+                   && is_excluded(thisname, 0, filter_level))
+                       return NULL;
+               if (save_errno == ENOENT) {
+#ifdef SUPPORT_LINKS
+                       /* Avoid "vanished" error if symlink points nowhere. */
+                       if (copy_links && do_lstat(thisname, &st) == 0
+                           && S_ISLNK(st.st_mode)) {
+                               io_error |= IOERR_GENERAL;
+                               rprintf(FERROR, "symlink has no referent: %s\n",
+                                       full_fname(thisname));
+                       } else
+#endif
+                       {
+                               enum logcode c = am_daemon && protocol_version < 28
+                                   ? FERROR : FINFO;
+                               io_error |= IOERR_VANISHED;
+                               rprintf(c, "file has vanished: %s\n",
+                                       full_fname(thisname));
                        }
-                       io_error |= IOERR_VANISHED;
-                       rprintf(c, "file has vanished: %s\n",
-                           full_fname(thisname));
-               }
-               else {
+               } else {
                        io_error |= IOERR_GENERAL;
-                       rprintf(FERROR, "readlink %s failed: %s\n",
-                           full_fname(thisname), strerror(save_errno));
+                       rsyserr(FERROR, save_errno, "readlink %s failed",
+                               full_fname(thisname));
                }
                return NULL;
        }
 
-       /* backup.c calls us with exclude_level set to NO_EXCLUDES. */
-       if (exclude_level == NO_EXCLUDES)
-               goto skip_excludes;
+       /* backup.c calls us with filter_level set to NO_FILTERS. */
+       if (filter_level == NO_FILTERS)
+               goto skip_filters;
 
-       if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
-               rprintf(FINFO, "skipping directory %s\n", thisname);
+       if (S_ISDIR(st.st_mode) && !xfer_dirs) {
+               rprintf(FINFO, "skipping directory %s\n", safe_fname(thisname));
                return NULL;
        }
 
@@ -787,17 +825,22 @@ struct file_struct *make_file(char *fname,
            && S_ISDIR(st.st_mode))
                flags |= FLAG_MOUNT_POINT;
 
-       if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level))
+       if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
                return NULL;
 
-       if (lp_ignore_nonreadable(module_id) && access(thisname, R_OK) != 0)
-               return NULL;
+       if (lp_ignore_nonreadable(module_id)) {
+#ifdef SUPPORT_LINKS
+               if (!S_ISLNK(st.st_mode))
+#endif
+                       if (access(thisname, R_OK) != 0)
+                               return NULL;
+       }
 
-skip_excludes:
+skip_filters:
 
        if (verbose > 2) {
                rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
-                       who_am_i(), thisname, exclude_level);
+                       who_am_i(), safe_fname(thisname), filter_level);
        }
 
        if ((basename = strrchr(thisname, '/')) != NULL) {
@@ -815,7 +858,7 @@ skip_excludes:
        }
        basename_len = strlen(basename) + 1; /* count the '\0' */
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        linkname_len = S_ISLNK(st.st_mode) ? strlen(linkname) + 1 : 0;
 #else
        linkname_len = 0;
@@ -844,7 +887,7 @@ skip_excludes:
        file->uid = st.st_uid;
        file->gid = st.st_gid;
 
-#if SUPPORT_HARD_LINKS
+#ifdef SUPPORT_HARD_LINKS
        if (flist && flist->hlink_pool) {
                if (protocol_version < 28) {
                        if (S_ISREG(st.st_mode))
@@ -882,7 +925,7 @@ skip_excludes:
                file->u.rdev = st.st_rdev;
 #endif
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
        if (linkname_len) {
                file->u.link = bp;
                memcpy(bp, linkname, linkname_len);
@@ -896,128 +939,135 @@ skip_excludes:
                /*bp += sum_len;*/
        }
 
-       file->basedir = flist_dir;
+       file->dir.root = flist_dir;
+
+       /* This code is only used by the receiver when it is building
+        * a list of files for a delete pass. */
+       if (keep_dirlinks && linkname_len && flist) {
+               STRUCT_STAT st2;
+               int save_mode = file->mode;
+               file->mode = S_IFDIR; /* find a directory w/our name */
+               if (flist_find(the_file_list, file) >= 0
+                   && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
+                       file->modtime = st2.st_mtime;
+                       file->length = st2.st_size;
+                       file->mode = st2.st_mode;
+                       file->uid = st2.st_uid;
+                       file->gid = st2.st_gid;
+                       file->u.link = NULL;
+               } else
+                       file->mode = save_mode;
+       }
 
-       if (!S_ISDIR(st.st_mode))
+       if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
                stats.total_size += st.st_size;
 
        return file;
 }
 
 
-void send_file_name(int f, struct file_list *flist, char *fname,
-                   int recursive, unsigned short base_flags)
+static struct file_struct *send_file_name(int f, struct file_list *flist,
+                                         char *fname, unsigned short base_flags)
 {
        struct file_struct *file;
-       char fbuf[MAXPATHLEN];
-       extern int delete_excluded;
-
-       /* f is set to -1 when calculating deletion file list */
-       file = make_file(fname, flist,
-           f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES);
 
+       file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
        if (!file)
-               return;
+               return NULL;
 
-       maybe_emit_filelist_progress(flist);
+       maybe_emit_filelist_progress(flist->count + flist_count_offset);
 
        flist_expand(flist);
 
-       if (write_batch)
-               file->flags |= FLAG_TOP_DIR;
-
        if (file->basename[0]) {
                flist->files[flist->count++] = file;
                send_file_entry(file, f, base_flags);
        }
+       return file;
+}
 
-       if (recursive && S_ISDIR(file->mode)
-           && !(file->flags & FLAG_MOUNT_POINT)) {
-               struct exclude_struct **last_exclude_list = local_exclude_list;
-               send_directory(f, flist, f_name_to(file, fbuf));
-               local_exclude_list = last_exclude_list;
-               return;
+static void send_if_directory(int f, struct file_list *flist,
+                             struct file_struct *file)
+{
+       char fbuf[MAXPATHLEN];
+
+       if (S_ISDIR(file->mode)
+           && !(file->flags & FLAG_MOUNT_POINT) && f_name_to(file, fbuf)) {
+               void *save_filters;
+               unsigned int len = strlen(fbuf);
+               if (len > 1 && fbuf[len-1] == '/')
+                       fbuf[--len] = '\0';
+               if (len >= MAXPATHLEN - 1) {
+                       io_error |= IOERR_GENERAL;
+                       rprintf(FERROR, "skipping long-named directory: %s\n",
+                               full_fname(fbuf));
+                       return;
+               }
+               save_filters = push_local_filters(fbuf, len);
+               send_directory(f, flist, fbuf, len);
+               pop_local_filters(save_filters);
        }
 }
 
 
-static void send_directory(int f, struct file_list *flist, char *dir)
+/* This function is normally called by the sender, but the receiving side also
+ * calls it from get_dirlist() with f set to -1 so that we just construct the
+ * file list in memory without sending it over the wire.  Also, get_dirlist()
+ * might call this with f set to -2, which also indicates that local filter
+ * rules should be ignored. */
+static void send_directory(int f, struct file_list *flist,
+                          char *fbuf, int len)
 {
-       DIR *d;
        struct dirent *di;
-       char fname[MAXPATHLEN];
-       unsigned int offset;
+       unsigned remainder;
        char *p;
+       DIR *d;
+       int start = flist->count;
 
-       d = opendir(dir);
-       if (!d) {
+       if (!(d = opendir(fbuf))) {
                io_error |= IOERR_GENERAL;
-               rprintf(FERROR, "opendir %s failed: %s\n",
-                       full_fname(dir), strerror(errno));
+               rsyserr(FERROR, errno, "opendir %s failed", full_fname(fbuf));
                return;
        }
 
-       offset = strlcpy(fname, dir, MAXPATHLEN);
-       p = fname + offset;
-       if (offset >= MAXPATHLEN || p[-1] != '/') {
-               if (offset >= MAXPATHLEN - 1) {
-                       io_error |= IOERR_GENERAL;
-                       rprintf(FERROR, "skipping long-named directory: %s\n",
-                               full_fname(fname));
-                       closedir(d);
-                       return;
-               }
+       p = fbuf + len;
+       if (len != 1 || *fbuf != '/')
                *p++ = '/';
-               offset++;
-       }
-
-       local_exclude_list = NULL;
-
-       if (cvs_exclude) {
-               if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
-                   < MAXPATHLEN - offset)
-                       add_exclude_file(&local_exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
-               else {
-                       io_error |= IOERR_GENERAL;
-                       rprintf(FINFO,
-                               "cannot cvs-exclude in long-named directory %s\n",
-                               full_fname(fname));
-               }
-       }
+       *p = '\0';
+       remainder = MAXPATHLEN - (p - fbuf);
 
        for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
                char *dname = d_name(di);
                if (dname[0] == '.' && (dname[1] == '\0'
                    || (dname[1] == '.' && dname[2] == '\0')))
                        continue;
-               if (strlcpy(p, dname, MAXPATHLEN - offset) < MAXPATHLEN - offset)
-                       send_file_name(f, flist, fname, recurse, 0);
+               if (strlcpy(p, dname, remainder) < remainder)
+                       send_file_name(f, flist, fbuf, 0);
                else {
                        io_error |= IOERR_GENERAL;
                        rprintf(FINFO,
                                "cannot send long-named file %s\n",
-                               full_fname(fname));
+                               full_fname(fbuf));
                }
        }
+
+       fbuf[len] = '\0';
+
        if (errno) {
                io_error |= IOERR_GENERAL;
-               rprintf(FERROR, "readdir(%s): (%d) %s\n",
-                       dir, errno, strerror(errno));
+               rsyserr(FERROR, errno, "readdir(%s)", full_fname(fbuf));
        }
 
-       if (local_exclude_list)
-               free_exclude_list(&local_exclude_list); /* Zeros pointer too */
-
        closedir(d);
+
+       if (recurse) {
+               int i, end = flist->count - 1;
+               for (i = start; i <= end; i++)
+                       send_if_directory(f, flist, flist->files[i]);
+       }
 }
 
 
-/**
- * The delete_files() function in receiver.c sets f to -1 so that we just
- * construct the file list in memory without sending it over the wire.  It
- * also has the side-effect of ignoring user-excludes if delete_excluded
- * is set (so that the delete list includes user-excluded files).
- **/
 struct file_list *send_file_list(int f, int argc, char *argv[])
 {
        int l;
@@ -1025,67 +1075,81 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
        char *p, *dir, olddir[sizeof curr_dir];
        char lastpath[MAXPATHLEN] = "";
        struct file_list *flist;
+       struct timeval start_tv, end_tv;
        int64 start_write;
        int use_ff_fd = 0;
 
-       if (show_filelist_p() && f != -1)
+       if (show_filelist_p())
                start_filelist_progress("building file list");
 
        start_write = stats.total_written;
+       gettimeofday(&start_tv, NULL);
 
-       flist = flist_new(f == -1 ? WITHOUT_HLINK : WITH_HLINK,
-           "send_file_list");
+       flist = flist_new(WITH_HLINK, "send_file_list");
 
-       if (f != -1) {
-               io_start_buffering_out(f);
-               if (filesfrom_fd >= 0) {
-                       if (argv[0] && !push_dir(argv[0])) {
-                               rprintf(FERROR, "push_dir %s failed: %s\n",
-                                       full_fname(argv[0]), strerror(errno));
-                               exit_cleanup(RERR_FILESELECT);
-                       }
-                       use_ff_fd = 1;
+       io_start_buffering_out();
+       if (filesfrom_fd >= 0) {
+               if (argv[0] && !push_dir(argv[0])) {
+                       rsyserr(FERROR, errno, "push_dir %s failed",
+                               full_fname(argv[0]));
+                       exit_cleanup(RERR_FILESELECT);
                }
+               use_ff_fd = 1;
        }
 
        while (1) {
+               struct file_struct *file;
                char fname2[MAXPATHLEN];
                char *fname = fname2;
+               int is_dot_dir;
 
                if (use_ff_fd) {
                        if (read_filesfrom_line(filesfrom_fd, fname) == 0)
                                break;
-                       sanitize_path(fname, NULL);
+                       sanitize_path(fname, fname, "", 0);
                } else {
                        if (argc-- == 0)
                                break;
                        strlcpy(fname, *argv++, MAXPATHLEN);
                        if (sanitize_paths)
-                               sanitize_path(fname, NULL);
+                               sanitize_path(fname, fname, "", 0);
                }
 
                l = strlen(fname);
-               if (fname[l - 1] == '/') {
+               if (!l || fname[l - 1] == '/') {
                        if (l == 2 && fname[0] == '.') {
                                /* Turn "./" into just "." rather than "./." */
                                fname[1] = '\0';
-                       } else if (l < MAXPATHLEN) {
+                       } else {
+                               if (l + 1 >= MAXPATHLEN)
+                                       overflow("send_file_list");
                                fname[l++] = '.';
                                fname[l] = '\0';
                        }
+                       is_dot_dir = 1;
+               } else if (l > 1 && fname[l-1] == '.' && fname[l-2] == '.'
+                   && (l == 2 || fname[l-3] == '/')) {
+                       if (l + 2 >= MAXPATHLEN)
+                               overflow("send_file_list");
+                       fname[l++] = '/';
+                       fname[l++] = '.';
+                       fname[l] = '\0';
+                       is_dot_dir = 1;
+               } else {
+                       is_dot_dir = fname[l-1] == '.'
+                                  && (l == 1 || fname[l-2] == '/');
                }
 
-               if (link_stat(fname, &st) != 0) {
-                       if (f != -1) {
-                               io_error |= IOERR_GENERAL;
-                               rprintf(FERROR, "link_stat %s failed: %s\n",
-                                       full_fname(fname), strerror(errno));
-                       }
+               if (link_stat(fname, &st, keep_dirlinks) != 0) {
+                       io_error |= IOERR_GENERAL;
+                       rsyserr(FERROR, errno, "link_stat %s failed",
+                               full_fname(fname));
                        continue;
                }
 
-               if (S_ISDIR(st.st_mode) && !recurse && !files_from) {
-                       rprintf(FINFO, "skipping directory %s\n", fname);
+               if (S_ISDIR(st.st_mode) && !xfer_dirs) {
+                       rprintf(FINFO, "skipping directory %s\n",
+                               safe_fname(fname));
                        continue;
                }
 
@@ -1102,7 +1166,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                                        dir = fname;
                                fname = p + 1;
                        }
-               } else if (f != -1 && implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
+               } else if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
                        /* this ensures we send the intermediate directories,
                           thus getting their permissions right */
                        char *lp = lastpath, *fn = fname, *slash = fname;
@@ -1116,21 +1180,17 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                        }
                        *p = '/';
                        if (fn != p || (*lp && *lp != '/')) {
-                               int copy_links_saved = copy_links;
-                               int recurse_saved = recurse;
+                               int save_copy_links = copy_links;
+                               int save_xfer_dirs = xfer_dirs;
                                copy_links = copy_unsafe_links;
-                               /* set recurse to 1 to prevent make_file
-                                * from ignoring directory, but still
-                                * turn off the recursive parameter to
-                                * send_file_name */
-                               recurse = 1;
+                               xfer_dirs = 1;
                                while ((slash = strchr(slash+1, '/')) != 0) {
                                        *slash = 0;
-                                       send_file_name(f, flist, fname, 0, 0);
+                                       send_file_name(f, flist, fname, 0);
                                        *slash = '/';
                                }
-                               copy_links = copy_links_saved;
-                               recurse = recurse_saved;
+                               copy_links = save_copy_links;
+                               xfer_dirs = save_xfer_dirs;
                                *p = 0;
                                strlcpy(lastpath, fname, sizeof lastpath);
                                *p = '/';
@@ -1148,8 +1208,8 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
                        if (!push_dir(dir)) {
                                io_error |= IOERR_GENERAL;
-                               rprintf(FERROR, "push_dir %s failed: %s\n",
-                                       full_fname(dir), strerror(errno));
+                               rsyserr(FERROR, errno, "push_dir %s failed",
+                                       full_fname(dir));
                                continue;
                        }
 
@@ -1163,49 +1223,61 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                }
 
                if (one_file_system)
-                       set_filesystem(fname);
+                       filesystem_dev = st.st_dev;
 
-               send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
+               if ((file = send_file_name(f, flist, fname, XMIT_TOP_DIR))) {
+                       if (recurse || (xfer_dirs && is_dot_dir))
+                               send_if_directory(f, flist, file);
+               }
 
                if (olddir[0]) {
                        flist_dir = NULL;
                        flist_dir_len = 0;
                        if (!pop_dir(olddir)) {
-                               rprintf(FERROR, "pop_dir %s failed: %s\n",
-                                       full_fname(dir), strerror(errno));
+                               rsyserr(FERROR, errno, "pop_dir %s failed",
+                                       full_fname(dir));
                                exit_cleanup(RERR_FILESELECT);
                        }
                }
        }
 
-       if (f != -1) {
-               send_file_entry(NULL, f, 0);
+       gettimeofday(&end_tv, NULL);
+       stats.flist_buildtime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+                             + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
+       if (stats.flist_buildtime == 0)
+               stats.flist_buildtime = 1;
+       start_tv = end_tv;
 
-               if (show_filelist_p())
-                       finish_filelist_progress(flist);
-       }
+       send_file_entry(NULL, f, 0);
+
+       if (show_filelist_p())
+               finish_filelist_progress(flist);
+
+       gettimeofday(&end_tv, NULL);
+       stats.flist_xfertime = (int64)(end_tv.tv_sec - start_tv.tv_sec) * 1000
+                            + (end_tv.tv_usec - start_tv.tv_usec) / 1000;
 
        if (flist->hlink_pool) {
                pool_destroy(flist->hlink_pool);
                flist->hlink_pool = NULL;
        }
 
+       /* Sort the list without removing any duplicates.  This allows the
+        * receiving side to ask for any name they like, which gives us the
+        * flexibility to change the way we unduplicate names in the future
+        * without causing a compatibility problem with older versions. */
        clean_flist(flist, 0, 0);
 
-       if (f != -1) {
-               /* Now send the uid/gid list. This was introduced in
-                * protocol version 15 */
-               send_uid_list(f);
+       /* Now send the uid/gid list. This was introduced in
+        * protocol version 15 */
+       send_uid_list(f);
 
-               /* send the io_error flag */
-               write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
+       /* send the io_error flag */
+       write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
 
-               io_end_buffering();
-               stats.flist_size = stats.total_written - start_write;
-               stats.num_files = flist->count;
-               if (write_batch)
-                       write_batch_flist_info(flist->count, flist->files);
-       }
+       io_end_buffering();
+       stats.flist_size = stats.total_written - start_write;
+       stats.num_files = flist->count;
 
        if (verbose > 3)
                output_flist(flist);
@@ -1222,7 +1294,6 @@ struct file_list *recv_file_list(int f)
        struct file_list *flist;
        unsigned short flags;
        int64 start_read;
-       extern int list_only;
 
        if (show_filelist_p())
                start_filelist_progress("receiving file list");
@@ -1239,27 +1310,27 @@ struct file_list *recv_file_list(int f)
 
 
        while ((flags = read_byte(f)) != 0) {
-               int i = flist->count;
+               struct file_struct *file;
 
                flist_expand(flist);
 
                if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
                        flags |= read_byte(f) << 8;
-               receive_file_entry(&flist->files[i], flags, flist, f);
+               file = receive_file_entry(flist, flags, f);
 
-               if (S_ISREG(flist->files[i]->mode))
-                       stats.total_size += flist->files[i]->length;
+               if (S_ISREG(file->mode))
+                       stats.total_size += file->length;
 
-               flist->count++;
+               flist->files[flist->count++] = file;
 
-               maybe_emit_filelist_progress(flist);
+               maybe_emit_filelist_progress(flist->count);
 
                if (verbose > 2) {
                        rprintf(FINFO, "recv_file_name(%s)\n",
-                               f_name(flist->files[i]));
+                               safe_fname(f_name(file)));
                }
        }
-       receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
+       receive_file_entry(NULL, 0, 0); /* Signal that we're done. */
 
        if (verbose > 2)
                rprintf(FINFO, "received %d names\n", flist->count);
@@ -1269,18 +1340,16 @@ struct file_list *recv_file_list(int f)
 
        clean_flist(flist, relative_paths, 1);
 
-       if (f != -1) {
+       if (f >= 0) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
                recv_uid_list(f, flist);
 
-               if (!read_batch) {
-                       /* Recv the io_error flag */
-                       if (lp_ignore_errors(module_id) || ignore_errors)
-                               read_int(f);
-                       else
-                               io_error |= read_int(f);
-               }
+               /* Recv the io_error flag */
+               if (lp_ignore_errors(module_id) || ignore_errors)
+                       read_int(f);
+               else
+                       io_error |= read_int(f);
        }
 
        if (verbose > 3)
@@ -1306,48 +1375,42 @@ oom:
 }
 
 
-int file_compare(struct file_struct **file1, struct file_struct **file2)
+static int file_compare(struct file_struct **file1, struct file_struct **file2)
 {
-       struct file_struct *f1 = *file1;
-       struct file_struct *f2 = *file2;
-
-       if (!f1->basename && !f2->basename)
-               return 0;
-       if (!f1->basename)
-               return -1;
-       if (!f2->basename)
-               return 1;
-       if (f1->dirname == f2->dirname)
-               return u_strcmp(f1->basename, f2->basename);
-       return f_name_cmp(f1, f2);
+       return f_name_cmp(*file1, *file2);
 }
 
 
+/* Search for an identically-named item in the file list.  Note that the
+ * items must agree in their directory-ness, or no match is returned. */
 int flist_find(struct file_list *flist, struct file_struct *f)
 {
-       int low = 0, high = flist->count - 1;
-
-       while (high >= 0 && !flist->files[high]->basename) high--;
-
-       if (high < 0)
-               return -1;
-
-       while (low != high) {
-               int mid = (low + high) / 2;
-               int ret = file_compare(&flist->files[flist_up(flist, mid)],&f);
-               if (ret == 0)
-                       return flist_up(flist, mid);
+       int low = flist->low, high = flist->high;
+       int ret, mid, mid_up;
+
+       while (low <= high) {
+               mid = (low + high) / 2;
+               for (mid_up = mid; !flist->files[mid_up]->basename; mid_up++) {}
+               if (mid_up <= high)
+                       ret = f_name_cmp(flist->files[mid_up], f);
+               else
+                       ret = 1;
+               if (ret == 0) {
+                       if (protocol_version < 29
+                           && S_ISDIR(flist->files[mid_up]->mode)
+                           != S_ISDIR(f->mode))
+                               return -1;
+                       return mid_up;
+               }
                if (ret > 0)
-                       high = mid;
+                       high = mid - 1;
                else
-                       low = mid + 1;
+                       low = mid_up + 1;
        }
-
-       if (file_compare(&flist->files[flist_up(flist, low)], &f) == 0)
-               return flist_up(flist, low);
        return -1;
 }
 
+
 /*
  * Free up any resources a file_struct has allocated
  * and clear the file.
@@ -1377,7 +1440,7 @@ struct file_list *flist_new(int with_hlink, char *msg)
            out_of_memory, POOL_INTERN)))
                out_of_memory(msg);
 
-#if SUPPORT_HARD_LINKS
+#ifdef SUPPORT_HARD_LINKS
        if (with_hlink && preserve_hard_links) {
                if (!(flist->hlink_pool = pool_create(HLINK_EXTENT,
                    sizeof (struct idev), out_of_memory, POOL_INTERN)))
@@ -1408,11 +1471,17 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 {
        int i, prev_i = 0;
 
-       if (!flist || flist->count == 0)
+       if (!flist)
+               return;
+       if (flist->count == 0) {
+               flist->high = -1;
                return;
+       }
 
+       sorting_flist = flist;
        qsort(flist->files, flist->count,
-           sizeof flist->files[0], (int (*)()) file_compare);
+           sizeof flist->files[0], (int (*)())file_compare);
+       sorting_flist = NULL;
 
        for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
                if (flist->files[i]->basename) {
@@ -1420,55 +1489,95 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
                        break;
                }
        }
+       flist->low = prev_i;
        while (++i < flist->count) {
-               if (!flist->files[i]->basename)
+               int j;
+               struct file_struct *file = flist->files[i];
+
+               if (!file->basename)
                        continue;
-               if (f_name_cmp(flist->files[i], flist->files[prev_i]) == 0) {
+               if (f_name_cmp(file, flist->files[prev_i]) == 0)
+                       j = prev_i;
+               else if (protocol_version >= 29 && S_ISDIR(file->mode)) {
+                       int save_mode = file->mode;
+                       /* Make sure that this directory doesn't duplicate a
+                        * non-directory earlier in the list. */
+                       flist->high = prev_i;
+                       file->mode = S_IFREG;
+                       j = flist_find(flist, file);
+                       file->mode = save_mode;
+               } else
+                       j = -1;
+               if (j >= 0) {
+                       struct file_struct *fp = flist->files[j];
+                       int keep, drop;
+                       /* If one is a dir and the other is not, we want to
+                        * keep the dir because it might have contents in the
+                        * list. */
+                       if (S_ISDIR(file->mode) != S_ISDIR(fp->mode)) {
+                               if (S_ISDIR(file->mode))
+                                       keep = i, drop = j;
+                               else
+                                       keep = j, drop = i;
+                       } else
+                               keep = j, drop = i;
                        if (verbose > 1 && !am_server) {
                                rprintf(FINFO,
-                                       "removing duplicate name %s from file list %d\n",
-                                       f_name(flist->files[i]), i);
+                                       "removing duplicate name %s from file list (%d)\n",
+                                       safe_fname(f_name(file)), drop);
                        }
                        /* Make sure that if we unduplicate '.', that we don't
-                        * lose track of a user-specified starting point (or
-                        * else deletions will mysteriously fail with -R). */
-                       if (flist->files[i]->flags & FLAG_TOP_DIR)
-                               flist->files[prev_i]->flags |= FLAG_TOP_DIR;
-
-                       clear_file(i, flist);
+                        * lose track of a user-specified top directory. */
+                       flist->files[keep]->flags |= flist->files[drop]->flags
+                                                  & (FLAG_TOP_DIR|FLAG_DEL_HERE);
+
+                       clear_file(drop, flist);
+
+                       if (keep == i) {
+                               if (flist->low == drop) {
+                                       for (j = drop + 1;
+                                            j < i && !flist->files[j]->basename;
+                                            j++) {}
+                                       flist->low = j;
+                               }
+                               prev_i = i;
+                       }
                } else
                        prev_i = i;
        }
+       flist->high = no_dups ? prev_i : flist->count - 1;
 
        if (strip_root) {
-               /* we need to strip off the root directory in the case
-                  of relative paths, but this must be done _after_
-                  the sorting phase */
-               for (i = 0; i < flist->count; i++) {
-                       if (flist->files[i]->dirname &&
-                           flist->files[i]->dirname[0] == '/') {
-                               memmove(&flist->files[i]->dirname[0],
-                                       &flist->files[i]->dirname[1],
-                                       strlen(flist->files[i]->dirname));
-                       }
+               /* We need to strip off the leading slashes for relative
+                * paths, but this must be done _after_ the sorting phase. */
+               for (i = flist->low; i <= flist->high; i++) {
+                       struct file_struct *file = flist->files[i];
 
-                       if (flist->files[i]->dirname &&
-                           !flist->files[i]->dirname[0]) {
-                               flist->files[i]->dirname = NULL;
+                       if (!file->dirname)
+                               continue;
+                       if (*file->dirname == '/') {
+                               char *s = file->dirname + 1;
+                               while (*s == '/') s++;
+                               memmove(file->dirname, s, strlen(s) + 1);
                        }
+
+                       if (!*file->dirname)
+                               file->dirname = NULL;
                }
        }
 }
 
+
 static void output_flist(struct file_list *flist)
 {
-       char uidbuf[16], gidbuf[16];
+       char uidbuf[16], gidbuf[16], depthbuf[16];
        struct file_struct *file;
+       const char *who = who_am_i();
        int i;
 
        for (i = 0; i < flist->count; i++) {
                file = flist->files[i];
-               if (am_root && preserve_uid)
+               if ((am_root || am_sender) && preserve_uid)
                        sprintf(uidbuf, " uid=%ld", (long)file->uid);
                else
                        *uidbuf = '\0';
@@ -1476,25 +1585,43 @@ static void output_flist(struct file_list *flist)
                        sprintf(gidbuf, " gid=%ld", (long)file->gid);
                else
                        *gidbuf = '\0';
-               rprintf(FINFO, "[%s] i=%d %s %s %s mode=0%o len=%.0f%s%s\n",
-                       who_am_i(), i, NS(file->basedir), NS(file->dirname),
-                       NS(file->basename), (int) file->mode,
-                       (double) file->length, uidbuf, gidbuf);
+               if (!am_sender)
+                       sprintf(depthbuf, "%d", file->dir.depth);
+               rprintf(FINFO, "[%s] i=%d %s %s%s%s%s mode=0%o len=%.0f%s%s flags=%x\n",
+                       who, i, am_sender ? NS(file->dir.root) : depthbuf,
+                       file->dirname ? safe_fname(file->dirname) : "",
+                       file->dirname ? "/" : "", NS(file->basename),
+                       S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
+                       (double)file->length, uidbuf, gidbuf, file->flags);
        }
 }
 
 
-enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE };
+enum fnc_state { s_DIR, s_SLASH, s_BASE, s_TRAILING };
+enum fnc_type { t_PATH, t_ITEM };
 
-/* Compare the names of two file_struct entities, just like strcmp()
- * would do if it were operating on the joined strings.  We assume
- * that there are no 0-length strings.
- */
+/* Compare the names of two file_struct entities, similar to how strcmp()
+ * would do if it were operating on the joined strings.
+ *
+ * Some differences beginning with protocol_version 29: (1) directory names
+ * are compared with an assumed trailing slash so that they compare in a
+ * way that would cause them to sort immediately prior to any content they
+ * may have; (2) a directory of any name compares after a non-directory of
+ * any name at the same depth; (3) a directory with name "." compares prior
+ * to anything else.  These changes mean that a directory and a non-dir
+ * with the same name will not compare as equal (protocol_version >= 29).
+ *
+ * The dirname component can be an empty string, but the basename component
+ * cannot (and never is in the current codebase).  The basename component
+ * may be NULL (for a removed item), in which case it is considered to be
+ * after any existing item. */
 int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 {
        int dif;
        const uchar *c1, *c2;
        enum fnc_state state1, state2;
+       enum fnc_type type1, type2;
+       enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
 
        if (!f1 || !f1->basename) {
                if (!f2 || !f2->basename)
@@ -1504,49 +1631,112 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
        if (!f2 || !f2->basename)
                return 1;
 
-       if (!(c1 = (uchar*)f1->dirname)) {
-               state1 = fnc_BASE;
+       c1 = (uchar*)f1->dirname;
+       c2 = (uchar*)f2->dirname;
+       if (c1 == c2)
+               c1 = c2 = NULL;
+       if (!c1) {
+               type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM;
                c1 = (uchar*)f1->basename;
-       } else
-               state1 = fnc_DIR;
-       if (!(c2 = (uchar*)f2->dirname)) {
-               state2 = fnc_BASE;
+               if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
+                       type1 = t_ITEM;
+                       state1 = s_TRAILING;
+                       c1 = (uchar*)"";
+               } else
+                       state1 = s_BASE;
+       } else if (!*c1) {
+               type1 = t_path;
+               state1 = s_SLASH;
+               c1 = (uchar*)"/";
+       } else {
+               type1 = t_path;
+               state1 = s_DIR;
+       }
+       if (!c2) {
+               type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM;
                c2 = (uchar*)f2->basename;
-       } else
-               state2 = fnc_DIR;
+               if (type2 == t_PATH && *c2 == '.' && !c2[1]) {
+                       type2 = t_ITEM;
+                       state2 = s_TRAILING;
+                       c2 = (uchar*)"";
+               } else
+                       state2 = s_BASE;
+       } else if (!*c2) {
+               type2 = t_path;
+               state2 = s_SLASH;
+               c2 = (uchar*)"/";
+       } else {
+               type2 = t_path;
+               state2 = s_DIR;
+       }
+
+       if (type1 != type2)
+               return type1 == t_PATH ? 1 : -1;
 
        while (1) {
-               if ((dif = (int)*c1 - (int)*c2) != 0)
+               if ((dif = (int)*c1++ - (int)*c2++) != 0)
                        break;
-               if (!*++c1) {
+               if (!*c1) {
                        switch (state1) {
-                       case fnc_DIR:
-                               state1 = fnc_SLASH;
+                       case s_DIR:
+                               state1 = s_SLASH;
                                c1 = (uchar*)"/";
                                break;
-                       case fnc_SLASH:
-                               state1 = fnc_BASE;
+                       case s_SLASH:
+                               type1 = S_ISDIR(f1->mode) ? t_path : t_ITEM;
                                c1 = (uchar*)f1->basename;
+                               if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
+                                       type1 = t_ITEM;
+                                       state1 = s_TRAILING;
+                                       c1 = (uchar*)"";
+                               } else
+                                       state1 = s_BASE;
                                break;
-                       case fnc_BASE:
+                       case s_BASE:
+                               state1 = s_TRAILING;
+                               if (type1 == t_PATH) {
+                                       c1 = (uchar*)"/";
+                                       break;
+                               }
+                               /* FALL THROUGH */
+                       case s_TRAILING:
+                               type1 = t_ITEM;
                                break;
                        }
+                       if (*c2 && type1 != type2)
+                               return type1 == t_PATH ? 1 : -1;
                }
-               if (!*++c2) {
+               if (!*c2) {
                        switch (state2) {
-                       case fnc_DIR:
-                               state2 = fnc_SLASH;
+                       case s_DIR:
+                               state2 = s_SLASH;
                                c2 = (uchar*)"/";
                                break;
-                       case fnc_SLASH:
-                               state2 = fnc_BASE;
+                       case s_SLASH:
+                               type2 = S_ISDIR(f2->mode) ? t_path : t_ITEM;
                                c2 = (uchar*)f2->basename;
+                               if (type2 == t_PATH && *c2 == '.' && !c2[1]) {
+                                       type2 = t_ITEM;
+                                       state2 = s_TRAILING;
+                                       c2 = (uchar*)"";
+                               } else
+                                       state2 = s_BASE;
                                break;
-                       case fnc_BASE:
+                       case s_BASE:
+                               state2 = s_TRAILING;
+                               if (type2 == t_PATH) {
+                                       c2 = (uchar*)"/";
+                                       break;
+                               }
+                               /* FALL THROUGH */
+                       case s_TRAILING:
                                if (!*c1)
                                        return 0;
+                               type2 = t_ITEM;
                                break;
                        }
+                       if (type1 != type2)
+                               return type1 == t_PATH ? 1 : -1;
                }
        }
 
@@ -1574,8 +1764,7 @@ char *f_name_to(struct file_struct *f, char *fbuf)
 }
 
 
-/* Like f_name_to(), but we rotate through 5 static buffers of our own.
- */
+/* Like f_name_to(), but we rotate through 5 static buffers of our own. */
 char *f_name(struct file_struct *f)
 {
        static char names[5][MAXPATHLEN];
@@ -1585,3 +1774,39 @@ char *f_name(struct file_struct *f)
 
        return f_name_to(f, names[n]);
 }
+
+
+/* Do a non-recursive scan of the named directory, possibly ignoring all
+ * exclude rules except for the daemon's.  If "dlen" is >=0, it is the length
+ * of the dirname string, and also indicates that "dirname" is a MAXPATHLEN
+ * buffer (the functions we call will append names onto the end, but the old
+ * dir value will be restored on exit). */
+struct file_list *get_dirlist(char *dirname, int dlen,
+                             int ignore_filter_rules)
+{
+       struct file_list *dirlist;
+       char dirbuf[MAXPATHLEN];
+       int save_recurse = recurse;
+
+       if (dlen < 0) {
+               dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
+               if (dlen >= MAXPATHLEN)
+                       return NULL;
+               dirname = dirbuf;
+       }
+
+       dirlist = flist_new(WITHOUT_HLINK, "get_dirlist");
+
+       recurse = 0;
+       send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen);
+       recurse = save_recurse;
+       if (do_progress)
+               flist_count_offset += dirlist->count;
+
+       clean_flist(dirlist, 0, 0);
+
+       if (verbose > 3)
+               output_flist(dirlist);
+
+       return dirlist;
+}