X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7e037c422653e58b3901188718fe910bf21ac371..9aacb4df0e29b11e298d7353467d821e4a17cc12:/flist.c

diff --git a/flist.c b/flist.c
index 21eef260..11473dc0 100644
--- a/flist.c
+++ b/flist.c
@@ -27,26 +27,21 @@
 
 #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 int xfer_dirs;
-extern char curr_dir[MAXPATHLEN];
 extern int filesfrom_fd;
-
 extern int one_file_system;
 extern int keep_dirlinks;
 extern int preserve_links;
@@ -61,22 +56,25 @@ extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
 extern int sanitize_paths;
-extern int delete_excluded;
 extern int orig_umask;
-extern int list_only;
+extern struct stats stats;
+extern struct file_list *the_file_list;
 
-extern struct exclude_list_struct exclude_list;
-extern struct exclude_list_struct server_exclude_list;
-extern struct exclude_list_struct local_exclude_list;
+extern char curr_dir[MAXPATHLEN];
+
+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 *received_flist;
+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, const char *whose_list);
+static void output_flist(struct file_list *flist);
 
 void init_flist(void)
 {
@@ -86,7 +84,6 @@ void init_flist(void)
 	file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
 }
 
-
 static int show_filelist_p(void)
 {
 	return verbose && xfer_dirs && !am_server;
@@ -100,20 +97,17 @@ static void start_filelist_progress(char *kind)
 	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);
 }
 
-
 static void finish_filelist_progress(const struct file_list *flist)
 {
 	if (do_progress) {
@@ -129,7 +123,6 @@ void show_flist_stats(void)
 	/* Nothing yet */
 }
 
-
 static void list_file_entry(struct file_struct *f)
 {
 	char perms[11];
@@ -141,23 +134,22 @@ static void list_file_entry(struct file_struct *f)
 
 	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);
+			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));
+			safe_fname(f_name(f)));
 	}
 }
 
-
 /**
  * Stat either a symlink or its referent, depending on the settings of
  * copy_links, copy_unsafe_links, etc.
@@ -174,7 +166,7 @@ static void list_file_entry(struct file_struct *f)
  **/
 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 (link_stat(path, buffer, 0) < 0)
@@ -187,7 +179,7 @@ static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 		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);
 		}
@@ -200,7 +192,7 @@ static int readlink_stat(const char *path, STRUCT_STAT *buffer, char *linkbuf)
 
 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);
 	if (do_lstat(path, buffer) < 0)
@@ -216,17 +208,13 @@ int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks)
 #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)
 {
-	int rc;
-
 #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) {
@@ -240,35 +228,20 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level)
 				return 0;
 		}
 	}
-	if (server_exclude_list.head
-	    && check_exclude(&server_exclude_list, fname, is_dir) < 0)
+	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.head
-	    && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
-		return rc < 0;
-	if (local_exclude_list.head
-	    && check_exclude(&local_exclude_list, fname, is_dir) < 0)
+	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 (do_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
@@ -282,8 +255,8 @@ static mode_t from_wire_mode(int 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;
@@ -344,7 +317,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	char fname[MAXPATHLEN];
 	int l1, l2;
 
-	if (f == -1)
+	if (f < 0)
 		return;
 
 	if (!file) {
@@ -399,7 +372,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)
@@ -422,11 +395,11 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 	/* We must make sure we don't send a zero flag byte or the
 	 * other end will terminate the flist transfer.  Note that
-	 * the use of XMIT_DEL_START on a non-dir has no meaning, so
+	 * the use of XMIT_TOP_DIR on a non-dir has no meaning, so
 	 * it's harmless way to add a bit to the first flag byte. */
 	if (protocol_version >= 28) {
 		if (!flags && !S_ISDIR(mode))
-			flags |= XMIT_DEL_START;
+			flags |= XMIT_TOP_DIR;
 		if ((flags & 0xFF00) || !flags) {
 			flags |= XMIT_EXTENDED_FLAGS;
 			write_byte(f, flags);
@@ -434,10 +407,8 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 		} else
 			write_byte(f, flags);
 	} else {
-		if (!(flags & 0xFF) && !S_ISDIR(mode))
-			flags |= XMIT_DEL_START;
 		if (!(flags & 0xFF))
-			flags |= XMIT_LONG_NAME;
+			flags |= S_ISDIR(mode) ? XMIT_LONG_NAME : XMIT_TOP_DIR;
 		write_byte(f, flags);
 	}
 	if (flags & XMIT_SAME_NAME)
@@ -477,7 +448,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 		}
 	}
 
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(mode)) {
 		int len = strlen(file->u.link);
 		write_int(f, len);
@@ -485,7 +456,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 */
@@ -500,19 +471,16 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	}
 #endif
 
