X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fd3f5af2aa76e687182a7dfab8a55016900689b1..16edf86595a5a990a942fa045dfb523dae1fe6cb:/generator.c

diff --git a/generator.c b/generator.c
index 0d7e58b0..09c6b7d2 100644
--- a/generator.c
+++ b/generator.c
@@ -4,12 +4,11 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -31,11 +30,13 @@ extern int logfile_format_has_i;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
-extern int incremental;
+extern int inc_recurse;
 extern int do_progress;
 extern int relative_paths;
 extern int implied_dirs;
 extern int keep_dirlinks;
+extern int preserve_acls;
+extern int preserve_xattrs;
 extern int preserve_links;
 extern int preserve_devices;
 extern int preserve_specials;
@@ -49,7 +50,7 @@ extern int delete_mode;
 extern int delete_before;
 extern int delete_during;
 extern int delete_after;
-extern int done_cnt;
+extern int msgdone_cnt;
 extern int ignore_errors;
 extern int remove_source_files;
 extern int delay_updates;
@@ -90,6 +91,7 @@ extern int force_delete;
 extern int one_file_system;
 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;
@@ -105,7 +107,10 @@ 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 BOOL solo_file = 0;
+static int lull_mod;
+static int dir_tweaking;
+static int need_retouch_dir_times;
+static const char *solo_file = NULL;
 
 /* For calling delete_item() and delete_dir_contents(). */
 #define DEL_RECURSE		(1<<1) /* recurse */
@@ -283,9 +288,9 @@ static int start_delete_delay_temp(void)
 	if (!get_tmpname(fnametmp, "deldelay")
 	 || (deldelay_fd = do_mkstemp(fnametmp, 0600)) < 0) {
 		rprintf(FINFO, "NOTE: Unable to create delete-delay temp file%s.\n",
-			incremental ? "" : " -- switching to --delete-after");
+			inc_recurse ? "" : " -- switching to --delete-after");
 		delete_during = 0;
-		delete_after = !incremental;
+		delete_after = !inc_recurse;
 		dry_run = save_dry_run;
 		return 0;
 	}
@@ -509,22 +514,39 @@ static void do_delete_pass(struct file_list *flist)
 		rprintf(FINFO, "                    \r");
 }
 
-int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
+int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp)
 {
-	if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
+	if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
 		return 0;
 
-	if (am_root && preserve_uid && st->st_uid != F_UID(file))
+	if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
 		return 0;
 
-	if (preserve_gid && F_GID(file) != GID_NONE && st->st_gid != F_GID(file))
+	if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
 		return 0;
 
+#ifdef SUPPORT_ACLS
+	if (preserve_acls && !S_ISLNK(file->mode)) {
+		if (!ACL_READY(*sxp))
+			get_acl(fname, sxp);
+		if (set_acl(NULL, file, sxp) == 0)
+			return 0;
+	}
+#endif
+#ifdef SUPPORT_XATTRS
+	if (preserve_xattrs) {
+		if (!XATTR_READY(*sxp))
+			get_xattr(fname, sxp);
+		if (xattr_diff(file, sxp, 0))
+			return 0;
+	}
+#endif
+
 	return 1;
 }
 
-void itemize(struct file_struct *file, int ndx, int statret,
-	     STRUCT_STAT *st, int32 iflags, uchar fnamecmp_type,
+void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statret,
+	     statx *sxp, int32 iflags, uchar fnamecmp_type,
 	     const char *xname)
 {
 	if (statret >= 0) { /* A from-dest-dir statret can == 1! */
@@ -532,34 +554,59 @@ void itemize(struct file_struct *file, int ndx, int statret,
 		    : S_ISDIR(file->mode) ? !omit_dir_times
 		    : !S_ISLNK(file->mode);
 
-		if (S_ISREG(file->mode) && F_LENGTH(file) != st->st_size)
+		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)
 		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
-		 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+		 || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
 			iflags |= ITEM_REPORT_TIME;
-		if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
+		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
 			iflags |= ITEM_REPORT_PERMS;
-		if (preserve_uid && am_root && F_UID(file) != st->st_uid)
+		if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
 			iflags |= ITEM_REPORT_OWNER;
 		if (preserve_gid && F_GID(file) != GID_NONE
-		    && st->st_gid != F_GID(file))
+		    && sxp->st.st_gid != F_GID(file))
 			iflags |= ITEM_REPORT_GROUP;
-	} else
+#ifdef SUPPORT_ACLS
+		if (preserve_acls && !S_ISLNK(file->mode)) {
+			if (!ACL_READY(*sxp))
+				get_acl(fnamecmp, sxp);
+			if (set_acl(NULL, file, sxp) == 0)
+				iflags |= ITEM_REPORT_ACL;
+		}
+#endif
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs) {
+			if (!XATTR_READY(*sxp))
+				get_xattr(fnamecmp, sxp);
+			if (xattr_diff(file, sxp, 1))
+				iflags |= ITEM_REPORT_XATTR;
+		}
+#endif
+	} else {
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs && xattr_diff(file, NULL, 1))
+			iflags |= ITEM_REPORT_XATTR;
+#endif
 		iflags |= ITEM_IS_NEW;
