X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4ccfd96cfee813f3855be5a902acc3d5cd0545a4..8a6f3fead8667434ef08b3c1de2e3c899f1d70ee:/flist.c

diff --git a/flist.c b/flist.c
index 9ee7dcd7..8d4defb9 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;
@@ -152,14 +150,14 @@ static void list_file_entry(struct file_struct *f)
 		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)));
 	}
 }
 
@@ -193,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);
 		}
@@ -410,11 +408,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);
@@ -423,7 +421,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
 			write_byte(f, flags);
 	} else {
 		if (!(flags & 0xFF) && !S_ISDIR(mode))
-			flags |= XMIT_DEL_START;
+			flags |= XMIT_TOP_DIR;
 		if (!(flags & 0xFF))
 			flags |= XMIT_LONG_NAME;
 		write_byte(f, flags);
@@ -510,8 +508,8 @@ 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 void receive_file_entry(struct file_list *flist, int ndx,
+			       unsigned short flags, int f)
 {
 	static time_t modtime;
 	static mode_t mode;
@@ -522,7 +520,7 @@ 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_heir_name_len = 0;
+	static unsigned int del_hier_name_len = 0;
 	static int in_del_hier = 0;
 	char thisname[MAXPATHLEN];
 	unsigned int l1 = 0, l2 = 0;
@@ -531,7 +529,7 @@ 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;
@@ -553,7 +551,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");
 	}
 
@@ -632,7 +630,7 @@ 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 = flist->files[ndx] = (struct file_struct *)bp;
 	memset(bp, 0, file_struct_len);
 	bp += file_struct_len;
 
@@ -643,30 +641,36 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 	file->uid = uid;
 	file->gid = gid;
 
-	if (S_ISDIR(mode)) {
-		if (flags & XMIT_DEL_START) {
-			in_del_hier = 1;
-			del_heir_name_len = l1 + l2;
-			file->flags |= FLAG_DEL_START;
-		} else if (delete_during && in_del_hier) {
-			if (!relative_paths || (l1 >= del_heir_name_len
-			    && thisname[del_heir_name_len] == '/'))
-				file->flags |= FLAG_DEL_START;
-			else
-				in_del_hier = 0;
-		}
-	}
-
 	if (dirname_len) {
 		file->dirname = lastdir = bp;
 		lastdir_len = dirname_len - 1;
 		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 = 1;
+			del_hier_name_len = file->dir.depth == 0 ? 0 : l1 + l2;
+			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);
@@ -765,7 +769,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);
@@ -810,7 +815,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;
 	}
 
@@ -836,7 +841,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) {
@@ -935,7 +940,7 @@ skip_filters:
 		/*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. */
@@ -970,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);
@@ -1006,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)
 {
@@ -1043,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;
@@ -1064,34 +1061,26 @@ 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;
-	BOOL need_first_push = True;
 	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;
-			if (curr_dir_len < MAXPATHLEN - 1) {
-				push_local_filters(curr_dir, curr_dir_len);
-				need_first_push = False;
-			}
+	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) {
@@ -1127,26 +1116,16 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 		} else if (recurse > 0)
 			recurse = 0;
 
-		if (need_first_push) {
-			if ((p = strrchr(fname, '/')) != NULL) {
-				if (*++p && strcmp(p, ".") != 0)
-					push_local_filters(fname, p - fname);
-			} else if (strcmp(fname, ".") != 0)
-				push_local_filters(fname, 0);
-			need_first_push = False;
-		}
-
 		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;
 		}
 
@@ -1163,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;
@@ -1223,7 +1202,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 			filesystem_dev = st.st_dev;
 
 		do_subdirs = recurse >= 1 ? recurse-- : recurse;
-		send_file_name(f, flist, fname, do_subdirs, XMIT_DEL_START);
+		send_file_name(f, flist, fname, do_subdirs, XMIT_TOP_DIR);
 
 		if (olddir[0]) {
 			flist_dir = NULL;
@@ -1236,25 +1215,21 @@ 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);
@@ -1263,21 +1238,19 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
 
 	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");
@@ -1314,7 +1287,7 @@ struct file_list *recv_file_list(int f)
 
 		if (protocol_version >= 28 && (flags & XMIT_EXTENDED_FLAGS))
 			flags |= read_byte(f) << 8;
-		receive_file_entry(&flist->files[i], flags, flist, f);
+		receive_file_entry(flist, i, flags, f);
 
 		if (S_ISREG(flist->files[i]->mode))
 			stats.total_size += flist->files[i]->length;
@@ -1325,10 +1298,10 @@ struct file_list *recv_file_list(int f)
 
 		if (verbose > 2) {
 			rprintf(FINFO, "recv_file_name(%s)\n",
-				f_name(flist->files[i]));
+				safe_fname(f_name(flist->files[i])));
 		}
 	}