-	if (always_checksum) {
+	if (always_checksum && (S_ISREG(mode) || protocol_version < 28)) {
 		char *sum;
+		int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
 		if (S_ISREG(mode))
 			sum = file->u.sum;
-		else if (protocol_version < 28) {
+		else {
 			/* Prior to 28, we sent a useless set of nulls. */
 			sum = empty_sum;
-		} else
-			sum = NULL;
-		if (sum) {
-			write_buf(f, sum,
-			    protocol_version < 21 ? 2 : MD4_SUM_LENGTH);
 		}
+		write_buf(f, sum, slen);
 	}
 
 	strlcpy(lastname, fname, MAXPATHLEN);
@@ -520,10 +488,8 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 	io_write_phase = "unknown";
 }
 
-
-
-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;
@@ -534,6 +500,8 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	static gid_t gid;
 	static char lastname[MAXPATHLEN], *lastdir;
 	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;
@@ -541,14 +509,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;
 		dev = 0, rdev = makedev(0, 0);
 		rdev_major = 0;
 		uid = 0, gid = 0;
 		*lastname = '\0';
 		lastdir_len = -1;
-		return;
+		in_del_hier = 0;
+		return NULL;
 	}
 
 	if (flags & XMIT_SAME_NAME)
@@ -562,8 +531,8 @@ 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);
-		overflow("receive_file_entry");
+			flags, l1, l2, safe_fname(lastname));
+		overflow_exit("receive_file_entry");
 	}
 
 	strlcpy(thisname, lastname, l1 + 1);
@@ -622,13 +591,13 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 		}
 	}
 
-#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) {
 			rprintf(FERROR, "overflow: linkname_len=%d\n",
 				linkname_len - 1);
-			overflow("receive_file_entry");
+			overflow_exit("receive_file_entry");
 		}
 	}
 	else
@@ -641,11 +610,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_DEL_START ? FLAG_DEL_START : 0;
+	file->flags = 0;
 	file->modtime = modtime;
 	file->length = file_length;
 	file->mode = mode;
@@ -658,10 +627,33 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 		memcpy(bp, dirname, dirname_len - 1);
 		bp += dirname_len;
 		bp[-1] = '\0';
-		if (sanitize_paths)
-			lastdir_depth = count_dir_elements(lastdir);
-	} 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 = recurse;
+			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);
@@ -670,7 +662,7 @@ 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);
@@ -680,7 +672,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	}
 #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) {
@@ -702,20 +694,17 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	}
 #endif
 
-	if (always_checksum) {
+	if (always_checksum && (sum_len || protocol_version < 28)) {
 		char *sum;
+		int slen = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
 		if (sum_len) {
 			file->u.sum = sum = bp;
 			/*bp += sum_len;*/
-		} else if (protocol_version < 28) {
+		} else {
 			/* Prior to 28, we get a useless set of nulls. */
 			sum = empty_sum;
-		} else
-			sum = NULL;
-		if (sum) {
-			read_buf(f, sum,
-			    protocol_version < 21 ? 2 : MD4_SUM_LENGTH);
 		}
+		read_buf(f, sum, slen);
 	}
 
 	if (!preserve_perms) {
@@ -723,8 +712,9 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 		 * permissions and umask. This emulates what GNU cp does */
 		file->mode &= ~orig_umask;
 	}
-}
 
+	return file;
+}
 
 /**
  * Create a file_struct for a named file by reading its stat()
@@ -742,7 +732,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
  * important case.  Some systems may not have d_type.
  **/
 struct file_struct *make_file(char *fname, struct file_list *flist,
-			      int exclude_level)
+			      int filter_level)
 {
 	static char *lastdir;
 	static int lastdir_len = -1;
@@ -760,7 +750,8 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 
 	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, 0);
