X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/eb9b2e53c8d966f356454f1ba70ea5901674fedf..4f5b0756df0dfc925b9576db47ecce949c378e18:/flist.c

diff --git a/flist.c b/flist.c
index 2ded8e6e..731ffee9 100644
--- a/flist.c
+++ b/flist.c
@@ -35,7 +35,6 @@ extern int am_root;
 extern int am_server;
 extern int am_daemon;
 extern int am_sender;
-extern int delete_during;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
@@ -65,7 +64,6 @@ extern int copy_links;
 extern int copy_unsafe_links;
 extern int protocol_version;
 extern int sanitize_paths;
-extern int delete_excluded;
 extern int max_delete;
 extern int orig_umask;
 extern int list_only;
@@ -81,7 +79,6 @@ static struct file_list *received_flist;
 static dev_t filesystem_dev; /* used to implement -x */
 static int deletion_count = 0; /* used to implement --max-delete */
 
-static int flist_find(struct file_list *flist, struct file_struct *f);
 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);
 
@@ -148,19 +145,19 @@ 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)));
 	}
 }
 
@@ -181,7 +178,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)
@@ -194,7 +191,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);
 		}
@@ -207,7 +204,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)
@@ -256,7 +253,7 @@ static int is_excluded(char *fname, int is_dir, int filter_level)
 
 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
@@ -388,7 +385,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)
@@ -466,7 +463,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);
@@ -474,7 +471,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 */
@@ -511,8 +508,8 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 
 
 
-static void receive_file_entry(struct file_list *flist, int ndx,
-			       unsigned short flags, 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;
@@ -540,7 +537,7 @@ static void receive_file_entry(struct file_list *flist, int ndx,
 		*lastname = '\0';
 		lastdir_len = -1;
 		in_del_hier = 0;
-		return;
+		return NULL;
 	}
 
 	if (flags & XMIT_SAME_NAME)
@@ -554,7 +551,7 @@ static void receive_file_entry(struct file_list *flist, int ndx,
 	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");
 	}
 
@@ -614,7 +611,7 @@ static void receive_file_entry(struct file_list *flist, int ndx,
 		}
 	}
 
-#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) {
@@ -633,7 +630,7 @@ static void receive_file_entry(struct file_list *flist, int ndx,
 		  + linkname_len + sum_len;
 	bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
 
-	file = flist->files[ndx] = (struct file_struct *)bp;
+	file = (struct file_struct *)bp;
 	memset(bp, 0, file_struct_len);
 	bp += file_struct_len;
 
@@ -682,7 +679,7 @@ static void receive_file_entry(struct file_list *flist, int ndx,
 	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);
@@ -692,7 +689,7 @@ static void receive_file_entry(struct file_list *flist, int ndx,
 	}
 #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) {
@@ -735,6 +732,8 @@ static void receive_file_entry(struct file_list *flist, int ndx,
 		 * permissions and umask. This emulates what GNU cp does */
 		file->mode &= ~orig_umask;
 	}
+
+	return file;
 }
 
 
@@ -772,7 +771,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);
@@ -788,7 +788,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		    && 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)) {
@@ -817,7 +817,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		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;
 	}
 
@@ -832,7 +832,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		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)
@@ -843,7 +843,7 @@ skip_filters:
 
 	if (verbose > 2) {
 		rprintf(FINFO, "[%s] make_file(%s,*,%d)\n",
-			who_am_i(), thisname, filter_level);
+			who_am_i(), safe_fname(thisname), filter_level);
 	}
 
 	if ((basename = strrchr(thisname, '/')) != NULL) {
@@ -861,7 +861,7 @@ skip_filters:
 	}
 	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;
@@ -890,7 +890,7 @@ skip_filters:
 	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))
@@ -923,12 +923,12 @@ skip_filters:
 	memcpy(bp, basename, basename_len);
 	bp += basename_len;
 
-#if HAVE_STRUCT_STAT_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
 	if (preserve_devices && IS_DEVICE(st.st_mode))
 		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);
@@ -948,8 +948,9 @@ skip_filters:
 	 * 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(received_flist, file) >= 0
 		    && do_stat(thisname, &st2) == 0 && S_ISDIR(st2.st_mode)) {
 			file->modtime = st2.st_mtime;
 			file->length = st2.st_size;
@@ -957,11 +958,8 @@ skip_filters:
 			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))
@@ -977,11 +975,7 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 	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_FILTERS : ALL_FILTERS);
-
-	if (!file)
+	if (!(file = make_file(fname, flist, ALL_FILTERS)))
 		return;
 
 	maybe_emit_filelist_progress(flist);