-	receive_file_entry(NULL, 0, NULL, 0); /* Signal that we're done. */
+	receive_file_entry(NULL, 0, 0, 0); /* Signal that we're done. */
 
 	if (verbose > 2)
 		rprintf(FINFO, "received %d names\n", flist->count);
@@ -1373,45 +1346,31 @@ 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);
 }
 
 
 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);
+	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)
-			return flist_up(flist, mid);
+			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;
 }
 
@@ -1487,6 +1446,7 @@ 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)
 			continue;
@@ -1494,18 +1454,18 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
 			if (verbose > 1 && !am_server) {
 				rprintf(FINFO,
 					"removing duplicate name %s from file list %d\n",
-					f_name(flist->files[i]), i);
+					safe_fname(f_name(flist->files[i])), i);
 			}
 			/* 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;
+			 * lose track of a user-specified top directory. */
+			if (flist->files[i]->flags & FLAG_TOP_DIR)
+				flist->files[prev_i]->flags |= FLAG_TOP_DIR;
 
 			clear_file(i, flist);
 		} else
 			prev_i = i;
 	}
+	flist->high = prev_i;
 
 	if (strip_root) {
 		/* we need to strip off the root directory in the case
@@ -1529,7 +1489,7 @@ 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)
 {
-	char uidbuf[16], gidbuf[16];
+	char uidbuf[16], gidbuf[16], depthbuf[16];
 	struct file_struct *file;
 	int i;
 
@@ -1543,20 +1503,31 @@ 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",
+			whose_list, 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 { fnc_DIR, fnc_SLASH, fnc_BASE, fnc_TRAILING };
 
-/* 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.  The only difference
+ * is that, beginning with protocol_version 29, a directory name will always
+ * sort immediately prior to its contents (previously "foo." would sort in
+ * between directory "foo" and "foo/bar").  We do this by assuming that a dir
+ * has a trailing slash for comparison purposes, but only if we aren't about
+ * to match a file of the same name (because we need all identically named
+ * items to match each other).  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, in which case it is sorted to the end
+ * of the list (as a removed item). */
 int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 {
 	int dif;
@@ -1571,7 +1542,11 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 	if (!f2 || !f2->basename)
 		return 1;
 
-	if (!(c1 = (uchar*)f1->dirname)) {
+	c1 = (uchar*)f1->dirname;
+	c2 = (uchar*)f2->dirname;
+	if (c1 == c2)
+		c1 = c2 = NULL;
+	if (!c1) {
 		state1 = fnc_BASE;
 		c1 = (uchar*)f1->basename;
 	} else if (!*c1) {
@@ -1579,7 +1554,7 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 		c1 = (uchar*)"/";
 	} else
 		state1 = fnc_DIR;
-	if (!(c2 = (uchar*)f2->dirname)) {
+	if (!c2) {
 		state2 = fnc_BASE;
 		c2 = (uchar*)f2->basename;
 	} else if (!*c2) {
@@ -1602,6 +1577,11 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 				c1 = (uchar*)f1->basename;
 				break;
 			case fnc_BASE:
+				state1 = fnc_TRAILING;
+				if (protocol_version >= 29 && S_ISDIR(f1->mode))
+					c1 = (uchar*)"/";
+				break;
+			case fnc_TRAILING:
 				break;
 			}
 		}
@@ -1616,8 +1596,13 @@ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
 				c2 = (uchar*)f2->basename;
 				break;
 			case fnc_BASE:
-				if (!*c1)
+				if (state1 == fnc_TRAILING)
 					return 0;
+				state2 = fnc_TRAILING;
+				if (protocol_version >= 29 && S_ISDIR(f2->mode))
+					c2 = (uchar*)"/";
+				break;
+			case fnc_TRAILING:
 				break;
 			}
 		}
@@ -1666,24 +1651,29 @@ static int is_backup_file(char *fn)
 }
 
 