@@ -772,11 +763,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	if (readlink_stat(thisname, &st, linkname) != 0) {
 		int save_errno = errno;
 		/* See if file is excluded before reporting an error. */
-		if (exclude_level != NO_EXCLUDES
-		    && check_exclude_file(thisname, 0, exclude_level))
+		if (filter_level != NO_FILTERS
+		    && is_excluded(thisname, 0, filter_level))
 			return NULL;
 		if (save_errno == ENOENT) {
-#if SUPPORT_LINKS
+#ifdef SUPPORT_LINKS
 			/* Avoid "vanished" error if symlink points nowhere. */
 			if (copy_links && do_lstat(thisname, &st) == 0
 			    && S_ISLNK(st.st_mode)) {
@@ -800,12 +791,12 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		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) && !xfer_dirs) {
-		rprintf(FINFO, "skipping directory %s\n", thisname);
+		rprintf(FINFO, "skipping directory %s\n", safe_fname(thisname));
 		return NULL;
 	}
 
@@ -816,22 +807,22 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 	    && 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)) {
-#if SUPPORT_LINKS
+#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) {
@@ -849,7 +840,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;
@@ -878,7 +869,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))
@@ -916,7 +907,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);
@@ -930,14 +921,15 @@ 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 i = flist_find(received_flist, file);
-		if (i >= 0 && S_ISDIR(received_flist->files[i]->mode)
+		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;
@@ -945,34 +937,26 @@ skip_excludes:
 			file->uid = st2.st_uid;
 			file->gid = st2.st_gid;
 			file->u.link = NULL;
-			if (file->link_u.idev) {
-				pool_free(flist->hlink_pool, 0, file->link_u.idev);
-				file->link_u.idev = 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];
-
-	/* 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);
 
@@ -980,98 +964,89 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 		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_list_struct last_list = local_exclude_list;
-		local_exclude_list.head = local_exclude_list.tail = NULL;
-		send_directory(f, flist, f_name_to(file, fbuf));
-		if (verbose > 2) {
-			rprintf(FINFO, "[%s] popping %sexclude list\n",
-				who_am_i(), local_exclude_list.debug_type);
+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;
 		}
-		clear_exclude_list(&local_exclude_list);
-		local_exclude_list = last_list;
+		save_filters = push_local_filters(fbuf, len);
+		send_directory(f, flist, fbuf, len);
+		pop_local_filters(save_filters);
 	}
 }
 
-
-/* Note that the "recurse" value either contains -1, for infinite recursion,
- * or a number >= 0 indicating how many levels of recursion we will allow. */
-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;
-		rsyserr(FERROR, errno, "opendir %s failed", full_fname(dir));
+		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++;
-	}
-
-	if (cvs_exclude) {
-		if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
-		    < MAXPATHLEN - offset) {
-			add_exclude_file(&local_exclude_list, fname,
-					 XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
-		} 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) {
-			int do_subdirs = recurse >= 1 ? recurse-- : recurse;
-			send_file_name(f, flist, fname, do_subdirs, 0);
-		} else {
+		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;
-		rsyserr(FERROR, errno, "readdir(%s)", dir);
+		rsyserr(FERROR, errno, "readdir(%s)", full_fname(fbuf));
 	}
 
 	closedir(d);
-}
 
+	if (recurse) {
+		int i, end = flist->count - 1;
+		for (i = start; i <= end; i++)
+			send_if_directory(f, flist, flist->files[i]);
+	}
+}
 
-/**
- * This function is normally called by the sender, but the receiver also
- * uses it to construct its own file list if --delete has been specified.
- * 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;
@@ -1079,33 +1054,32 @@ 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();
-		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;
+	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) {
 		char fname2[MAXPATHLEN];
 		char *fname = fname2;
-		int do_subdirs;
+		int is_dot_dir;
 
 		if (use_ff_fd) {
 			if (read_filesfrom_line(filesfrom_fd, fname) == 0)
@@ -1124,28 +1098,36 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			if (l == 2 && fname[0] == '.') {
 				/* Turn "./" into just "." rather than "./." */
 				fname[1] = '\0';