+	}
 
 	iflags &= 0xffff;
-	if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
+	if ((iflags & (SIGNIFICANT_ITEM_FLAGS|ITEM_REPORT_XATTR) || verbose > 1
 	  || stdout_format_has_i > 1 || (xname && *xname)) && !read_batch) {
 		if (protocol_version >= 29) {
 			if (ndx >= 0)
-				write_ndx(sock_f_out, ndx + cur_flist->ndx_start);
+				write_ndx(sock_f_out, ndx);
 			write_shortint(sock_f_out, iflags);
 			if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
 				write_byte(sock_f_out, fnamecmp_type);
 			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);
+#endif
 		} else if (ndx >= 0) {
 			enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
 			log_item(code, file, &stats, iflags, xname);
@@ -577,7 +624,7 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
 	/* if always checksum is set then we use the checksum instead
 	   of the file time to determine whether to sync */
 	if (always_checksum > 0 && S_ISREG(st->st_mode)) {
-		char sum[MD4_SUM_LENGTH];
+		char sum[MAX_DIGEST_LEN];
 		file_checksum(fn, sum, st->st_size);
 		return memcmp(sum, F_SUM(file), checksum_len) == 0;
 	}
@@ -777,29 +824,11 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 	return lowest_j;
 }
 
-#ifdef SUPPORT_HARD_LINKS
-void check_for_finished_hlinks(int itemizing, enum logcode code)
-{
-	struct file_struct *file;
-	struct file_list *flist;
-	char fbuf[MAXPATHLEN];
-	int ndx;
-
-	while ((ndx = get_hlink_num()) != -1) {
-		flist = flist_for_ndx(ndx);
-		assert(flist != NULL);
-		file = flist->files[ndx];
-		assert(file->flags & FLAG_HLINKED);
-		finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1);
-	}
-}
-#endif
-
 /* 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, STRUCT_STAT *stp, int itemizing,
+			 char *cmpbuf, statx *sxp, int itemizing,
 			 enum logcode code)
 {
 	int best_match = -1;
@@ -808,7 +837,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 
 	do {
 		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
-		if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
+		if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode))
 			continue;
 		switch (match_level) {
 		case 0:
@@ -816,16 +845,16 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 			match_level = 1;
 			/* FALL THROUGH */
 		case 1:
-			if (!unchanged_file(cmpbuf, file, stp))
+			if (!unchanged_file(cmpbuf, file, &sxp->st))
 				continue;
 			best_match = j;
 			match_level = 2;
 			/* FALL THROUGH */
 		case 2:
-			if (!unchanged_attrs(file, stp))
+			if (!unchanged_attrs(cmpbuf, file, sxp))
 				continue;
 			if (always_checksum > 0 && preserve_times
-			 && cmp_time(stp->st_mtime, file->modtime))
+			 && cmp_time(sxp->st.st_mtime, file->modtime))
 				continue;
 			best_match = j;
 			match_level = 3;
@@ -840,7 +869,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 	if (j != best_match) {
 		j = best_match;
 		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
-		if (link_stat(cmpbuf, stp, 0) < 0)
+		if (link_stat(cmpbuf, &sxp->st, 0) < 0)
 			return -1;
 	}
 
@@ -850,16 +879,16 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 			if (!hard_link_one(file, fname, cmpbuf, 1))
 				goto try_a_copy;
 			if (preserve_hard_links && F_IS_HLINKED(file))
-				finish_hard_link(file, fname, stp, itemizing, code, j);
+				finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
 			if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
-				itemize(file, ndx, 1, stp,
+				itemize(cmpbuf, file, ndx, 1, sxp,
 					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
 					0, "");
 			}
 		} else
 #endif
 		if (itemizing)
-			itemize(file, ndx, 0, stp, 0, 0, NULL);
+			itemize(cmpbuf, file, ndx, 0, sxp, 0, 0, NULL);
 		if (verbose > 1 && maybe_ATTRS_REPORT)
 			rprintf(FCLIENT, "%s is uptodate\n", fname);
 		return -2;
@@ -876,9 +905,13 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 			}
 			return -1;
 		}
+		set_file_attrs(fname, file, NULL, cmpbuf, 0);
 		if (itemizing)
-			itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
-		set_file_attrs(fname, file, NULL, 0);
+			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))) {
@@ -888,7 +921,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		}
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_IS_HLINKED(file))
-			finish_hard_link(file, fname, stp, itemizing, code, -1);
+			finish_hard_link(file, fname, &sxp->st, itemizing, code, -1);
 #endif
 		return -2;
 	}
