X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5b3f6a273056a22d4d87ea36e108506e854100ed..a8e6e1486960fe2e9ac190ad53e9830f0f3f900a:/generator.c

diff --git a/generator.c b/generator.c
index 271b55fa..1ccb55a2 100644
--- a/generator.c
+++ b/generator.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,8 +21,9 @@
  */
 
 #include "rsync.h"
+#include "inums.h"
+#include "ifuncs.h"
 
-extern int verbose;
 extern int dry_run;
 extern int do_xfers;
 extern int stdout_format_has_i;
@@ -31,7 +32,6 @@ extern int am_root;
 extern int am_server;
 extern int am_daemon;
 extern int inc_recurse;
-extern int do_progress;
 extern int relative_paths;
 extern int implied_dirs;
 extern int keep_dirlinks;
@@ -41,6 +41,7 @@ extern int preserve_links;
 extern int preserve_devices;
 extern int preserve_specials;
 extern int preserve_hard_links;
+extern int preserve_executability;
 extern int preserve_perms;
 extern int preserve_times;
 extern int uid_ndx;
@@ -49,11 +50,13 @@ extern int delete_mode;
 extern int delete_before;
 extern int delete_during;
 extern int delete_after;
+extern int missing_args;
 extern int msgdone_cnt;
 extern int ignore_errors;
 extern int remove_source_files;
 extern int delay_updates;
 extern int update_only;
+extern int human_readable;
 extern int ignore_existing;
 extern int ignore_non_existing;
 extern int inplace;
@@ -75,7 +78,6 @@ extern int fuzzy_basis;
 extern int always_checksum;
 extern int checksum_len;
 extern char *partial_dir;
-extern char *basis_dir[];
 extern int compare_dest;
 extern int copy_dest;
 extern int link_dest;
@@ -84,202 +86,44 @@ extern int list_only;
 extern int read_batch;
 extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
+extern int unsort_ndx;
 extern int max_delete;
 extern int force_delete;
 extern int one_file_system;
+extern int skipped_deletes;
 extern struct stats stats;
 extern dev_t filesystem_dev;
 extern mode_t orig_umask;
-extern char *backup_dir;
-extern char *backup_suffix;
-extern int backup_suffix_len;
+extern uid_t our_uid;
+extern char *basis_dir[MAX_BASIS_DIRS+1];
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
-extern struct filter_list_struct server_filter_list;
-#ifdef ICONV_OPTION
-extern int ic_ndx;
-#endif
+extern struct filter_list_struct filter_list, daemon_filter_list;
 
-int ignore_perishable = 0;
-int non_perishable_cnt = 0;
 int maybe_ATTRS_REPORT = 0;
 
 static dev_t dev_zero;
-static int deletion_count = 0; /* used to implement --max-delete */
 static int deldelay_size = 0, deldelay_cnt = 0;
 static char *deldelay_buf = NULL;
 static int deldelay_fd = -1;
-static int lull_mod;
+static int loopchk_limit;
 static int dir_tweaking;
+static int symlink_timeset_failed_flags;
 static int need_retouch_dir_times;
 static int need_retouch_dir_perms;
 static const char *solo_file = NULL;
 
-/* For calling delete_item() and delete_dir_contents(). */
-#define DEL_RECURSE		(1<<1) /* recurse */
-#define DEL_DIR_IS_EMPTY	(1<<2) /* internal delete_FUNCTIONS use only */
-
 enum nonregtype {
     TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
 };
 