-			} else if (l < MAXPATHLEN) {
+			} else {
+				if (l + 1 >= MAXPATHLEN)
+					overflow_exit("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_exit("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 (fname[l-1] == '.' && (l == 1 || fname[l-2] == '/')) {
-			if (!recurse && xfer_dirs)
-				recurse = 1; /* allow one level */
-		} else if (recurse > 0)
-			recurse = 0;
 
 		if (link_stat(fname, &st, keep_dirlinks) != 0) {
-			if (f != -1) {
-				io_error |= IOERR_GENERAL;
-				rsyserr(FERROR, errno, "link_stat %s failed",
-					full_fname(fname));
-			}
+			io_error |= IOERR_GENERAL;
+			rsyserr(FERROR, errno, "link_stat %s failed",
+				full_fname(fname));
 			continue;
 		}
 
 		if (S_ISDIR(st.st_mode) && !xfer_dirs) {
-			rprintf(FINFO, "skipping directory %s\n", fname);
+			rprintf(FINFO, "skipping directory %s\n",
+				safe_fname(fname));
 			continue;
 		}
 
@@ -1155,42 +1137,20 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		if (!relative_paths) {
 			p = strrchr(fname, '/');
 			if (p) {
-				*p = 0;
+				*p = '\0';
 				if (p == fname)
 					dir = "/";
 				else
 					dir = fname;
 				fname = p + 1;
 			}
-		} else if (f != -1 && 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;
-			*p = 0;
-			/* Skip any initial directories in our path that we
-			 * have in common with lastpath. */
-			while (*fn && *lp == *fn) {
-				if (*fn == '/')
-					slash = fn;
-				lp++, fn++;
-			}
-			*p = '/';
-			if (fn != p || (*lp && *lp != '/')) {
-				int save_copy_links = copy_links;
-				int save_xfer_dirs = xfer_dirs;
-				copy_links = copy_unsafe_links;
-				xfer_dirs = 1;
-				while ((slash = strchr(slash+1, '/')) != 0) {
-					*slash = 0;
-					send_file_name(f, flist, fname, 0, 0);
-					*slash = '/';
-				}
-				copy_links = save_copy_links;
-				xfer_dirs = save_xfer_dirs;
-				*p = 0;
-				strlcpy(lastpath, fname, sizeof lastpath);
-				*p = '/';
-			}
+		} else if ((p = strstr(fname, "/./")) != NULL) {
+			*p = '\0';
+			if (p == fname)
+				dir = "/";
+			else
+				dir = fname;
+			fname = p + 3;
 		}
 
 		if (!*fname)
@@ -1200,7 +1160,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			static char *lastdir;
 			static int lastdir_len;
 
-			strcpy(olddir, curr_dir); /* can't overflow */
+			strlcpy(olddir, curr_dir, sizeof olddir);
 
 			if (!push_dir(dir)) {
 				io_error |= IOERR_GENERAL;
@@ -1218,52 +1178,98 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			}
 		}
 
+		if (implied_dirs && (p=strrchr(fname,'/')) && p != fname) {
+			/* Send the implied directories at the start of the
+			 * source spec, so we get their permissions right. */
+			char *lp = lastpath, *fn = fname, *slash = fname;
+			*p = '\0';
+			/* Skip any initial directories in our path that we
+			 * have in common with lastpath. */
+			while (*fn && *lp == *fn) {
+				if (*fn == '/')
+					slash = fn;
+				lp++, fn++;
+			}
+			*p = '/';
+			if (fn != p || (*lp && *lp != '/')) {
+				int save_copy_links = copy_links;
+				int save_xfer_dirs = xfer_dirs;
+				copy_links = copy_unsafe_links;
+				xfer_dirs = 1;
+				while ((slash = strchr(slash+1, '/')) != 0) {
+					*slash = '\0';
+					send_file_name(f, flist, fname, 0);
+					*slash = '/';
+				}
+				copy_links = save_copy_links;
+				xfer_dirs = save_xfer_dirs;
+				*p = '\0';
+				strlcpy(lastpath, fname, sizeof lastpath);
+				*p = '/';
+			}
+		}
+
 		if (one_file_system)
-			set_filesystem(fname);
+			filesystem_dev = st.st_dev;
 
-		do_subdirs = recurse >= 1 ? recurse-- : recurse;
-		send_file_name(f, flist, fname, do_subdirs, XMIT_DEL_START);
+		if (recurse || (xfer_dirs && is_dot_dir)) {
+			struct file_struct *file;
+			if ((file = send_file_name(f, flist, fname, XMIT_TOP_DIR)))
+				send_if_directory(f, flist, file);
+		} else
+			send_file_name(f, flist, fname, 0);
 
 		if (olddir[0]) {
 			flist_dir = NULL;
 			flist_dir_len = 0;
 			if (!pop_dir(olddir)) {
 				rsyserr(FERROR, errno, "pop_dir %s failed",
-					full_fname(dir));
+					full_fname(olddir));
 				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;
-	}
+	io_end_buffering();
+	stats.flist_size = stats.total_written - start_write;
+	stats.num_files = flist->count;
 
 	if (verbose > 3)
-		output_flist(flist, f < 0 ? "delete" : who_am_i());
+		output_flist(flist);
 
 	if (verbose > 2)
 		rprintf(FINFO, "send_file_list done\n");
@@ -1271,7 +1277,6 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	return flist;
 }
 