@@ -900,7 +933,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, STRUCT_STAT *stp, int itemizing,
+			 char *cmpbuf, statx *sxp, int itemizing,
 			 enum logcode code)
 {
 	char lnk[MAXPATHLEN];
@@ -933,24 +966,24 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 
 	do {
 		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
-		if (link_stat(cmpbuf, stp, 0) < 0)
+		if (link_stat(cmpbuf, &sxp->st, 0) < 0)
 			continue;
 		switch (type) {
 		case TYPE_DIR:
-			if (!S_ISDIR(stp->st_mode))
+			if (!S_ISDIR(sxp->st.st_mode))
 				continue;
 			break;
 		case TYPE_SPECIAL:
-			if (!IS_SPECIAL(stp->st_mode))
+			if (!IS_SPECIAL(sxp->st.st_mode))
 				continue;
 			break;
 		case TYPE_DEVICE:
-			if (!IS_DEVICE(stp->st_mode))
+			if (!IS_DEVICE(sxp->st.st_mode))
 				continue;
 			break;
 #ifdef SUPPORT_LINKS
 		case TYPE_SYMLINK:
-			if (!S_ISLNK(stp->st_mode))
+			if (!S_ISLNK(sxp->st.st_mode))
 				continue;
 			break;
 #endif
@@ -965,7 +998,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		case TYPE_SPECIAL:
 		case TYPE_DEVICE:
 			devp = F_RDEV_P(file);
-			if (stp->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
+			if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
 				continue;
 			break;
 #ifdef SUPPORT_LINKS
@@ -982,7 +1015,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			match_level = 2;
 			best_match = j;
 		}
-		if (unchanged_attrs(file, stp)) {
+		if (unchanged_attrs(cmpbuf, file, sxp)) {
 			match_level = 3;
 			best_match = j;
 			break;
@@ -995,7 +1028,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 	if (j != best_match) {
 		j = best_match;
 		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
-		if (link_stat(cmpbuf, stp, 0) < 0)
+		if (link_stat(cmpbuf, &sxp->st, 0) < 0)
 			return -1;
 	}
 
@@ -1026,7 +1059,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 			    : ITEM_LOCAL_CHANGE
 			     + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
 			char *lp = match_level == 3 ? "" : NULL;
-			itemize(file, ndx, 0, stp, chg + ITEM_MATCHED, 0, lp);
+			itemize(cmpbuf, file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp);
 		}
 		if (verbose > 1 && maybe_ATTRS_REPORT) {
 			rprintf(FCLIENT, "%s%s is uptodate\n",
@@ -1039,12 +1072,13 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 }
 
 static int phase = 0;
+static int dflt_perms;
 
-/* Acts on cur_flist->file's ndx'th item, whose name is fname.  If a dir,
+/* 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.
+ * start sending checksums.  The ndx is the file's unique index value.
  *
  * When fname is non-null, it must point to a MAXPATHLEN buffer!
  *
@@ -1059,7 +1093,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	static int need_fuzzy_dirlist = 0;
 	struct file_struct *fuzzy_file = NULL;
 	int fd = -1, f_copy = -1;
-	STRUCT_STAT st, real_st, partial_st;
+	statx sx, real_sx;
+	STRUCT_STAT partial_st;
 	struct file_struct *back_file = NULL;
 	int statret, real_ret, stat_errno;
 	char *fnamecmp, *partialptr, *backupptr = NULL;
@@ -1104,6 +1139,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			return;
 		}
 	}
+#ifdef SUPPORT_ACLS
+	sx.acc_acl = sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+	sx.xattr = NULL;
+#endif
 	if (dry_run > 1) {
 		if (fuzzy_dirlist) {
 			flist_free(fuzzy_dirlist);
@@ -1116,7 +1157,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		const char *dn = file->dirname ? file->dirname : ".";
 		if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
 			if (relative_paths && !implied_dirs
-			 && do_stat(dn, &st) < 0
+			 && do_stat(dn, &sx.st) < 0
 			 && create_directory_path(fname) < 0) {
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",
@@ -1128,6 +1169,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 			if (fuzzy_basis)
 				need_fuzzy_dirlist = 1;
+#ifdef SUPPORT_ACLS
+			if (!preserve_perms)
+				dflt_perms = default_perms_for_dir(dn);
+#endif
 		}
 		parent_dirname = dn;
 
@@ -1137,7 +1182,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			need_fuzzy_dirlist = 0;
 		}
 
-		statret = link_stat(fname, &st,
+		statret = link_stat(fname, &sx.st,
 				    keep_dirlinks && S_ISDIR(file->mode));
 		stat_errno = errno;
 	}
@@ -1159,22 +1204,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		return;
 	}
 
-	/* If we're not preserving permissions, change the file-list's
-	 * mode based on the local permissions and some heuristics. */
-	if (!preserve_perms) {
-		int exists = statret == 0
-			  && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
-		file->mode = dest_mode(file->mode, st.st_mode, exists);
-	}
-
 	if (S_ISDIR(file->mode)) {
 		/* The file to be received is a directory, so we need
 		 * to prepare appropriately.  If there is already a
 		 * file of that name and it is *not* a directory, then
 		 * we need to delete it.  If it doesn't exist, then
 		 * (perhaps recursively) create it. */
-		if (statret == 0 && !S_ISDIR(st.st_mode)) {
-			if (delete_item(fname, st.st_mode, "directory", del_opts) != 0)
+		if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
+			if (delete_item(fname, sx.st.st_mode, "directory", del_opts) != 0)
 				return;
 			statret = -1;
 		}
@@ -1183,14 +1220,18 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			dry_run++;
 		}
 		real_ret = statret;
-		real_st = st;
+		real_sx = sx;
 		if (new_root_dir) {
 			if (*fname == '.' && fname[1] == '\0')
 				statret = -1;
 			new_root_dir = 0;
 		}
+		if (!preserve_perms) { /* See comment in non-dir code below. */
+			file->mode = dest_mode(file->mode, sx.st.st_mode,
+					       dflt_perms, statret == 0);
+		}
 		if (statret != 0 && basis_dir[0] != NULL) {
-			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
 					      itemizing, code);
 			if (j == -2) {
 				itemizing = 0;
@@ -1199,7 +1240,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				statret = 1;
 		}
 		if (itemizing && f_out != -1) {
-			itemize(file, ndx, statret, &st,
+			itemize(fname, file, ndx, statret, &sx,
 				statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
 		}
 		if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
@@ -1213,31 +1254,39 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				    "*** Skipping any contents from this failed directory ***\n");
 				missing_below = F_DEPTH(file);
 				file->flags |= FLAG_MISSING_DIR;
-				return;
+				goto cleanup;
 			}
 		}
-		if (set_file_attrs(fname, file, real_ret ? NULL : &real_st, 0)
+		if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
 		    && verbose && code != FNONE && f_out != -1)
 			rprintf(code, "%s/\n", fname);
 		if (real_ret != 0 && one_file_system)
-			real_st.st_dev = filesystem_dev;
-		if (incremental) {
+			real_sx.st.st_dev = filesystem_dev;
+		if (inc_recurse) {
 			if (one_file_system) {
 				uint32 *devp = F_DIRDEV_P(file);
-				DEV_MAJOR(devp) = major(real_st.st_dev);
-				DEV_MINOR(devp) = minor(real_st.st_dev);
+				DEV_MAJOR(devp) = major(real_sx.st.st_dev);
+				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(cur_flist, fname, file, &real_st.st_dev);
-		return;
+			delete_in_dir(cur_flist, fname, file, &real_sx.st.st_dev);
+		goto cleanup;
+	}
+
+	/* If we're not preserving permissions, change the file-list's
+	 * mode based on the local permissions and some heuristics. */
+	if (!preserve_perms) {
+		int exists = statret == 0 && !S_ISDIR(sx.st.st_mode);
+		file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
+				       exists);
 	}
 
 #ifdef SUPPORT_HARD_LINKS
 	if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
-	 && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
-		return;
+	 && hard_link_check(file, ndx, fname, statret, &sx, itemizing, code))
+		goto cleanup;
 #endif
 
 	if (preserve_links && S_ISLNK(file->mode)) {
@@ -1257,28 +1306,28 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			char lnk[MAXPATHLEN];
 			int len;
 
-			if (!S_ISLNK(st.st_mode))
+			if (!S_ISLNK(sx.st.st_mode))
 				statret = -1;
 			else if ((len = readlink(fname, lnk, MAXPATHLEN-1)) > 0
 			      && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
 				/* The link is pointing to the right place. */
+				set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
 				if (itemizing)
-					itemize(file, ndx, 0, &st, 0, 0, NULL);
-				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+					itemize(fname, file, ndx, 0, &sx, 0, 0, NULL);
 #ifdef SUPPORT_HARD_LINKS
 				if (preserve_hard_links && F_IS_HLINKED(file))
-					finish_hard_link(file, fname, &st, itemizing, code, -1);
+					finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
 #endif
 				if (remove_source_files == 1)
 					goto return_with_success;
-				return;
+				goto cleanup;
 			}
 			/* Not the right symlink (or not a symlink), so
 			 * delete it. */
-			if (delete_item(fname, st.st_mode, "symlink", del_opts) != 0)
-				return;
+			if (delete_item(fname, sx.st.st_mode, "symlink", del_opts) != 0)
+				goto cleanup;
 		} else if (basis_dir[0] != NULL) {
-			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
 					      itemizing, code);
 			if (j == -2) {
 #ifndef CAN_HARDLINK_SYMLINK
@@ -1287,7 +1336,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				} else
 #endif
 				if (!copy_dest)
-					return;
+					goto cleanup;
 				itemizing = 0;
 				code = FNONE;
 			} else if (j >= 0)
@@ -1295,15 +1344,15 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
-			return;
+			goto cleanup;
 #endif
 		if (do_symlink(sl, fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
 				full_fname(fname), sl);
 		} else {
-			set_file_attrs(fname, file, NULL, 0);
+			set_file_attrs(fname, file, NULL, NULL, 0);
 			if (itemizing) {
-				itemize(file, ndx, statret, &st,
+				itemize(fname, file, ndx, statret, &sx,
 					ITEM_LOCAL_CHANGE, 0, NULL);
 			}
 			if (code != FNONE && verbose)
@@ -1319,7 +1368,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				goto return_with_success;
 		}
 #endif
-		return;
+		goto cleanup;
 	}
 
 	if ((am_root && preserve_devices && IS_DEVICE(file->mode))
@@ -1329,33 +1378,33 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (statret == 0) {
 			char *t;
 			if (IS_DEVICE(file->mode)) {
-				if (!IS_DEVICE(st.st_mode))
+				if (!IS_DEVICE(sx.st.st_mode))
 					statret = -1;
 				t = "device file";
 			} else {
-				if (!IS_SPECIAL(st.st_mode))
+				if (!IS_SPECIAL(sx.st.st_mode))
 					statret = -1;
 				t = "special file";
 			}
 			if (statret == 0
-			 && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
-			 && st.st_rdev == rdev) {
+			 && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
+			 && sx.st.st_rdev == rdev) {
 				/* The device or special file is identical. */
+				set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
 				if (itemizing)
-					itemize(file, ndx, 0, &st, 0, 0, NULL);
-				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+					itemize(fname, file, ndx, 0, &sx, 0, 0, NULL);
 #ifdef SUPPORT_HARD_LINKS
 				if (preserve_hard_links && F_IS_HLINKED(file))
-					finish_hard_link(file, fname, &st, itemizing, code, -1);
+					finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
 #endif
 				if (remove_source_files == 1)
 					goto return_with_success;
-				return;
+				goto cleanup;
 			}
-			if (delete_item(fname, st.st_mode, t, del_opts) != 0)
-				return;
+			if (delete_item(fname, sx.st.st_mode, t, del_opts) != 0)
+				goto cleanup;
 		} else if (basis_dir[0] != NULL) {
-			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
+			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
 					      itemizing, code);
 			if (j == -2) {
 #ifndef CAN_HARDLINK_SPECIAL
@@ -1364,7 +1413,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				} else
 #endif
 				if (!copy_dest)
-					return;
+					goto cleanup;
 				itemizing = 0;
 				code = FNONE;
 			} else if (j >= 0)
@@ -1372,7 +1421,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
-			return;
+			goto cleanup;
 #endif
 		if (verbose > 2) {
 			rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
@@ -1383,9 +1432,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			rsyserr(FERROR, errno, "mknod %s failed",
 				full_fname(fname));
 		} else {
-			set_file_attrs(fname, file, NULL, 0);
+			set_file_attrs(fname, file, NULL, NULL, 0);
 			if (itemizing) {
-				itemize(file, ndx, statret, &st,
+				itemize(fname, file, ndx, statret, &sx,
 					ITEM_LOCAL_CHANGE, 0, NULL);
 			}
 			if (code != FNONE && verbose)
@@ -1397,14 +1446,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			if (remove_source_files == 1)
 				goto return_with_success;
 		}
-		return;
+		goto cleanup;
 	}
 
 	if (!S_ISREG(file->mode)) {
 		if (solo_file)
 			fname = f_name(file, NULL);
 		rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
-		return;
+		goto cleanup;
 	}
 
 	if (max_size > 0 && F_LENGTH(file) > max_size) {
@@ -1413,7 +1462,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				fname = f_name(file, NULL);
 			rprintf(FINFO, "%s is over max-size\n", fname);
 		}
-		return;
+		goto cleanup;
 	}
 	if (min_size > 0 && F_LENGTH(file) < min_size) {
 		if (verbose > 1) {
@@ -1421,39 +1470,39 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				fname = f_name(file, NULL);
 			rprintf(FINFO, "%s is under min-size\n", fname);
 		}
-		return;
+		goto cleanup;
 	}
 
 	if (ignore_existing > 0 && statret == 0) {
 		if (verbose > 1)
 			rprintf(FINFO, "%s exists\n", fname);
-		return;
+		goto cleanup;
 	}
 
 	if (update_only > 0 && statret == 0
-	    && cmp_time(st.st_mtime, file->modtime) > 0) {
+	    && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
 		if (verbose > 1)
 			rprintf(FINFO, "%s is newer\n", fname);
-		return;
+		goto cleanup;
 	}
 
 	fnamecmp = fname;
 	fnamecmp_type = FNAMECMP_FNAME;
 
-	if (statret == 0 && !S_ISREG(st.st_mode)) {
-		if (delete_item(fname, st.st_mode, "regular file", del_opts) != 0)
-			return;
+	if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
+		if (delete_item(fname, sx.st.st_mode, "regular file", del_opts) != 0)
+			goto cleanup;
 		statret = -1;
 		stat_errno = ENOENT;
 	}
 
 	if (statret != 0 && basis_dir[0] != NULL) {
-		int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
+		int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
 				      itemizing, code);
 		if (j == -2) {
 			if (remove_source_files == 1)
 				goto return_with_success;
-			return;
+			goto cleanup;
 		}
 		if (j >= 0) {
 			fnamecmp = fnamecmpbuf;
@@ -1463,7 +1512,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	real_ret = statret;
-	real_st = st;
+	real_sx = sx;
 
 	if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
 	    && link_stat(partialptr, &partial_st, 0) == 0
@@ -1482,7 +1531,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
 					fname, fnamecmpbuf);
 			}
-			st.st_size = F_LENGTH(fuzzy_file);
+			sx.st.st_size = F_LENGTH(fuzzy_file);
 			statret = 0;
 			fnamecmp = fnamecmpbuf;
 			fnamecmp_type = FNAMECMP_FUZZY;
@@ -1492,45 +1541,45 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	if (statret != 0) {
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
-			return;
+			goto cleanup;
 #endif
 		if (stat_errno == ENOENT)
 			goto notify_others;
 		rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
 			full_fname(fname));
-		return;
+		goto cleanup;
 	}
 