-/* This function is used to implement --delete-during. */
-void delete_in_dir(struct file_list *flist, char *fname)
+/* This function is used to implement per-directory deletion, and
+ * is used by all the --delete-WHEN options.  Note that the fbuf
+ * pointer must point to a MAXPATHLEN buffer with the name of the
+ * directory in it (the functions we call will append names onto
+ * the end, but the old dir value will be restored on exit). */
+void delete_in_dir(struct file_list *flist, char *fbuf,
+		   struct file_struct *file)
 {
-	static void *filt_array[MAXPATHLEN/2];
-	static BOOL need_first_push = True;
-	static int fa_lvl = 0;
-	static char fbuf[MAXPATHLEN];
+	static int min_depth = MAXPATHLEN, cur_depth = -1;
+	static void *filt_array[MAXPATHLEN/2+1];
 	struct file_list *dir_list;
 	STRUCT_STAT st;
-	int dlen, j;
+	int dlen;
 
 	if (!flist) {
-		while (fa_lvl)
-			pop_local_filters(filt_array[--fa_lvl]);
-		need_first_push = True;
-		*fbuf = '\0';
+		while (cur_depth >= min_depth)
+			pop_local_filters(filt_array[cur_depth--]);
+		min_depth = MAXPATHLEN;
+		cur_depth = -1;
 		return;
 	}
+	if (file->dir.depth >= MAXPATHLEN/2+1)
+		return; /* Impossible... */
 
 	if (max_delete && deletion_count >= max_delete)
 		return;
@@ -1695,62 +1685,31 @@ void delete_in_dir(struct file_list *flist, char *fname)
 		return;
 	}
 
-	for (j = 0; fbuf[j]; j++) {
-		if (fbuf[j] != fname[j]) {
-			while (fa_lvl) {
-				if (fbuf[j] == '/')
-					pop_local_filters(filt_array[--fa_lvl]);
-				if (!fbuf[++j])
-					break;
-			}
-			break;
-		}
-	}
-
-	dlen = strlcpy(fbuf, fname, MAXPATHLEN);
-	if (need_first_push) {
-		if (dlen != 1 || fbuf[0] != '.') {
-			char *s = strrchr(fbuf, '/');
-			int first_dlen;
-			if (s)
-				first_dlen = s - fbuf;
-			else
-				first_dlen = 0;
-			if (!s || s[1] != '.' || s[2] != '\0') {
-				filt_array[fa_lvl++] = push_local_filters(fbuf,
-									  first_dlen);
-			}
-		}
-		need_first_push = False;
-	}
-
-	if (dlen >= MAXPATHLEN - 1)
-		return;
-	if (fa_lvl >= MAXPATHLEN/2)
-		return; /* impossible... */
+	while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
+		pop_local_filters(filt_array[cur_depth--]);
+	cur_depth = file->dir.depth;
+	if (min_depth > cur_depth)
+		min_depth = cur_depth;
+	dlen = strlen(fbuf);
+	filt_array[cur_depth] = push_local_filters(fbuf, dlen);
 
-	if (link_stat(fname, &st, keep_dirlinks) < 0)
+	if (link_stat(fbuf, &st, keep_dirlinks) < 0)
 		return;
 
-	if (one_file_system)
+	if (one_file_system && file->flags & FLAG_TOP_DIR)
 		filesystem_dev = st.st_dev;
 
 	dir_list = flist_new(WITHOUT_HLINK, "delete_in_dir");
 
 	recurse = 0;
-	filt_array[fa_lvl++] = push_local_filters(fbuf, dlen);
 	send_directory(-1, dir_list, fbuf, dlen);
 	recurse = -1;
-
-	if (dlen == 1 && *fbuf == '.')
-		*fbuf = '\0';
-
-	clean_flist(dir_list, 0, 0);
+	fbuf[dlen] = '\0';
 
 	if (verbose > 3)
 		output_flist(dir_list, "delete");
 
-	delete_missing(flist, dir_list, fname);
+	delete_missing(flist, dir_list, fbuf);
 
 	flist_free(dir_list);
 }
@@ -1766,16 +1725,15 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list,
 	if (max_delete && deletion_count >= max_delete)
 		return;
 
-	if (verbose > 1)
-		rprintf(FINFO, "deleting in %s\n", safe_fname(dirname));
+	if (verbose > 2)
+		rprintf(FINFO, "delete_missing(%s)\n", safe_fname(dirname));
 
 	for (i = dir_list->count; i--; ) {
 		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))) {
+		    || (S_ISDIR(mode) && !S_ISDIR(full_list->files[j]->mode))) {
 			char *f = f_name(dir_list->files[i]);
 			if (make_backups && (backup_dir || !is_backup_file(f))
 			  && !S_ISDIR(mode)) {
@@ -1784,13 +1742,10 @@ void delete_missing(struct file_list *full_list, struct file_list *dir_list,
 					rprintf(FINFO, "deleting %s\n",
 						safe_fname(f));
 				}
-			} else if (S_ISDIR(mode)) {
-				int dflag = delete_during ? DEL_FORCE_RECURSE
-							  : DEL_NO_RECURSE;
-				delete_file(f, DEL_DIR | dflag);
-			} else {
+			} else if (S_ISDIR(mode))
+				delete_file(f, DEL_DIR | DEL_FORCE_RECURSE);
+			else
 				delete_file(f, 0);
-			}
 			deletion_count++;
 			if (max_delete && deletion_count >= max_delete)
 				break;