-
 struct file_list *recv_file_list(int f)
 {
 	struct file_list *flist;
@@ -1284,7 +1289,6 @@ struct file_list *recv_file_list(int f)
 	start_read = stats.total_read;
 
 	flist = flist_new(WITH_HLINK, "recv_file_list");
-	received_flist = flist;
 
 	flist->count = 0;
 	flist->malloced = 1000;
@@ -1294,27 +1298,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);
@@ -1324,7 +1328,7 @@ 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);
@@ -1337,7 +1341,7 @@ struct file_list *recv_file_list(int f)
 	}
 
 	if (verbose > 3)
-		output_flist(flist, who_am_i());
+		output_flist(flist);
 
 	if (list_only) {
 		int i;
@@ -1358,46 +1362,37 @@ oom:
 	return NULL;		/* not reached */
 }
 
-
-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;
 }
 
@@ -1412,7 +1407,6 @@ void clear_file(int i, struct file_list *flist)
 	memset(flist->files[i], 0, file_struct_len);
 }
 
-
 /*
  * allocate a new file list
  */
@@ -1430,7 +1424,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)))
@@ -1452,7 +1446,6 @@ void flist_free(struct file_list *flist)
 	free(flist);
 }
 
-
 /*
  * This routine ensures we don't have any duplicate names in our file list.
  * duplicate names can cause corruption because of the pipelining
@@ -1461,11 +1454,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);
+	sorting_flist = NULL;
 
 	for (i = no_dups? 0 : flist->count; i < flist->count; i++) {
 		if (flist->files[i]->basename) {
@@ -1473,50 +1472,89 @@ 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_DEL_START)
-				flist->files[prev_i]->flags |= FLAG_DEL_START;
-
-			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, const char *whose_list)
+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++) {
@@ -1529,25 +1567,42 @@ static void output_flist(struct file_list *flist, const char *whose_list)
 			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",
-			whose_list, 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 { s_DIR, s_SLASH, s_BASE, s_TRAILING };
+enum fnc_type { t_PATH, t_ITEM };
 
-enum fnc_state { fnc_DIR, fnc_SLASH, fnc_BASE };
-
-/* 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)
@@ -1557,62 +1612,118 @@ 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;
+		if (type1 == t_PATH && *c1 == '.' && !c1[1]) {
+			type1 = t_ITEM;
+			state1 = s_TRAILING;
+			c1 = (uchar*)"";
+		} else
+			state1 = s_BASE;
 	} else if (!*c1) {
-		state1 = fnc_SLASH;
+		type1 = t_path;
+		state1 = s_SLASH;
 		c1 = (uchar*)"/";
-	} else
-		state1 = fnc_DIR;
-	if (!(c2 = (uchar*)f2->dirname)) {
-		state2 = fnc_BASE;
+	} else {
+		type1 = t_path;
+		state1 = s_DIR;
+	}
+	if (!c2) {
+		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;
 	} else if (!*c2) {
-		state2 = fnc_SLASH;
+		type2 = t_path;
+		state2 = s_SLASH;
 		c2 = (uchar*)"/";
-	} else
-		state2 = fnc_DIR;
+	} 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;
 		}
 	}
 
 	return dif;
 }
 
-
 /* Return a copy of the full filename of a flist entry, using the indicated
  * buffer.  No size-checking is done because we checked the size when creating
  * the file_struct entry.
@@ -1632,9 +1743,7 @@ char *f_name_to(struct file_struct *f, char *fbuf)
 	return 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];
@@ -1644,3 +1753,38 @@ 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;
+}