-	if (append_mode > 0 && st.st_size > F_LENGTH(file))
-		return;
+	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)
 		;
-	else if (unchanged_file(fnamecmp, file, &st)) {
+	else if (unchanged_file(fnamecmp, file, &sx.st)) {
 		if (partialptr) {
 			do_unlink(partialptr);
 			handle_partial_dir(partialptr, PDIR_DELETE);
 		}
+		set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
 		if (itemizing)
-			itemize(file, ndx, statret, &st, 0, 0, NULL);
-		set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
+			itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_IS_HLINKED(file))
-			finish_hard_link(file, fname, &st, itemizing, code, -1);
+			finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
 #endif
 		if (remove_source_files != 1)
-			return;
+			goto cleanup;
 	  return_with_success:
 		if (!dry_run)
-			send_msg_int(MSG_SUCCESS, ndx + cur_flist->ndx_start);
-		return;
+			send_msg_int(MSG_SUCCESS, ndx);
+		goto cleanup;
 	}
 
   prepare_to_open:
 	if (partialptr) {
-		st = partial_st;
+		sx.st = partial_st;
 		fnamecmp = partialptr;
 		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
 		statret = 0;
@@ -1555,7 +1604,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		/* pretend the file didn't exist */
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
-			return;
+			goto cleanup;
 #endif
 		statret = real_ret = -1;
 		goto notify_others;
@@ -1564,7 +1613,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) {
 		if (!(backupptr = get_backup_name(fname))) {
 			close(fd);
-			return;
+			goto cleanup;
 		}
 		if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
 			close(fd);
@@ -1575,7 +1624,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				full_fname(backupptr));
 			unmake_file(back_file);
 			close(fd);