-enum delret {
-    DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY
-};
-
-/* Forward declaration for delete_item(). */
-static enum delret delete_dir_contents(char *fname, int flags);
-
-
-static int is_backup_file(char *fn)
-{
-	int k = strlen(fn) - backup_suffix_len;
-	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
-}
-
-/* Delete a file or directory.  If DEL_RECURSE is set in the flags, this will
- * delete recursively.
- *
- * Note that fbuf must point to a MAXPATHLEN buffer if the mode indicates it's
- * a directory! (The buffer is used for recursion, but returned unchanged.)
- */
-static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
-{
-	enum delret ret;
-	char *what;
-	int ok;
-
-	if (verbose > 2) {
-		rprintf(FINFO, "delete_item(%s) mode=%o flags=%d\n",
-			fbuf, mode, flags);
-	}
-
-	if (S_ISDIR(mode) && !(flags & DEL_DIR_IS_EMPTY)) {
-		ignore_perishable = 1;
-		/* If DEL_RECURSE is not set, this just reports emptiness. */
-		ret = delete_dir_contents(fbuf, flags);
-		ignore_perishable = 0;
-		if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
-			goto check_ret;
-		/* OK: try to delete the directory. */
-	}
-
-	if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
-		return DR_AT_LIMIT;
-
-	if (S_ISDIR(mode)) {
-		what = "rmdir";
-		ok = do_rmdir(fbuf) == 0;
-	} else if (make_backups > 0 && (backup_dir || !is_backup_file(fbuf))) {
-		what = "make_backup";
-		ok = make_backup(fbuf);
-	} else {
-		what = "unlink";
-		ok = robust_unlink(fbuf) == 0;
-	}
-
-	if (ok) {
-		if (!replace)
-			log_delete(fbuf, mode);
-		ret = DR_SUCCESS;
-	} else {
-		if (S_ISDIR(mode) && errno == ENOTEMPTY) {
-			rprintf(FINFO, "cannot delete non-empty directory: %s\n",
-				fbuf);
-			ret = DR_NOT_EMPTY;
-		} else if (errno != ENOENT) {
-			rsyserr(FERROR, errno, "delete_file: %s(%s) failed",
-				what, fbuf);
-			ret = DR_FAILURE;
-		} else {
-			deletion_count--;
-			ret = DR_SUCCESS;
-		}
-	}
-
-  check_ret:
-	if (replace && ret != DR_SUCCESS) {
-		rprintf(FERROR, "could not make way for new %s: %s\n",
-			replace, fbuf);
-	}
-	return ret;
-}
-
-/* The directory is about to be deleted: if DEL_RECURSE is given, delete all
- * its contents, otherwise just checks for content.  Returns DR_SUCCESS or
- * DR_NOT_EMPTY.  Note that fname must point to a MAXPATHLEN buffer!  (The
- * buffer is used for recursion, but returned unchanged.)
- */
-static enum delret delete_dir_contents(char *fname, int flags)
-{
-	struct file_list *dirlist;
-	enum delret ret;
-	unsigned remainder;
-	void *save_filters;
-	int j, dlen;
-	char *p;
-
-	if (verbose > 3) {
-		rprintf(FINFO, "delete_dir_contents(%s) flags=%d\n",
-			fname, flags);
-	}
-
-	dlen = strlen(fname);
-	save_filters = push_local_filters(fname, dlen);
-
-	non_perishable_cnt = 0;
-	dirlist = get_dirlist(fname, dlen, 0);
-	ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
-
-	if (!dirlist->used)
-		goto done;
-
-	if (!(flags & DEL_RECURSE)) {
-		ret = DR_NOT_EMPTY;
-		goto done;
-	}
-
-	p = fname + dlen;
-	if (dlen != 1 || *fname != '/')
-		*p++ = '/';
-	remainder = MAXPATHLEN - (p - fname);
-
-	/* We do our own recursion, so make delete_item() non-recursive. */
-	flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY;
-
-	for (j = dirlist->used; j--; ) {
-		struct file_struct *fp = dirlist->files[j];
-
-		if (fp->flags & FLAG_MOUNT_DIR) {
-			if (verbose > 1) {
-				rprintf(FINFO,
-				    "mount point, %s, pins parent directory\n",
-				    f_name(fp, NULL));
-			}
-			ret = DR_NOT_EMPTY;
-			continue;
-		}
-
-		strlcpy(p, fp->basename, remainder);
-		/* Save stack by recursing to ourself directly. */
-		if (S_ISDIR(fp->mode)
-		 && delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
-			ret = DR_NOT_EMPTY;
-		if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
-			ret = DR_NOT_EMPTY;
-	}
-
-	fname[dlen] = '\0';
-
-  done:
-	flist_free(dirlist);
-	pop_local_filters(save_filters);
+/* Forward declarations. */
+#ifdef SUPPORT_HARD_LINKS
+static void handle_skipped_hlink(struct file_struct *file, int itemizing,
+				 enum logcode code, int f_out);
+#endif
 
-	if (ret == DR_NOT_EMPTY) {
-		rprintf(FINFO, "cannot delete non-empty directory: %s\n",
-			fname);
-	}
-	return ret;
-}
+#define EARLY_DELAY_DONE_MSG() (!delay_updates)
+#define EARLY_DELETE_DONE_MSG() (!(delete_during == 2 || delete_after))
 
 static int start_delete_delay_temp(void)
 {
@@ -303,10 +147,12 @@ static int start_delete_delay_temp(void)
 
 static int flush_delete_delay(void)
 {
+	if (deldelay_fd < 0 && !start_delete_delay_temp())
+		return 0;
 	if (write(deldelay_fd, deldelay_buf, deldelay_cnt) != deldelay_cnt) {
 		rsyserr(FERROR, errno, "flush of delete-delay buffer");
 		delete_during = 0;
-		delete_after = 1;
+		delete_after = !inc_recurse;
 		close(deldelay_fd);
 		return 0;
 	}
@@ -314,18 +160,23 @@ static int flush_delete_delay(void)
 	return 1;
 }
 
-static int remember_delete(struct file_struct *file, const char *fname)
+static int remember_delete(struct file_struct *file, const char *fname, int flags)
 {
 	int len;
-	
+
+	if (deldelay_cnt == deldelay_size && !flush_delete_delay())
+		return 0;
+
+	if (flags & DEL_NO_UID_WRITE)
+		deldelay_buf[deldelay_cnt++] = '!';
+
 	while (1) {
 		len = snprintf(deldelay_buf + deldelay_cnt,
 			       deldelay_size - deldelay_cnt,
-			       "%x %s%c", (int)file->mode, fname, '\0');
+			       "%x %s%c",
+			       (int)file->mode, fname, '\0');
 		if ((deldelay_cnt += len) <= deldelay_size)
 			break;
-		if (deldelay_fd < 0 && !start_delete_delay_temp())
-			return 0;
 		deldelay_cnt -= len;
 		if (!flush_delete_delay())
 			return 0;
@@ -334,7 +185,7 @@ static int remember_delete(struct file_struct *file, const char *fname)
 	return 1;
 }
 
-static int read_delay_line(char *buf)
+static int read_delay_line(char *buf, int *flags_p)
 {
 	static int read_pos = 0;
 	int j, len, mode;
@@ -375,6 +226,11 @@ static int read_delay_line(char *buf)
 	}
 
 	bp = deldelay_buf + read_pos;
+	if (*bp == '!') {
+		bp++;
+		*flags_p = DEL_NO_UID_WRITE;
+	} else
+		*flags_p = 0;
 
 	if (sscanf(bp, "%x ", &mode) != 1) {
 	  invalid_data:
@@ -399,15 +255,15 @@ static int read_delay_line(char *buf)
 
 static void do_delayed_deletions(char *delbuf)
 {
-	int mode;
+	int mode, flags;
 
 	if (deldelay_fd >= 0) {
 		if (deldelay_cnt && !flush_delete_delay())
 			return;
 		lseek(deldelay_fd, 0, 0);
 	}
-	while ((mode = read_delay_line(delbuf)) >= 0)
-		delete_item(delbuf, mode, NULL, DEL_RECURSE);
+	while ((mode = read_delay_line(delbuf, &flags)) >= 0)
+		delete_item(delbuf, mode, flags | DEL_RECURSE);
 	if (deldelay_fd >= 0)
 		close(deldelay_fd);
 }
@@ -423,13 +279,14 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
 	struct file_list *dirlist;
 	char delbuf[MAXPATHLEN];
 	int dlen, i;
+	int save_uid_ndx = uid_ndx;
 
 	if (!fbuf) {
 		change_local_filter_dir(NULL, 0, 0);
 		return;
 	}
 
-	if (verbose > 2)
+	if (DEBUG_GTE(DEL, 2))
 		rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
 
 	if (allowed_lull)
@@ -454,6 +311,9 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
 			return;
 	}
 
+	if (!uid_ndx)
+		uid_ndx = ++file_extra_cnt;
+
 	dirlist = get_dirlist(fbuf, dlen, 0);
 
 	/* If an item in dirlist is not found in flist, delete it
@@ -462,23 +322,34 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
 		struct file_struct *fp = dirlist->files[i];
 		if (!F_IS_ACTIVE(fp))
 			continue;
-		if (fp->flags & FLAG_MOUNT_DIR) {
-			if (verbose > 1)
+		if (fp->flags & FLAG_MOUNT_DIR && S_ISDIR(fp->mode)) {
+			if (INFO_GTE(MOUNT, 1))
 				rprintf(FINFO, "cannot delete mount point: %s\n",
 					f_name(fp, NULL));
 			continue;
 		}
-		if (flist_find(cur_flist, fp) < 0) {
+		/* Here we want to match regardless of file type.  Replacement
+		 * of a file with one of another type is handled separately by
+		 * a delete_item call with a DEL_MAKE_ROOM flag. */
+		if (flist_find_ignore_dirness(cur_flist, fp) < 0) {
+			int flags = DEL_RECURSE;
+			if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+				flags |= DEL_NO_UID_WRITE;
 			f_name(fp, delbuf);
 			if (delete_during == 2) {
-				if (!remember_delete(fp, delbuf))
+				if (!remember_delete(fp, delbuf, flags))
 					break;
 			} else
-				delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
+				delete_item(delbuf, fp->mode, flags);
 		}
 	}
 
 	flist_free(dirlist);
+
+	if (!save_uid_ndx) {
+		--file_extra_cnt;
+		uid_ndx = 0;
+	}
 }
 
 /* This deletes any files on the receiving side that are not present on the
@@ -496,11 +367,14 @@ static void do_delete_pass(void)
 	for (j = 0; j < cur_flist->used; j++) {
 		struct file_struct *file = cur_flist->sorted[j];
 
-		if (!(file->flags & FLAG_XFER_DIR))
+		f_name(file, fbuf);
+
+		if (!(file->flags & FLAG_CONTENT_DIR)) {
+			change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(file));
 			continue;
+		}
 
-		f_name(file, fbuf);
-		if (verbose > 1 && file->flags & FLAG_TOP_DIR)
+		if (DEBUG_GTE(DEL, 1) && file->flags & FLAG_TOP_DIR)
 			rprintf(FINFO, "deleting in %s\n", fbuf);
 
 		if (link_stat(fbuf, &st, keep_dirlinks) < 0
@@ -511,13 +385,25 @@ static void do_delete_pass(void)
 	}
 	delete_in_dir(NULL, NULL, &dev_zero);
 
-	if (do_progress && !am_server)
+	if (INFO_GTE(FLIST, 2) && !am_server)
 		rprintf(FINFO, "                    \r");
 }
 
-int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp)
+int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
 {
-	if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
+	if (S_ISLNK(file->mode)) {
+		;
+	} else
+#endif
+	if (preserve_times && cmp_time(sxp->st.st_mtime, file->modtime) != 0)
+		return 0;
+
+	if (preserve_perms) {
+		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+			return 0;
+	} else if (preserve_executability
+	 && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
 		return 0;
 
 	if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file))
@@ -547,22 +433,38 @@ int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp)
 }
 
 void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statret,
-	     statx *sxp, int32 iflags, uchar fnamecmp_type,
+	     stat_x *sxp, int32 iflags, uchar fnamecmp_type,
 	     const char *xname)
 {
 	if (statret >= 0) { /* A from-dest-dir statret can == 1! */
 		int keep_time = !preserve_times ? 0
-		    : S_ISDIR(file->mode) ? preserve_times > 1
-		    : !S_ISLNK(file->mode);
+		    : S_ISDIR(file->mode) ? preserve_times > 1 :
+#if defined HAVE_LUTIMES && defined HAVE_UTIMES
+		    1;
+#else
+		    !S_ISLNK(file->mode);
+#endif
 
 		if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
 			iflags |= ITEM_REPORT_SIZE;