@@ -1013,7 +1007,10 @@ void send_file_name(int f, struct file_list *flist, char *fname,
 
 
 /* Note that the "recurse" value either contains -1, for infinite recursion,
- * or a number >= 0 indicating how many levels of recursion we will allow. */
+ * or a number >= 0 indicating how many levels of recursion we will allow.
+ * This function is normally called by the sender, but the receiving side
+ * also calls it from delete_in_dir() with f set to -1 so that we just
+ * construct the file list in memory without sending it over the wire. */
 static void send_directory(int f, struct file_list *flist,
 			   char *fbuf, unsigned int len)
 {
@@ -1050,20 +1047,13 @@ static void send_directory(int f, struct file_list *flist,
 	if (errno) {
 		io_error |= IOERR_GENERAL;
 		*p = '\0';
-		rsyserr(FERROR, errno, "readdir(%s)", fbuf);
+		rsyserr(FERROR, errno, "readdir(%s)", full_fname(fbuf));
 	}
 
 	closedir(d);
 }
 
 
-/* This function is normally called by the sender, but the receiving side
- * also uses it to construct one or more file lists if one of the --delete
- * options have been specified.  The delete_files() function 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;
@@ -1075,25 +1065,22 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 	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) {
@@ -1130,16 +1117,15 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			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;
 		}
 
@@ -1156,7 +1142,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;
@@ -1229,48 +1215,46 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		}
 	}
 
-	if (f != -1) {
-		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;
-
-		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;
-	}
+	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;
+
+	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, who_am_i());
 
 	if (verbose > 2)
 		rprintf(FINFO, "send_file_list done\n");
@@ -1301,27 +1285,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, i, flags, 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);
 
 		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, 0, 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);
@@ -1372,7 +1356,9 @@ static int file_compare(struct file_struct **file1, struct file_struct **file2)
 }
 
 
-static int flist_find(struct file_list *flist, struct file_struct *f)
+/* 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 = flist->low, high = flist->high;
 	int ret, mid, mid_up;
@@ -1384,8 +1370,13 @@ static int flist_find(struct file_list *flist, struct file_struct *f)
 			ret = f_name_cmp(flist->files[mid_up], f);
 		else
 			ret = 1;
-		if (ret == 0)
+		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 - 1;
 		else
@@ -1394,6 +1385,7 @@ static int flist_find(struct file_list *flist, struct file_struct *f)
 	return -1;
 }
 
+
 /*
  * Free up any resources a file_struct has allocated
  * and clear the file.
@@ -1423,7 +1415,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)))
@@ -1468,41 +1460,78 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 	}
 	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 top directory. */
-			if (flist->files[i]->flags & FLAG_TOP_DIR)
-				flist->files[prev_i]->flags |= FLAG_TOP_DIR;
+			if (flist->files[drop]->flags & FLAG_TOP_DIR)
+				flist->files[keep]->flags |= FLAG_TOP_DIR;
+
+			clear_file(drop, flist);
 
-			clear_file(i, 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 = prev_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;
 		}
 	}
 }
@@ -1527,7 +1556,7 @@ static void output_flist(struct file_list *flist, const char *whose_list)
 			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",
 			whose_list, i, am_sender ? NS(file->dir.root) : depthbuf,
-			file->dirname ? file->dirname : "",
+			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);
@@ -1535,17 +1564,31 @@ static void output_flist(struct file_list *flist, const char *whose_list)
 }
 
 
-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)
@@ -1560,54 +1603,97 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 	if (c1 == c2)
 		c1 = c2 = NULL;
 	if (!c1) {
-		state1 = fnc_BASE;
+		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;
+	} else {
+		type1 = t_path;
+		state1 = s_DIR;
+	}
 	if (!c2) {
-		state2 = fnc_BASE;
+		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;
+				state1 = s_BASE;
 				c1 = (uchar*)f1->basename;
 				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;
+				state2 = s_BASE;
 				c2 = (uchar*)f2->basename;
 				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;
 		}
 	}
 
@@ -1723,7 +1809,7 @@ void delete_in_dir(struct file_list *flist, char *fbuf,
 void delete_missing(struct file_list *full_list, struct file_list *dir_list,
 		    const char *dirname)
 {
-	int i, j, mode;
+	int i, mode;
 
 	if (max_delete && deletion_count >= max_delete)
 		return;
@@ -1735,9 +1821,7 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list,
 		if (!dir_list->files[i]->basename)
 			continue;
 		mode = dir_list->files[i]->mode;
-		if ((j = flist_find(full_list, dir_list->files[i])) < 0
-		    || (delete_during && S_ISDIR(mode)
-		     && !S_ISDIR(full_list->files[j]->mode))) {
+		if (flist_find(full_list, dir_list->files[i]) < 0) {
 			char *f = f_name(dir_list->files[i]);
 			if (make_backups && (backup_dir || !is_backup_file(f))
 			  && !S_ISDIR(mode)) {