-			return;
+			goto cleanup;
 		}
 		if ((f_copy = do_open(backupptr,
 		    O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
@@ -1583,14 +1632,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				full_fname(backupptr));
 			unmake_file(back_file);
 			close(fd);
-			return;
+			goto cleanup;
 		}
 		fnamecmp_type = FNAMECMP_BACKUP;
 	}
 
 	if (verbose > 3) {
 		rprintf(FINFO, "gen mapped %s of size %.0f\n",
-			fnamecmp, (double)st.st_size);
+			fnamecmp, (double)sx.st.st_size);
 	}
 
 	if (verbose > 2)
@@ -1599,13 +1648,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
   notify_others:
 	if (remove_source_files && !delay_updates && !phase)
 		increment_active_files(ndx, itemizing, code);
-	if (incremental && !dry_run)
+	if (inc_recurse && !dry_run)
 		cur_flist->in_progress++;
 #ifdef SUPPORT_HARD_LINKS
 	if (preserve_hard_links && F_IS_HLINKED(file))
 		file->flags |= FLAG_FILE_SENT;
 #endif
-	write_ndx(f_out, ndx + cur_flist->ndx_start);
+	write_ndx(f_out, ndx);
 	if (itemizing) {
 		int iflags = ITEM_TRANSFER;
 		if (always_checksum > 0)
@@ -1614,30 +1663,38 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			iflags |= ITEM_BASIS_TYPE_FOLLOWS;
 		if (fnamecmp_type == FNAMECMP_FUZZY)
 			iflags |= ITEM_XNAME_FOLLOWS;
-		itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
+		itemize(fnamecmp, file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
 			fuzzy_file ? fuzzy_file->basename : NULL);
+#ifdef SUPPORT_ACLS
+		if (preserve_acls)
+			free_acl(&real_sx);
+#endif
+#ifdef SUPPORT_XATTRS
+		if (preserve_xattrs)
+			free_xattr(&real_sx);
+#endif
 	}
 
 	if (!do_xfers) {
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_IS_HLINKED(file))
-			finish_hard_link(file, fname, &st, itemizing, code, -1);
+			finish_hard_link(file, fname, &sx.st, itemizing, code, -1);
 #endif