-		if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
-		  && !(iflags & ITEM_MATCHED)
+		if (file->flags & FLAG_TIME_FAILED) { /* symlinks only */
+			if (iflags & ITEM_LOCAL_CHANGE)
+				iflags |= symlink_timeset_failed_flags;
+		} else if (keep_time
+		 ? cmp_time(file->modtime, sxp->st.st_mtime) != 0
+		 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
 		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
-		 || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
 			iflags |= ITEM_REPORT_TIME;
-		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
+		if (S_ISLNK(file->mode)) {
+			;
+		} else
+#endif
+		if (preserve_perms) {
+			if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+				iflags |= ITEM_REPORT_PERMS;
+		} else if (preserve_executability
+		 && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
 			iflags |= ITEM_REPORT_PERMS;
 		if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
 			iflags |= ITEM_REPORT_OWNER;
@@ -594,7 +496,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
 	}
 
 	iflags &= 0xffff;
-	if ((iflags & (SIGNIFICANT_ITEM_FLAGS|ITEM_REPORT_XATTR) || verbose > 1
+	if ((iflags & (SIGNIFICANT_ITEM_FLAGS|ITEM_REPORT_XATTR) || INFO_GTE(NAME, 2)
 	  || stdout_format_has_i > 1 || (xname && *xname)) && !read_batch) {
 		if (protocol_version >= 29) {
 			if (ndx >= 0)
@@ -605,8 +507,11 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
 			if (iflags & ITEM_XNAME_FOLLOWS)
 				write_vstring(sock_f_out, xname, strlen(xname));
 #ifdef SUPPORT_XATTRS
-			if (iflags & ITEM_REPORT_XATTR && !dry_run)
-				send_xattr_request(NULL, file, sock_f_out);
+			if (preserve_xattrs && do_xfers
+			 && iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) {
+				send_xattr_request(NULL, file,
+					iflags & ITEM_REPORT_XATTR ? sock_f_out : -1);
+			}
 #endif
 		} else if (ndx >= 0) {
 			enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
@@ -661,18 +566,19 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 {
 	int32 blength;
 	int s2length;
+	int64 l;
 
 	if (block_size)
 		blength = block_size;
 	else if (len <= BLOCK_SIZE * BLOCK_SIZE)
 		blength = BLOCK_SIZE;
 	else {
+		int32 max_blength = protocol_version < 30 ? OLD_MAX_BLOCK_SIZE : MAX_BLOCK_SIZE;
 		int32 c;
-		int64 l;
 		int cnt;
 		for (c = 1, l = len, cnt = 0; l >>= 2; c <<= 1, cnt++) {}
-		if (cnt >= 31 || c >= MAX_BLOCK_SIZE)
-			blength = MAX_BLOCK_SIZE;
+		if (c < 0 || c >= max_blength)
+			blength = max_blength;
 		else {
 		    blength = 0;
 		    do {
@@ -691,7 +597,6 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 		s2length = SUM_LENGTH;
 	} else {
 		int32 c;
-		int64 l;
 		int b = BLOCKSUM_BIAS;
 		for (l = len; l >>= 1; b += 2) {}
 		for (c = blength; (c >>= 1) && b; b--) {}
@@ -705,13 +610,16 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
 	sum->blength	= blength;
 	sum->s2length	= s2length;
 	sum->remainder	= (int32)(len % blength);
-	sum->count	= (int32)(len / blength) + (sum->remainder != 0);
+	sum->count	= (int32)(l = (len / blength) + (sum->remainder != 0));
+
+	if ((int64)sum->count != l)
+		sum->count = -1;
 
-	if (sum->count && verbose > 2) {
+	if (sum->count && DEBUG_GTE(DELTASUM, 2)) {
 		rprintf(FINFO,
-			"count=%.0f rem=%ld blength=%ld s2length=%d flength=%.0f\n",
-			(double)sum->count, (long)sum->remainder, (long)sum->blength,
-			sum->s2length, (double)sum->flength);
+			"count=%s rem=%ld blength=%ld s2length=%d flength=%s\n",
+			big_num(sum->count), (long)sum->remainder, (long)sum->blength,
+			sum->s2length, big_num(sum->flength));
 	}
 }
 
@@ -721,7 +629,7 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64 len)
  *
  * Generate approximately one checksum every block_len bytes.
  */
-static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
+static int generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 {
 	int32 i;
 	struct map_struct *mapbuf;
@@ -729,10 +637,12 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 	OFF_T offset = 0;
 
 	sum_sizes_sqroot(&sum, len);
+	if (sum.count < 0)
+		return -1;
 	write_sum_head(f_out, &sum);
 
 	if (append_mode > 0 && f_copy < 0)
-		return;
+		return 0;
 
 	if (len > 0)
 		mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
@@ -757,10 +667,10 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 		sum1 = get_checksum1(map, n1);
 		get_checksum2(map, n1, sum2);
 
-		if (verbose > 3) {
+		if (DEBUG_GTE(DELTASUM, 3)) {
 			rprintf(FINFO,
-				"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
-				(double)i, (double)offset - n1, (long)n1,
+				"chunk[%s] offset=%s len=%ld sum1=%08lx\n",
+				big_num(i), big_num(offset - n1), (long)n1,
 				(unsigned long)sum1);
 		}
 		write_int(f_out, sum1);
@@ -769,6 +679,8 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 
 	if (mapbuf)
 		unmap_file(mapbuf);
+
+	return 0;
 }
 
 
@@ -797,7 +709,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 
 		if (F_LENGTH(fp) == F_LENGTH(file)
 		    && cmp_time(fp->modtime, file->modtime) == 0) {
-			if (verbose > 4) {
+			if (DEBUG_GTE(FUZZY, 2)) {
 				rprintf(FINFO,
 					"fuzzy size/modtime match for %s\n",
 					name);
@@ -812,7 +724,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 		/* Add some extra weight to how well the suffixes match. */
 		dist += fuzzy_distance(suf, suf_len, fname_suf, fname_suf_len)
 		      * 10;
-		if (verbose > 4) {
+		if (DEBUG_GTE(FUZZY, 2)) {
 			rprintf(FINFO, "fuzzy distance for %s = %d.%05d\n",
 				name, (int)(dist>>16), (int)(dist&0xFFFF));
 		}
@@ -825,11 +737,48 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 	return lowest_j;
 }
 
+/* Copy a file found in our --copy-dest handling. */
+static int copy_altdest_file(const char *src, const char *dest, struct file_struct *file)
+{
+	char buf[MAXPATHLEN];
+	const char *copy_to, *partialptr;
+	int save_preserve_xattrs = preserve_xattrs;
+	int ok, fd_w;
+
+	if (inplace) {
+		/* Let copy_file open the destination in place. */
+		fd_w = -1;
+		copy_to = dest;
+	} else {
+		fd_w = open_tmpfile(buf, dest, file);
+		if (fd_w < 0)
+			return -1;
+		copy_to = buf;
+	}
+	cleanup_set(copy_to, NULL, NULL, -1, -1);
+	if (copy_file(src, copy_to, fd_w, file->mode) < 0) {
+		if (INFO_GTE(COPY, 1)) {
+			rsyserr(FINFO, errno, "copy_file %s => %s",
+				full_fname(src), copy_to);
+		}
+		/* Try to clean up. */
+		unlink(copy_to);
+		cleanup_disable();
+		return -1;
+	}
+	partialptr = partial_dir ? partial_dir_fname(dest) : NULL;
+	preserve_xattrs = 0; /* xattrs were copied with file */
+	ok = finish_transfer(dest, copy_to, src, partialptr, file, 1, 0);
+	preserve_xattrs = save_preserve_xattrs;
+	cleanup_disable();
+	return ok ? 0 : -1;
+}
+
 /* This is only called for regular files.  We return -2 if we've finished
  * handling the file, -1 if no dest-linking occurred, or a non-negative
  * value if we found an alternate basis file. */
 static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
-			 char *cmpbuf, statx *sxp, int itemizing,
+			 char *cmpbuf, stat_x *sxp, int itemizing,
 			 enum logcode code)
 {
 	int best_match = -1;
@@ -854,9 +803,6 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		case 2:
 			if (!unchanged_attrs(cmpbuf, file, sxp))
 				continue;
-			if (always_checksum > 0 && preserve_times
-			 && cmp_time(sxp->st.st_mtime, file->modtime))
-				continue;
 			best_match = j;
 			match_level = 3;
 			break;
@@ -881,7 +827,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 				goto try_a_copy;
 			if (preserve_hard_links && F_IS_HLINKED(file))
 				finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
-			if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+			if (!maybe_ATTRS_REPORT && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) {
 				itemize(cmpbuf, file, ndx, 1, sxp,
 					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
 					0, "");
@@ -890,7 +836,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 #endif
 		if (itemizing)
 			itemize(cmpbuf, file, ndx, 0, sxp, 0, 0, NULL);
-		if (verbose > 1 && maybe_ATTRS_REPORT)
+		if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT)
 			rprintf(FCLIENT, "%s is uptodate\n", fname);
 		return -2;
 	}
@@ -899,23 +845,13 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 #ifdef SUPPORT_HARD_LINKS
 	  try_a_copy: /* Copy the file locally. */
 #endif
-		if (copy_file(cmpbuf, fname, file->mode) < 0) {
-			if (verbose) {
-				rsyserr(FINFO, errno, "copy_file %s => %s",
-					full_fname(cmpbuf), fname);
-			}
+		if (!dry_run && copy_altdest_file(cmpbuf, fname, file) < 0)
 			return -1;
-		}
-		set_file_attrs(fname, file, NULL, cmpbuf, 0);
 		if (itemizing)
 			itemize(cmpbuf, file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
-#ifdef SUPPORT_XATTRS
-		if (preserve_xattrs)
-			xattr_clear_locals(file);
-#endif
 		if (maybe_ATTRS_REPORT
-		 && ((!itemizing && verbose && match_level == 2)
-		  || (verbose > 1 && match_level == 3))) {
+		 && ((!itemizing && INFO_GTE(NAME, 1) && match_level == 2)
+		  || (INFO_GTE(NAME, 2) && match_level == 3))) {
 			code = match_level == 3 ? FCLIENT : FINFO;
 			rprintf(code, "%s%s\n", fname,
 				match_level == 3 ? " is uptodate" : "");
@@ -934,7 +870,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
  * handling the file, or -1 if no dest-linking occurred, or a non-negative
  * value if we found an alternate basis file. */
 static int try_dests_non(struct file_struct *file, char *fname, int ndx,
-			 char *cmpbuf, statx *sxp, int itemizing,
+			 char *cmpbuf, stat_x *sxp, int itemizing,
 			 enum logcode code)
 {
 	char lnk[MAXPATHLEN];
@@ -995,8 +931,8 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		}
 		switch (type) {
 		case TYPE_DIR:
-			break;
 		case TYPE_SPECIAL:
+			break;
 		case TYPE_DEVICE:
 			devp = F_RDEV_P(file);
 			if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
@@ -1044,7 +980,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 #endif
 		 && !S_ISDIR(file->mode)) {
 			if (do_link(cmpbuf, fname) < 0) {
-				rsyserr(FERROR, errno,
+				rsyserr(FERROR_XFER, errno,
 					"failed to hard-link %s with %s",
 					cmpbuf, fname);
 				return j;
@@ -1055,14 +991,13 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 #endif
 			match_level = 2;
 		if (itemizing && stdout_format_has_i
-		 && (verbose > 1 || stdout_format_has_i > 1)) {
+		 && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) {
 			int chg = compare_dest && type != TYPE_DIR ? 0
-			    : ITEM_LOCAL_CHANGE
-			     + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
+			    : ITEM_LOCAL_CHANGE + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
 			char *lp = match_level == 3 ? "" : NULL;
 			itemize(cmpbuf, file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp);
 		}
-		if (verbose > 1 && maybe_ATTRS_REPORT) {
+		if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT) {
 			rprintf(FCLIENT, "%s%s is uptodate\n",
 				fname, type == TYPE_DIR ? "/" : "");
 		}
@@ -1075,7 +1010,8 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 static void list_file_entry(struct file_struct *f)
 {
 	char permbuf[PERMSTRING_SIZE];
-	double len;
+	int64 len;
+	int colwidth = human_readable ? 14 : 11;
 
 	if (!F_IS_ACTIVE(f)) {
 		/* this can happen if duplicate names were removed */
@@ -1089,105 +1025,114 @@ static void list_file_entry(struct file_struct *f)
 
 #ifdef SUPPORT_LINKS
 	if (preserve_links && S_ISLNK(f->mode)) {
-		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-			permbuf, len, timestring(f->modtime),
-			f_name(f, NULL), F_SYMLINK(f));
+		rprintf(FINFO, "%s %*s %s %s -> %s\n",
+			permbuf, colwidth, comma_num(len),
+			timestring(f->modtime), f_name(f, NULL),
+			F_SYMLINK(f));
 	} else
 #endif
-	{
-		rprintf(FINFO, "%s %11.0f %s %s\n",
-			permbuf, len, timestring(f->modtime),
+	if (missing_args == 2 && f->mode == 0) {
+		rprintf(FINFO, "%-*s %s\n",
+			colwidth + 31, "*missing",
 			f_name(f, NULL));
+	} else {
+		rprintf(FINFO, "%s %*s %s %s\n",
+			permbuf, colwidth, comma_num(len),
+			timestring(f->modtime), f_name(f, NULL));
 	}
 }
 
 static int phase = 0;
 static int dflt_perms;
 
+static int implied_dirs_are_missing;
+/* Helper for recv_generator's skip_dir and dry_missing_dir tests. */
+static BOOL is_below(struct file_struct *file, struct file_struct *subtree)
+{
+	return F_DEPTH(file) > F_DEPTH(subtree)
+		&& (!implied_dirs_are_missing || f_name_has_prefix(file, subtree));
+}
+
 /* Acts on the indicated item in cur_flist whose name is fname.  If a dir,
  * make sure it exists, and has the right permissions/timestamp info.  For
  * all other non-regular files (symlinks, etc.) we create them here.  For
  * regular files that have changed, we try to find a basis file and then
  * start sending checksums.  The ndx is the file's unique index value.
  *
- * When fname is non-null, it must point to a MAXPATHLEN buffer!
+ * The fname parameter must point to a MAXPATHLEN buffer!  (e.g it gets
+ * passed to delete_item(), which can use it during a recursive delete.)
  *
  * Note that f_out is set to -1 when doing final directory-permission and
  * modification-time repair. */
 static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			   int itemizing, enum logcode code, int f_out)
 {
-	static int missing_below = -1, excluded_below = -1;
 	static const char *parent_dirname = "";
-	static struct file_struct *missing_dir = NULL, *excluded_dir = NULL;
+	/* Missing dir not created due to --dry-run; will still be scanned. */
+	static struct file_struct *dry_missing_dir = NULL;
+	/* Missing dir whose contents are skipped altogether due to
+	 * --ignore-non-existing, daemon exclude, or mkdir failure. */
+	static struct file_struct *skip_dir = NULL;
 	static struct file_list *fuzzy_dirlist = NULL;
 	static int need_fuzzy_dirlist = 0;
 	struct file_struct *fuzzy_file = NULL;
 	int fd = -1, f_copy = -1;
-	statx sx, real_sx;
+	stat_x sx, real_sx;
 	STRUCT_STAT partial_st;
 	struct file_struct *back_file = NULL;
 	int statret, real_ret, stat_errno;
 	char *fnamecmp, *partialptr, *backupptr = NULL;
 	char fnamecmpbuf[MAXPATHLEN];
 	uchar fnamecmp_type;
-	int implied_dirs_are_missing = relative_paths && !implied_dirs && !inc_recurse;
 	int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0;
+	int is_dir = !S_ISDIR(file->mode) ? 0
+		   : inc_recurse && ndx != cur_flist->ndx_start - 1 ? -1
+		   : 1;
 
-	if (verbose > 2)
+	if (DEBUG_GTE(GENR, 1))
 		rprintf(FINFO, "recv_generator(%s,%d)\n", fname, ndx);
 
 	if (list_only) {
-		if (S_ISDIR(file->mode)
-		 && ((!implied_dirs && !(file->flags & FLAG_XFER_DIR))
-		  || (inc_recurse && ndx != cur_flist->ndx_start - 1)))
+		if (is_dir < 0
+		 || (is_dir && !implied_dirs && file->flags & FLAG_IMPLIED_DIR))
 			return;
 		list_file_entry(file);
 		return;
 	}
 
-	if (server_filter_list.head) {
-		if (excluded_below >= 0) {
-			if (F_DEPTH(file) > excluded_below
-			 && (!implied_dirs_are_missing || f_name_has_prefix(file, excluded_dir)))
-				goto skipping;
-			excluded_below = -1;
-		}
-		if (check_filter(&server_filter_list, fname,
-				 S_ISDIR(file->mode)) < 0) {
-			if (S_ISDIR(file->mode)) {
-				excluded_below = F_DEPTH(file);
-				excluded_dir = file;
-			}
-		  skipping:
-			if (verbose) {
-				rprintf(FINFO,
-					"skipping server-excluded file \"%s\"\n",
-					fname);
-			}
+	if (skip_dir) {
+		if (is_below(file, skip_dir)) {
+			if (is_dir)
+				file->flags |= FLAG_MISSING_DIR;
+#ifdef SUPPORT_HARD_LINKS
+			else if (F_IS_HLINKED(file))
+				handle_skipped_hlink(file, itemizing, code, f_out);
+#endif
 			return;
 		}
+		skip_dir = NULL;
 	}
 
-	if (missing_below >= 0) {
-		if (F_DEPTH(file) <= missing_below
-		 || (implied_dirs_are_missing && !f_name_has_prefix(file, missing_dir))) {
-			if (dry_run)
-				dry_run--;
-			missing_below = -1;
-		} else if (!dry_run) {
-			if (S_ISDIR(file->mode))
-				file->flags |= FLAG_MISSING_DIR;
+	if (daemon_filter_list.head && (*fname != '.' || fname[1])) {
+		if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
+			if (is_dir < 0)
+				return;
+#ifdef SUPPORT_HARD_LINKS
+			if (F_IS_HLINKED(file))
+				handle_skipped_hlink(file, itemizing, code, f_out);
+#endif
+			rprintf(FERROR_XFER,
+				"skipping daemon-excluded %s \"%s\"\n",
+				is_dir ? "directory" : "file", fname);
+			if (is_dir)
+				goto skipping_dir_contents;
 			return;
 		}
 	}
-#ifdef SUPPORT_ACLS
-	sx.acc_acl = sx.def_acl = NULL;
-#endif
-#ifdef SUPPORT_XATTRS
-	sx.xattr = NULL;
-#endif
-	if (dry_run > 1) {
+
+	init_stat_x(&sx);
+	if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
+	  parent_is_dry_missing:
 		if (fuzzy_dirlist) {
 			flist_free(fuzzy_dirlist);
 			fuzzy_dirlist = NULL;
@@ -1197,13 +1142,17 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		stat_errno = ENOENT;
 	} else {
 		const char *dn = file->dirname ? file->dirname : ".";
+		dry_missing_dir = NULL;
 		if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
 			if (relative_paths && !implied_dirs
-			 && do_stat(dn, &sx.st) < 0
-			 && create_directory_path(fname) < 0) {
-				rsyserr(FERROR, errno,
-					"recv_generator: mkdir %s failed",
-					full_fname(dn));
+			 && do_stat(dn, &sx.st) < 0) {
+				if (dry_run)
+					goto parent_is_dry_missing;
+				if (make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0) {
+					rsyserr(FERROR_XFER, errno,
+						"recv_generator: mkdir %s failed",
+						full_fname(dn));
+				}
 			}
 			if (fuzzy_dirlist) {
 				flist_free(fuzzy_dirlist);
@@ -1224,41 +1173,63 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			need_fuzzy_dirlist = 0;
 		}
 
-		statret = link_stat(fname, &sx.st,
-				    keep_dirlinks && S_ISDIR(file->mode));
+		statret = link_stat(fname, &sx.st, keep_dirlinks && is_dir);
 		stat_errno = errno;
 	}
 
+	if (missing_args == 2 && file->mode == 0) {
+		if (filter_list.head && check_filter(&filter_list, FINFO, fname, is_dir) < 0)
+			return;
+		if (statret == 0)
+			delete_item(fname, sx.st.st_mode, del_opts);
+		return;
+	}
+
 	if (ignore_non_existing > 0 && statret == -1 && stat_errno == ENOENT) {
-		if (verbose > 1) {
-			rprintf(FINFO, "not creating new %s \"%s\"\n",
-				S_ISDIR(file->mode) ? "directory" : "file",
-				fname);
-		}
-		if (S_ISDIR(file->mode)) {
-			if (missing_below < 0) {
-				if (dry_run)
-					dry_run++;
-				missing_below = F_DEPTH(file);
-				missing_dir = file;
-			}
+		if (is_dir) {
+			if (is_dir < 0)
+				return;
+			skip_dir = file;
 			file->flags |= FLAG_MISSING_DIR;
 		}
+#ifdef SUPPORT_HARD_LINKS
+		else if (F_IS_HLINKED(file))
+			handle_skipped_hlink(file, itemizing, code, f_out);
+#endif
+		if (INFO_GTE(SKIP, 1)) {
+			rprintf(FINFO, "not creating new %s \"%s\"\n",
+				is_dir ? "directory" : "file", fname);
+		}
 		return;
 	}
 
-	if (S_ISDIR(file->mode)) {
-		if (!implied_dirs && !(file->flags & FLAG_XFER_DIR))
+	if (statret == 0 && !(sx.st.st_mode & S_IWUSR)
+	 && !am_root && sx.st.st_uid == our_uid)
+		del_opts |= DEL_NO_UID_WRITE;
+
+	if (ignore_existing > 0 && statret == 0
+	 && (!is_dir || !S_ISDIR(sx.st.st_mode))) {
+		if (INFO_GTE(SKIP, 1) && is_dir >= 0)
+			rprintf(FINFO, "%s exists\n", fname);
+#ifdef SUPPORT_HARD_LINKS
+		if (F_IS_HLINKED(file))
+			handle_skipped_hlink(file, itemizing, code, f_out);
+#endif
+		goto cleanup;
+	}
+
+	if (is_dir) {
+		if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
 			goto cleanup;
-		if (inc_recurse && ndx != cur_flist->ndx_start - 1) {
-			/* In inc_recurse mode we want ot make sure any missing
+		if (is_dir < 0) {
+			/* In inc_recurse mode we want to make sure any missing
 			 * directories get created while we're still processing
 			 * the parent dir (which allows us to touch the parent
 			 * dir's mtime right away).  We will handle the dir in
 			 * full later (right before we handle its contents). */
 			if (statret == 0
 			 && (S_ISDIR(sx.st.st_mode)
-			  || delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0))
+			  || delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0))
 				goto cleanup; /* Any errors get reported later. */
 			if (do_mkdir(fname, file->mode & 0700) == 0)
 				file->flags |= FLAG_DIR_CREATED;
@@ -1270,14 +1241,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		 * we need to delete it.  If it doesn't exist, then
 		 * (perhaps recursively) create it. */
 		if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
-			if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
+			if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0)
 				goto skipping_dir_contents;
 			statret = -1;
 		}
-		if (dry_run && statret != 0 && missing_below < 0) {
-			missing_below = F_DEPTH(file);
-			missing_dir = file;
-			dry_run++;
+		if (dry_run && statret != 0) {
+			if (!dry_missing_dir)
+				dry_missing_dir = file;
+			file->flags |= FLAG_MISSING_DIR;
 		}
 		real_ret = statret;
 		real_sx = sx;
@@ -1293,6 +1264,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			if (j == -2) {
 				itemizing = 0;
 				code = FNONE;
+				statret = 1;
 			} else if (j >= 0)
 				statret = 1;
 		}
@@ -1302,22 +1274,25 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
 			if (!relative_paths || errno != ENOENT
-			    || create_directory_path(fname) < 0
-			    || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
-				rsyserr(FERROR, errno,
+			 || make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0
+			 || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
+				rsyserr(FERROR_XFER, errno,
 					"recv_generator: mkdir %s failed",
 					full_fname(fname));
 			  skipping_dir_contents:
 				rprintf(FERROR,
 				    "*** Skipping any contents from this failed directory ***\n");
-				missing_below = F_DEPTH(file);
-				missing_dir = file;
+				skip_dir = file;
 				file->flags |= FLAG_MISSING_DIR;
 				goto cleanup;
 			}
 		}
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs && statret == 1)
+			copy_xattrs(fnamecmpbuf, fname);
+#endif
 		if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
-		    && verbose && code != FNONE && f_out != -1)
+		    && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1)
 			rprintf(code, "%s/\n", fname);
 
 		/* We need to ensure that the dirs in the transfer have writable
@@ -1327,7 +1302,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) {
 			mode_t mode = file->mode | S_IWUSR;
 			if (do_chmod(fname, mode) < 0) {
-				rsyserr(FERROR, errno,
+				rsyserr(FERROR_XFER, errno,
 					"failed to modify permissions on %s",
 					full_fname(fname));
 			}
@@ -1344,9 +1319,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				DEV_MINOR(devp) = minor(real_sx.st.st_dev);
 			}
 		}
-		else if (delete_during && f_out != -1 && !phase && dry_run < 2
-		    && (file->flags & FLAG_XFER_DIR))
-			delete_in_dir(fname, file, &real_sx.st.st_dev);
+		else if (delete_during && f_out != -1 && !phase
+		    && !(file->flags & FLAG_MISSING_DIR)) {
+			if (file->flags & FLAG_CONTENT_DIR)
+				delete_in_dir(fname, file, &real_sx.st.st_dev);
+			else
+				change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
+		}
 		goto cleanup;
 	}
 
@@ -1368,7 +1347,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 #ifdef SUPPORT_LINKS
 		const char *sl = F_SYMLINK(file);
 		if (safe_symlinks && unsafe_symlink(sl, fname)) {
-			if (verbose) {
+			if (INFO_GTE(NAME, 1)) {
 				if (solo_file)
 					fname = f_name(file, NULL);
 				rprintf(FINFO,
@@ -1389,7 +1368,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
 				if (itemizing)
 					itemize(fname, file, ndx, 0, &sx, 0, 0, NULL);
-#ifdef SUPPORT_HARD_LINKS
+#if defined SUPPORT_HARD_LINKS && defined CAN_HARDLINK_SYMLINK
 				if (preserve_hard_links && F_IS_HLINKED(file))
 					finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1);
 #endif
@@ -1399,7 +1378,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 			/* Not the right symlink (or not a symlink), so
 			 * delete it. */
-			if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
+			if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_SYMLINK) != 0)
 				goto cleanup;
 		} else if (basis_dir[0] != NULL) {
 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
@@ -1424,15 +1403,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 #endif
 		if (do_symlink(sl, fname) != 0) {
-			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
+			rsyserr(FERROR_XFER, errno, "symlink %s -> \"%s\" failed",
 				full_fname(fname), sl);
 		} else {
 			set_file_attrs(fname, file, NULL, NULL, 0);
 			if (itemizing) {
 				itemize(fname, file, ndx, statret, &sx,
-					ITEM_LOCAL_CHANGE, 0, NULL);
+					ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL);
 			}
-			if (code != FNONE && verbose)
+			if (code != FNONE && INFO_GTE(NAME, 1))
 				rprintf(code, "%s -> %s\n", fname, sl);
 #ifdef SUPPORT_HARD_LINKS
 			if (preserve_hard_links && F_IS_HLINKED(file))
@@ -1450,22 +1429,26 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
 	 || (preserve_specials && IS_SPECIAL(file->mode))) {
-		uint32 *devp = F_RDEV_P(file);
-		dev_t rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+		dev_t rdev;
+		if (IS_DEVICE(file->mode)) {
+			uint32 *devp = F_RDEV_P(file);
+			rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+		} else
+			rdev = 0;
 		if (statret == 0) {
-			char *t;
+			int del_for_flag;
 			if (IS_DEVICE(file->mode)) {
 				if (!IS_DEVICE(sx.st.st_mode))
 					statret = -1;
-				t = "device file";
+				del_for_flag = DEL_FOR_DEVICE;
 			} else {
 				if (!IS_SPECIAL(sx.st.st_mode))
 					statret = -1;
-				t = "special file";
+				del_for_flag = DEL_FOR_SPECIAL;
 			}
 			if (statret == 0
 			 && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
-			 && sx.st.st_rdev == rdev) {
+			 && (IS_SPECIAL(sx.st.st_mode) || sx.st.st_rdev == rdev)) {
 				/* The device or special file is identical. */
 				set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
 				if (itemizing)
@@ -1478,7 +1461,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 					goto return_with_success;
 				goto cleanup;
 			}
-			if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
+			if (delete_item(fname, sx.st.st_mode, del_opts | del_for_flag) != 0)
 				goto cleanup;
 		} else if (basis_dir[0] != NULL) {
 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
@@ -1502,21 +1485,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			goto cleanup;
 		}
 #endif
-		if (verbose > 2) {
+		if (DEBUG_GTE(GENR, 1)) {
 			rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
 				fname, (int)file->mode,
 				(long)major(rdev), (long)minor(rdev));
 		}
 		if (do_mknod(fname, file->mode, rdev) < 0) {
-			rsyserr(FERROR, errno, "mknod %s failed",
+			rsyserr(FERROR_XFER, errno, "mknod %s failed",
 				full_fname(fname));
 		} else {
 			set_file_attrs(fname, file, NULL, NULL, 0);
 			if (itemizing) {
 				itemize(fname, file, ndx, statret, &sx,
-					ITEM_LOCAL_CHANGE, 0, NULL);
+					ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL);
 			}
-			if (code != FNONE && verbose)
+			if (code != FNONE && INFO_GTE(NAME, 1))
 				rprintf(code, "%s\n", fname);
 #ifdef SUPPORT_HARD_LINKS
 			if (preserve_hard_links && F_IS_HLINKED(file))
@@ -1536,7 +1519,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	if (max_size > 0 && F_LENGTH(file) > max_size) {
-		if (verbose > 1) {
+		if (INFO_GTE(SKIP, 1)) {
 			if (solo_file)
 				fname = f_name(file, NULL);
 			rprintf(FINFO, "%s is over max-size\n", fname);
@@ -1544,7 +1527,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		goto cleanup;
 	}
 	if (min_size > 0 && F_LENGTH(file) < min_size) {
-		if (verbose > 1) {
+		if (INFO_GTE(SKIP, 1)) {
 			if (solo_file)
 				fname = f_name(file, NULL);
 			rprintf(FINFO, "%s is under min-size\n", fname);
@@ -1552,16 +1535,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		goto cleanup;
 	}
 
-	if (ignore_existing > 0 && statret == 0) {
-		if (verbose > 1)
-			rprintf(FINFO, "%s exists\n", fname);
-		goto cleanup;
-	}
-
 	if (update_only > 0 && statret == 0
 	    && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
-		if (verbose > 1)
+		if (INFO_GTE(SKIP, 1))
 			rprintf(FINFO, "%s is newer\n", fname);
+#ifdef SUPPORT_HARD_LINKS
+		if (F_IS_HLINKED(file))
+			handle_skipped_hlink(file, itemizing, code, f_out);
+#endif
 		goto cleanup;
 	}
 
@@ -1569,7 +1550,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	fnamecmp_type = FNAMECMP_FNAME;
 
 	if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
-		if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
+		if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_FILE) != 0)
 			goto cleanup;
 		statret = -1;
 		stat_errno = ENOENT;
@@ -1601,12 +1582,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	} else
 		partialptr = NULL;
 
-	if (statret != 0 && fuzzy_dirlist && dry_run <= 1) {
+	if (statret != 0 && fuzzy_dirlist) {
 		int j = find_fuzzy(file, fuzzy_dirlist);
 		if (j >= 0) {
 			fuzzy_file = fuzzy_dirlist->files[j];
 			f_name(fuzzy_file, fnamecmpbuf);
-			if (verbose > 2) {
+			if (DEBUG_GTE(FUZZY, 1)) {
 				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
 					fname, fnamecmpbuf);
 			}
@@ -1626,14 +1607,11 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 #endif
 		if (stat_errno == ENOENT)
 			goto notify_others;
-		rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
+		rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
 			full_fname(fname));
 		goto cleanup;
 	}
 
-	if (append_mode > 0 && sx.st.st_size >= F_LENGTH(file))
-		goto cleanup;
-
 	if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
 		;
 	else if (fnamecmp_type == FNAMECMP_FUZZY)
@@ -1658,6 +1636,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		goto cleanup;
 	}
 
+	if (append_mode > 0 && sx.st.st_size >= F_LENGTH(file)) {
+#ifdef SUPPORT_HARD_LINKS
+		if (F_IS_HLINKED(file))
+			handle_skipped_hlink(file, itemizing, code, f_out);
+#endif
+		goto cleanup;
+	}
+
   prepare_to_open:
 	if (partialptr) {
 		sx.st = partial_st;
@@ -1666,8 +1652,23 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		statret = 0;
 	}
 
-	if (!do_xfers || read_batch || whole_file)
+	if (!do_xfers)
+		goto notify_others;
+
+	if (read_batch || whole_file) {
+		if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) {
+			if (!(backupptr = get_backup_name(fname)))
+				goto cleanup;
+			if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
+				goto pretend_missing;
+			if (copy_file(fname, backupptr, -1, back_file->mode) < 0) {
+				unmake_file(back_file);
+				back_file = NULL;
+				goto cleanup;
+			}
+		}
 		goto notify_others;
+	}
 
 	if (fuzzy_dirlist) {
 		int j = flist_find(fuzzy_dirlist, file);
@@ -1676,9 +1677,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	/* open the file */
-	fd = do_open(fnamecmp, O_RDONLY, 0);
-
-	if (fd == -1) {
+	if ((fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) {
 		rsyserr(FERROR, errno, "failed to open %s, continuing",
 			full_fname(fnamecmp));
 	  pretend_missing:
@@ -1703,34 +1702,33 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			goto pretend_missing;
 		}
 		if (robust_unlink(backupptr) && errno != ENOENT) {
-			rsyserr(FERROR, errno, "unlink %s",
+			rsyserr(FERROR_XFER, errno, "unlink %s",
 				full_fname(backupptr));
 			unmake_file(back_file);
+			back_file = NULL;
 			close(fd);
 			goto cleanup;
 		}
-		if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0
-		 && (errno != ENOENT || make_bak_dir(backupptr) < 0
-		  || (f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0)) {
-			rsyserr(FERROR, errno, "open %s",
-				full_fname(backupptr));
+		if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
+			rsyserr(FERROR_XFER, errno, "open %s", full_fname(backupptr));
 			unmake_file(back_file);
+			back_file = NULL;
 			close(fd);
 			goto cleanup;
 		}
 		fnamecmp_type = FNAMECMP_BACKUP;
 	}
 
-	if (verbose > 3) {
-		rprintf(FINFO, "gen mapped %s of size %.0f\n",
-			fnamecmp, (double)sx.st.st_size);
+	if (DEBUG_GTE(DELTASUM, 3)) {
+		rprintf(FINFO, "gen mapped %s of size %s\n",
+			fnamecmp, big_num(sx.st.st_size));
 	}
 
-	if (verbose > 2)
+	if (DEBUG_GTE(DELTASUM, 2))
 		rprintf(FINFO, "generating and sending sums for %d\n", ndx);
 
   notify_others:
-	if (remove_source_files && !delay_updates && !phase)
+	if (remove_source_files && !delay_updates && !phase && !dry_run)
 		increment_active_files(ndx, itemizing, code);
 	if (inc_recurse && !dry_run)
 		cur_flist->in_progress++;
@@ -1742,7 +1740,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	if (itemizing) {
 		int iflags = ITEM_TRANSFER;
 		if (always_checksum > 0)
-			iflags |= ITEM_REPORT_CHECKSUM;
+			iflags |= ITEM_REPORT_CHANGE;
 		if (fnamecmp_type != FNAMECMP_FNAME)
 			iflags |= ITEM_BASIS_TYPE_FOLLOWS;
 		if (fnamecmp_type == FNAMECMP_FUZZY)
@@ -1769,26 +1767,41 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	if (read_batch)
 		goto cleanup;
 
-	if (statret != 0 || whole_file) {
+	if (statret != 0 || whole_file)
 		write_sum_head(f_out, NULL);
-		goto cleanup;
+	else if (sx.st.st_size <= 0) {
+		write_sum_head(f_out, NULL);
+		close(fd);
+	} else {
+		if (generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy) < 0) {
+			rprintf(FWARNING,
+			    "WARNING: file is too large for checksum sending: %s\n",
+			    fnamecmp);
+			write_sum_head(f_out, NULL);
+		}
+		close(fd);
 	}
 
-	generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy);
-
-	if (f_copy >= 0) {
-		close(f_copy);
+  cleanup:
+	if (back_file) {
+		int save_preserve_xattrs = preserve_xattrs;
+		if (f_copy >= 0)
+			close(f_copy);
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs) {
+			copy_xattrs(fname, backupptr);
+			preserve_xattrs = 0;
+		}
+#endif
 		set_file_attrs(backupptr, back_file, NULL, NULL, 0);
-		if (verbose > 1) {
+		preserve_xattrs = save_preserve_xattrs;
+		if (INFO_GTE(BACKUP, 1)) {
 			rprintf(FINFO, "backed up %s to %s\n",
 				fname, backupptr);
 		}
 		unmake_file(back_file);
 	}
 
-	close(fd);
-
-  cleanup:
 #ifdef SUPPORT_ACLS
 	if (preserve_acls)
 		free_acl(&sx);
@@ -1800,6 +1813,28 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	return;
 }
 
+#ifdef SUPPORT_HARD_LINKS
+static void handle_skipped_hlink(struct file_struct *file, int itemizing,
+				 enum logcode code, int f_out)
+{
+	char fbuf[MAXPATHLEN];
+	int new_last_ndx;
+	struct file_list *save_flist = cur_flist;
+
+	/* If we skip the last item in a chain of links and there was a
+	 * prior non-skipped hard-link waiting to finish, finish it now. */
+	if ((new_last_ndx = skip_hard_link(file, &cur_flist)) < 0)
+		return;
+
+	file = cur_flist->files[new_last_ndx - cur_flist->ndx_start];
+	cur_flist->in_progress--; /* undo prior increment */
+	f_name(file, fbuf);
+	recv_generator(fbuf, file, new_last_ndx, itemizing, code, f_out);
+
+	cur_flist = save_flist;
+}
+#endif
+
 static void touch_up_dirs(struct file_list *flist, int ndx)
 {
 	static int counter = 0;
@@ -1818,9 +1853,9 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 	for (i = start; i <= end; i++, counter++) {
 		file = flist->files[i];
 		if (!S_ISDIR(file->mode)
-		 || (relative_paths && !implied_dirs && !(file->flags & FLAG_XFER_DIR)))
+		 || (!implied_dirs && file->flags & FLAG_IMPLIED_DIR))
 			continue;
-		if (verbose > 3) {
+		if (DEBUG_GTE(TIME, 2)) {
 			fname = f_name(file, NULL);
 			rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
 				NS(fname), i);
@@ -1831,12 +1866,19 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
 		fname = f_name(file, NULL);
 		if (!(file->mode & S_IWUSR))
 			do_chmod(fname, file->mode);
-		if (need_retouch_dir_times)
-			set_modtime(fname, file->modtime, file->mode);
-		if (allowed_lull && !(counter % lull_mod))
-			maybe_send_keepalive();
-		else if (!(counter & 0xFF))
-			maybe_flush_socket(0);
+		if (need_retouch_dir_times) {
+			STRUCT_STAT st;
+			if (link_stat(fname, &st, 0) == 0
+			 && cmp_time(st.st_mtime, file->modtime) != 0)
+				set_modtime(fname, file->modtime, file->mode);
+		}
+		if (counter >= loopchk_limit) {
+			if (allowed_lull)
+				maybe_send_keepalive();
+			else
+				maybe_flush_socket(0);
+			counter = 0;
+		}
 	}
 }
 
@@ -1847,67 +1889,72 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
 	char fbuf[MAXPATHLEN];
 	int ndx;
 
+	while (1) {
 #ifdef SUPPORT_HARD_LINKS
-	while (preserve_hard_links && (ndx = get_hlink_num()) != -1) {
-		flist = flist_for_ndx(ndx);
-		assert(flist != NULL);
-		file = flist->files[ndx - flist->ndx_start];
-		assert(file->flags & FLAG_HLINKED);
-		finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1);
-	}
+		if (preserve_hard_links && (ndx = get_hlink_num()) != -1) {
+			flist = flist_for_ndx(ndx, "check_for_finished_files.1");
+			file = flist->files[ndx - flist->ndx_start];
+			assert(file->flags & FLAG_HLINKED);
+			finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1);
+			flist->in_progress--;
+			continue;
+		}
 #endif
 
-	while (check_redo && (ndx = get_redo_num()) != -1) {
-		csum_length = SUM_LENGTH;
-		max_size = -max_size;
-		min_size = -min_size;
-		ignore_existing = -ignore_existing;
-		ignore_non_existing = -ignore_non_existing;
-		update_only = -update_only;
-		always_checksum = -always_checksum;
-		size_only = -size_only;
-		append_mode = -append_mode;
-		make_backups = -make_backups; /* avoid dup backup w/inplace */
-		ignore_times++;
-
-		flist = cur_flist;
-		cur_flist = flist_for_ndx(ndx);
-
-		file = cur_flist->files[ndx - cur_flist->ndx_start];
-		if (solo_file)
-			strlcpy(fbuf, solo_file, sizeof fbuf);
-		else
-			f_name(file, fbuf);
-		recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out);
-		cur_flist->to_redo--;
-
-		cur_flist = flist;
-
-		csum_length = SHORT_SUM_LENGTH;
-		max_size = -max_size;
-		min_size = -min_size;
-		ignore_existing = -ignore_existing;
-		ignore_non_existing = -ignore_non_existing;
-		update_only = -update_only;
-		always_checksum = -always_checksum;
-		size_only = -size_only;
-		append_mode = -append_mode;
-		make_backups = -make_backups;
-		ignore_times--;
-	}
-
-	while (cur_flist != first_flist) { /* only possible with inc_recurse */
+		if (check_redo && (ndx = get_redo_num()) != -1) {
+			csum_length = SUM_LENGTH;
+			max_size = -max_size;
+			min_size = -min_size;
+			ignore_existing = -ignore_existing;
+			ignore_non_existing = -ignore_non_existing;
+			update_only = -update_only;
+			always_checksum = -always_checksum;
+			size_only = -size_only;
+			append_mode = -append_mode;
+			make_backups = -make_backups; /* avoid dup backup w/inplace */
+			ignore_times++;
+
+			flist = cur_flist;
+			cur_flist = flist_for_ndx(ndx, "check_for_finished_files.2");
+
+			file = cur_flist->files[ndx - cur_flist->ndx_start];
+			if (solo_file)
+				strlcpy(fbuf, solo_file, sizeof fbuf);
+			else
+				f_name(file, fbuf);
+			recv_generator(fbuf, file, ndx, itemizing, code, sock_f_out);
+			cur_flist->to_redo--;
+
+			cur_flist = flist;
+
+			csum_length = SHORT_SUM_LENGTH;
+			max_size = -max_size;
+			min_size = -min_size;
+			ignore_existing = -ignore_existing;
+			ignore_non_existing = -ignore_non_existing;
+			update_only = -update_only;
+			always_checksum = -always_checksum;
+			size_only = -size_only;
+			append_mode = -append_mode;
+			make_backups = -make_backups;
+			ignore_times--;
+			continue;
+		}
+
+		if (cur_flist == first_flist)
+			break;
+
+		/* We only get here if inc_recurse is enabled. */
 		if (first_flist->in_progress || first_flist->to_redo)
 			break;
 
-		if (!read_batch) {
-			write_ndx(sock_f_out, NDX_DONE);
+		write_ndx(sock_f_out, NDX_DONE);
+		if (!read_batch)
 			maybe_flush_socket(1);
-		}
 
 		if (delete_during == 2 || !dir_tweaking) {
 			/* Skip directory touch-up. */
-		} else if (first_flist->ndx_start != 0)
+		} else if (first_flist->parent_ndx >= 0)
 			touch_up_dirs(dir_flist, first_flist->parent_ndx);
 
 		flist_free(first_flist); /* updates first_flist */
@@ -1916,11 +1963,12 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
 
 void generate_files(int f_out, const char *local_name)
 {
-	int i, ndx;
+	int i, ndx, next_loopchk = 0;
 	char fbuf[MAXPATHLEN];
 	int itemizing;
 	enum logcode code;
-	int save_do_progress = do_progress;
+	int save_info_flist = info_levels[INFO_FLIST];
+	int save_info_progress = info_levels[INFO_PROGRESS];
 
 	if (protocol_version >= 29) {
 		itemizing = 1;
@@ -1942,9 +1990,12 @@ void generate_files(int f_out, const char *local_name)
 	solo_file = local_name;
 	dir_tweaking = !(list_only || solo_file || dry_run);
 	need_retouch_dir_times = preserve_times > 1;
-	lull_mod = allowed_lull * 5;
+	loopchk_limit = allowed_lull ? allowed_lull * 5 : 200;
+	symlink_timeset_failed_flags = ITEM_REPORT_TIME
+	    | (protocol_version >= 30 || !am_server ? ITEM_REPORT_TIMEFAIL : 0);
+	implied_dirs_are_missing = relative_paths && !implied_dirs && protocol_version < 30;
 
-	if (verbose > 2)
+	if (DEBUG_GTE(GENR, 1))
 		rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
 
 	if (delete_before && !solo_file && cur_flist->used > 0)
@@ -1955,11 +2006,11 @@ void generate_files(int f_out, const char *local_name)
 		if (!deldelay_buf)
 			out_of_memory("delete-delay");
 	}
-	do_progress = 0;
+	info_levels[INFO_FLIST] = info_levels[INFO_PROGRESS] = 0;
 
 	if (append_mode > 0 || whole_file < 0)
 		whole_file = 0;
-	if (verbose >= 2) {
+	if (DEBUG_GTE(FLIST, 1)) {
 		rprintf(FINFO, "delta-transmission %s\n",
 			whole_file
 			? "disabled for local transfer or --whole-file"
@@ -1982,21 +2033,26 @@ void generate_files(int f_out, const char *local_name)
 		}
 #endif
 
-		if (inc_recurse && cur_flist->ndx_start) {
+		if (inc_recurse && cur_flist->parent_ndx >= 0) {
 			struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx];
-			f_name(fp, fbuf);
+			if (solo_file)
+				strlcpy(fbuf, solo_file, sizeof fbuf);
+			else
+				f_name(fp, fbuf);
 			ndx = cur_flist->ndx_start - 1;
 			recv_generator(fbuf, fp, ndx, itemizing, code, f_out);
-			if (delete_during && dry_run < 2) {
-				if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) {
+			if (delete_during && dry_run < 2 && !list_only
+			 && !(fp->flags & FLAG_MISSING_DIR)) {
+				if (fp->flags & FLAG_CONTENT_DIR) {
 					dev_t dirdev;
 					if (one_file_system) {
 						uint32 *devp = F_DIR_DEV_P(fp);
 						dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
 					} else
 						dirdev = MAKEDEV(0, 0);
-					delete_in_dir(f_name(fp, fbuf), fp, &dirdev);
-				}
+					delete_in_dir(fbuf, fp, &dirdev);
+				} else
+					change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
 			}
 		}
 		for (i = cur_flist->low; i <= cur_flist->high; i++) {
@@ -2005,11 +2061,9 @@ void generate_files(int f_out, const char *local_name)
 			if (!F_IS_ACTIVE(file))
 				continue;
 
-#ifdef ICONV_OPTION
-			if (ic_ndx)
+			if (unsort_ndx)
 				ndx = F_NDX(file);
 			else
-#endif
 				ndx = i + cur_flist->ndx_start;
 
 			if (solo_file)
@@ -2020,10 +2074,13 @@ void generate_files(int f_out, const char *local_name)
 
 			check_for_finished_files(itemizing, code, 0);
 
-			if (allowed_lull && !(i % lull_mod))
-				maybe_send_keepalive();
-			else if (!(i & 0xFF))
-				maybe_flush_socket(0);
+			if (i + cur_flist->ndx_start >= next_loopchk) {
+				if (allowed_lull)
+					maybe_send_keepalive();
+				else
+					maybe_flush_socket(0);
+				next_loopchk += loopchk_limit;
+			}
 		}
 
 		if (!inc_recurse) {
@@ -2042,7 +2099,7 @@ void generate_files(int f_out, const char *local_name)
 	if (delete_during)
 		delete_in_dir(NULL, NULL, &dev_zero);
 	phase++;
-	if (verbose > 2)
+	if (DEBUG_GTE(GENR, 1))
 		rprintf(FINFO, "generate_files phase=%d\n", phase);
 
 	while (1) {
@@ -2053,14 +2110,22 @@ void generate_files(int f_out, const char *local_name)
 	}
 
 	phase++;
-	if (verbose > 2)
+	if (DEBUG_GTE(GENR, 1))
 		rprintf(FINFO, "generate_files phase=%d\n", phase);
 
 	write_ndx(f_out, NDX_DONE);
+
 	/* Reduce round-trip lag-time for a useless delay-updates phase. */
-	if (protocol_version >= 29 && !delay_updates)
+	if (protocol_version >= 29 && EARLY_DELAY_DONE_MSG())
 		write_ndx(f_out, NDX_DONE);
 
+	if (protocol_version >= 31 && EARLY_DELETE_DONE_MSG()) {
+		if ((INFO_GTE(STATS, 2) && (delete_mode || force_delete)) || read_batch)
+			write_del_stats(f_out);
+		if (EARLY_DELAY_DONE_MSG()) /* Can't send this before delay */
+			write_ndx(f_out, NDX_DONE);
+	}
+
 	/* Read MSG_DONE for the redo phase (and any prior messages). */
 	while (1) {
 		check_for_finished_files(itemizing, code, 0);
@@ -2071,32 +2136,49 @@ void generate_files(int f_out, const char *local_name)
 
 	if (protocol_version >= 29) {
 		phase++;
-		if (verbose > 2)
+		if (DEBUG_GTE(GENR, 1))
 			rprintf(FINFO, "generate_files phase=%d\n", phase);
-		if (delay_updates)
+		if (!EARLY_DELAY_DONE_MSG()) {
 			write_ndx(f_out, NDX_DONE);
+			if (protocol_version >= 31 && EARLY_DELETE_DONE_MSG())
+				write_ndx(f_out, NDX_DONE);
+		}
 		/* Read MSG_DONE for delay-updates phase & prior messages. */
 		while (msgdone_cnt == 2)
 			wait_for_receiver();
 	}
 
-	do_progress = save_do_progress;
+	info_levels[INFO_FLIST] = save_info_flist;
+	info_levels[INFO_PROGRESS] = save_info_progress;
+
 	if (delete_during == 2)
 		do_delayed_deletions(fbuf);
 	if (delete_after && !solo_file && file_total > 0)
 		do_delete_pass();
 
-	if ((need_retouch_dir_perms || need_retouch_dir_times)
-	 && dir_tweaking && (!inc_recurse || delete_during == 2))
-		touch_up_dirs(dir_flist, -1);
-
-	if (max_delete >= 0 && deletion_count > max_delete) {
-		rprintf(FINFO,
+	if (max_delete >= 0 && skipped_deletes) {
+		rprintf(FWARNING,
 			"Deletions stopped due to --max-delete limit (%d skipped)\n",
-			deletion_count - max_delete);
+			skipped_deletes);
 		io_error |= IOERR_DEL_LIMIT;
 	}
 
-	if (verbose > 2)
+	if (protocol_version >= 31) {
+		if (!EARLY_DELETE_DONE_MSG()) {
+			if (INFO_GTE(STATS, 2) || read_batch)
+				write_del_stats(f_out);
+			write_ndx(f_out, NDX_DONE);
+		}
+
+		/* Read MSG_DONE for late-delete phase & prior messages. */
+		while (msgdone_cnt == 3)
+			wait_for_receiver();
+	}
+
+	if ((need_retouch_dir_perms || need_retouch_dir_times)
+	 && dir_tweaking && (!inc_recurse || delete_during == 2))
+		touch_up_dirs(dir_flist, -1);
+
+	if (DEBUG_GTE(GENR, 1))
 		rprintf(FINFO, "generate_files finished\n");
 }