-		return;
+		goto cleanup;
 	}
 	if (read_batch)
-		return;
+		goto cleanup;
 
 	if (statret != 0 || whole_file) {
 		write_sum_head(f_out, NULL);
-		return;
+		goto cleanup;
 	}
 
-	generate_and_send_sums(fd, st.st_size, f_out, f_copy);
+	generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy);
 
 	if (f_copy >= 0) {
 		close(f_copy);
-		set_file_attrs(backupptr, back_file, NULL, 0);
+		set_file_attrs(backupptr, back_file, NULL, NULL, 0);
 		if (verbose > 1) {
 			rprintf(FINFO, "backed up %s to %s\n",
 				fname, backupptr);
@@ -1646,10 +1703,20 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	close(fd);
+
+  cleanup:
+#ifdef SUPPORT_ACLS
+	if (preserve_acls)
+		free_acl(&sx);
+#endif
+#ifdef SUPPORT_XATTRS
+	if (preserve_xattrs)
+		free_xattr(&sx);
+#endif
+	return;
 }
 
-static void touch_up_dirs(struct file_list *flist, int ndx,
-			  int need_retouch_dir_times, int lull_mod)
+static void touch_up_dirs(struct file_list *flist, int ndx)
 {
 	struct file_struct *file;
 	char *fname;
@@ -1678,22 +1745,94 @@ static void touch_up_dirs(struct file_list *flist, int ndx,
 		if (allowed_lull && !(++j % lull_mod))
 			maybe_send_keepalive();
 		else if (!(j % 200))
-			maybe_flush_socket();
+			maybe_flush_socket(0);
 	}
 }
 
-void generate_files(int f_out, char *local_name)
+void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+{
+	struct file_struct *file;
+	struct file_list *flist;
+	char fbuf[MAXPATHLEN];
+	int ndx;
+
+#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];
+		assert(file->flags & FLAG_HLINKED);
+		finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1);
+	}
+#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 (first_flist->in_progress || first_flist->to_redo)
+			break;
+
+		if (!read_batch) {
+			write_ndx(sock_f_out, NDX_DONE);
+			maybe_flush_socket(1);
+		}
+
+		if (delete_during == 2 || !dir_tweaking) {
+			/* Skip directory touch-up. */
+		} else if (first_flist->ndx_start != 0)
+			touch_up_dirs(dir_flist, first_flist->parent_ndx);
+		else if (relative_paths && implied_dirs)
+			touch_up_dirs(first_flist, -1);
+
+		flist_free(first_flist); /* updates first_flist */
+	}
+}
+
+void generate_files(int f_out, const char *local_name)
 {
 	int i;
 	char fbuf[MAXPATHLEN];
 	int itemizing;
 	enum logcode code;
-	struct file_list *next_flist;
-	int lull_mod = allowed_lull * 5;
-	int need_retouch_dir_times = preserve_times && !omit_dir_times;
 	int need_retouch_dir_perms = 0;
 	int save_do_progress = do_progress;
-	int dir_tweaking = !(list_only || local_name || dry_run);
 
 	if (protocol_version >= 29) {
 		itemizing = 1;
@@ -1712,12 +1851,15 @@ void generate_files(int f_out, char *local_name)
 		maybe_ATTRS_REPORT = ATTRS_REPORT;
 		code = FINFO;
 	}
-	solo_file = local_name != NULL;
+	solo_file = local_name;
+	dir_tweaking = !(list_only || solo_file || dry_run);
+	need_retouch_dir_times = preserve_times && !omit_dir_times;
+	lull_mod = allowed_lull * 5;
 
 	if (verbose > 2)
 		rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
 
-	if (delete_before && !local_name && cur_flist->count > 0)
+	if (delete_before && !solo_file && cur_flist->count > 0)
 		do_delete_pass(cur_flist);
 	if (delete_during == 2) {
 		deldelay_size = BIGPATHBUFLEN * 4;
@@ -1742,8 +1884,10 @@ void generate_files(int f_out, char *local_name)
 	 * notice that and let us know via the redo pipe (or its closing). */
 	ignore_timeout = 1;
 
+	dflt_perms = (ACCESSPERMS & ~orig_umask);
+
 	do {
-		if (incremental && delete_during && cur_flist->ndx_start) {
+		if (inc_recurse && delete_during && cur_flist->ndx_start) {
 			struct file_struct *fp = dir_flist->files[cur_flist->parent_ndx];
 			if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) {
 				dev_t dirdev;
@@ -1761,11 +1905,12 @@ void generate_files(int f_out, char *local_name)
 			if (!F_IS_ACTIVE(file))
 				continue;
 
-			if (local_name)
-				strlcpy(fbuf, local_name, sizeof fbuf);
+			if (solo_file)
+				strlcpy(fbuf, solo_file, sizeof fbuf);
 			else
 				f_name(file, fbuf);
-			recv_generator(fbuf, file, i, itemizing, code, f_out);
+			recv_generator(fbuf, file, i + cur_flist->ndx_start,
+				       itemizing, code, f_out);
 
 			/* We need to ensure that any dirs we create have
 			 * writeable permissions during the time we are putting
@@ -1775,7 +1920,7 @@ void generate_files(int f_out, char *local_name)
 			if (!am_root && S_ISDIR(file->mode)
 			 && !(file->mode & S_IWUSR) && dir_tweaking) {
 				mode_t mode = file->mode | S_IWUSR;
-				char *fname = local_name ? local_name : fbuf;
+				const char *fname = solo_file ? solo_file : fbuf;
 				if (do_chmod(fname, mode) < 0) {
 					rsyserr(FERROR, errno,
 					    "failed to modify permissions on %s",
@@ -1785,111 +1930,39 @@ void generate_files(int f_out, char *local_name)
 			}
 #endif
 
-#ifdef SUPPORT_HARD_LINKS
-			if (preserve_hard_links)
-				check_for_finished_hlinks(itemizing, code);
-#endif
+			check_for_finished_files(itemizing, code, 0);
 
 			if (allowed_lull && !(i % lull_mod))
 				maybe_send_keepalive();
 			else if (!(i % 200))
-				maybe_flush_socket();
+				maybe_flush_socket(0);
 		}
 
-		if (!incremental) {
-			if (delete_during)
-				delete_in_dir(NULL, NULL, NULL, &dev_zero);
-			phase++;
-			if (verbose > 2) {
-				rprintf(FINFO, "generate_files phase=%d\n",
-					phase);
-			}
-
+		if (!inc_recurse) {
 			write_ndx(f_out, NDX_DONE);
+			break;
 		}
 
-		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++;
-
-		/* Files can cycle through the system more than once
-		 * to catch initial checksum errors. */
-		while (!done_cnt) {
-			struct file_struct *file;
-			struct file_list *save_flist;
-
-			check_for_finished_hlinks(itemizing, code);
-
-			if ((i = get_redo_num()) == -1) {
-				if (incremental)
-					break;
-				wait_for_receiver();
-				continue;
-			}
-
-			save_flist = cur_flist;
-			cur_flist = flist_for_ndx(i);
-			file = cur_flist->files[i];
-			if (local_name)
-				strlcpy(fbuf, local_name, sizeof fbuf);
-			else
-				f_name(file, fbuf);
-			recv_generator(fbuf, file, i, itemizing, code, f_out);
-			cur_flist->to_redo--;
-			cur_flist = save_flist;
+		while (1) {
+			check_for_finished_files(itemizing, code, 1);
+			if (cur_flist->next || flist_eof)
+				break;
+			wait_for_receiver();
 		}
+	} while ((cur_flist = cur_flist->next) != NULL);
 
-		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--;
+	if (delete_during)
+		delete_in_dir(NULL, NULL, NULL, &dev_zero);
+	phase++;
+	if (verbose > 2)
+		rprintf(FINFO, "generate_files phase=%d\n", phase);
 
-		if (!incremental)
+	while (1) {
+		check_for_finished_files(itemizing, code, 1);
+		if (msgdone_cnt)
 			break;
-
-		while (!cur_flist->next && !flist_eof)
-			wait_for_receiver();
-		next_flist = cur_flist->next;
-		while (first_flist != next_flist) {
-			if (first_flist->in_progress || first_flist->to_redo) {
-				if (next_flist)
-					break;
-				wait_for_receiver();
-				continue;
-			}
-
-			cur_flist = first_flist;
-			if (delete_during == 2 || !dir_tweaking) {
-				/* Skip directory touch-up. */
-			} else if (cur_flist->ndx_start != 0) {
-				touch_up_dirs(dir_flist, cur_flist->parent_ndx,
-					      need_retouch_dir_times, lull_mod);
-			} else if (relative_paths && implied_dirs) {
-				touch_up_dirs(cur_flist, -1,
-					      need_retouch_dir_times, lull_mod);
-			}
-
-			flist_free(first_flist); /* updates cur_flist & first_flist */
-
-			if (!read_batch)
-				write_ndx(f_out, NDX_DONE);
-		}
-	} while ((cur_flist = next_flist) != NULL);
+		wait_for_receiver();
+	}
 
 	phase++;
 	if (verbose > 2)
@@ -1901,8 +1974,10 @@ void generate_files(int f_out, char *local_name)
 		write_ndx(f_out, NDX_DONE);
 
 	/* Read MSG_DONE for the redo phase (and any prior messages). */
-	while (done_cnt <= 1) {
-		check_for_finished_hlinks(itemizing, code);
+	while (1) {
+		check_for_finished_files(itemizing, code, 0);
+		if (msgdone_cnt > 1)
+			break;
 		wait_for_receiver();
 	}
 
@@ -1913,21 +1988,19 @@ void generate_files(int f_out, char *local_name)
 		if (delay_updates)
 			write_ndx(f_out, NDX_DONE);
 		/* Read MSG_DONE for delay-updates phase & prior messages. */
-		while (done_cnt == 2)
+		while (msgdone_cnt == 2)
 			wait_for_receiver();
 	}
 
 	do_progress = save_do_progress;
 	if (delete_during == 2)
 		do_delayed_deletions(fbuf);
-	if (delete_after && !local_name && file_total > 0)
+	if (delete_after && !solo_file && file_total > 0)
 		do_delete_pass(cur_flist);
 
 	if ((need_retouch_dir_perms || need_retouch_dir_times)
-	 && dir_tweaking && (!incremental || delete_during == 2)) {
-		touch_up_dirs(incremental ? dir_flist : cur_flist, -1,
-			      need_retouch_dir_times, lull_mod);
-	}
+	 && dir_tweaking && (!inc_recurse || delete_during == 2))
+		touch_up_dirs(inc_recurse ? dir_flist : cur_flist, -1);
 
 	if (max_delete >= 0 && deletion_count > max_delete) {
 		rprintf(FINFO,