X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c8ca974634277761d57c0f95274369436bf0fe66..dd18526e5bb61852016158b9eaacc4f0c0d00c20:/generator.c

diff --git a/generator.c b/generator.c
index 6cbba4ed..0b8e22c6 100644
--- a/generator.c
+++ b/generator.c
@@ -25,11 +25,16 @@
 
 extern int verbose;
 extern int dry_run;
-extern int itemize_changes;
+extern int log_format_has_i;
+extern int log_format_has_o_or_i;
+extern int daemon_log_format_has_i;
+extern int am_root;
+extern int am_server;
+extern int am_daemon;
+extern int recurse;
 extern int relative_paths;
 extern int keep_dirlinks;
 extern int preserve_links;
-extern int am_root;
 extern int preserve_devices;
 extern int preserve_hard_links;
 extern int preserve_perms;
@@ -37,7 +42,12 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int preserve_times;
 extern int omit_dir_times;
+extern int delete_before;
 extern int delete_during;
+extern int delete_after;
+extern int module_id;
+extern int ignore_errors;
+extern int remove_sent_files;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int inplace;
@@ -47,6 +57,9 @@ extern int ignore_times;
 extern int size_only;
 extern OFF_T max_size;
 extern int io_timeout;
+extern int io_error;
+extern int sock_f_out;
+extern int ignore_timeout;
 extern int protocol_version;
 extern int fuzzy_basis;
 extern int always_checksum;
@@ -62,70 +75,277 @@ extern int only_existing;
 extern int orig_umask;
 extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
-
+extern int max_delete;
+extern int force_delete;
+extern int one_file_system;
+extern struct stats stats;
+extern dev_t filesystem_dev;
+extern char *backup_dir;
+extern char *backup_suffix;
+extern int backup_suffix_len;
+extern struct file_list *the_file_list;
 extern struct filter_list_struct server_filter_list;
 
-static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
+int allowed_lull = 0;
+
+static int deletion_count = 0; /* used to implement --max-delete */
+
+
+static int is_backup_file(char *fn)
 {
-	if (preserve_perms
-	 && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
-		return 0;
+	int k = strlen(fn) - backup_suffix_len;
+	return k > 0 && strcmp(fn+k, backup_suffix) == 0;
+}
 
-	if (am_root && preserve_uid && st->st_uid != file->uid)
+
+/* Delete a file or directory.  If DEL_FORCE_RECURSE is set in the flags, or if
+ * force_delete is set, this will delete recursively as long as DEL_NO_RECURSE
+ * is not set in the flags. */
+static int delete_item(char *fname, int mode, int flags)
+{
+	struct file_list *dirlist;
+	char buf[MAXPATHLEN];
+	int j, dlen, zap_dir, ok;
+	void *save_filters;
+
+	if (!S_ISDIR(mode)) {
+		if (max_delete && ++deletion_count > max_delete)
+			return 0;
+		if (make_backups && (backup_dir || !is_backup_file(fname)))
+			ok = make_backup(fname);
+		else
+			ok = robust_unlink(fname) == 0;
+		if (ok) {
+			if (!(flags & DEL_TERSE))
+				log_delete(fname, mode);
+			return 0;
+		}
+		if (errno == ENOENT) {
+			deletion_count--;
+			return 0;
+		}
+		rsyserr(FERROR, errno, "delete_file: unlink %s failed",
+			full_fname(fname));
+		return -1;
+	}
+
+	zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
+		&& !(flags & DEL_NO_RECURSE);
+	if ((max_delete && ++deletion_count > max_delete)
+	    || (dry_run && zap_dir)) {
+		ok = 0;
+		errno = ENOTEMPTY;
+	} else if (make_backups && !backup_dir && !is_backup_file(fname)
+	    && !(flags & DEL_FORCE_RECURSE))
+		ok = make_backup(fname);
+	else
+		ok = do_rmdir(fname) == 0;
+	if (ok) {
+		if (!(flags & DEL_TERSE))
+			log_delete(fname, mode);
+		return 0;
+	}
+	if (errno == ENOENT) {
+		deletion_count--;
 		return 0;
+	}
+	if (!zap_dir || (errno != ENOTEMPTY && errno != EEXIST)) {
+		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
+			full_fname(fname));
+		return -1;
+	}
+	flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */
+	deletion_count--;
 
-	if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+	dlen = strlcpy(buf, fname, MAXPATHLEN);
+	save_filters = push_local_filters(buf, dlen);
+
+	dirlist = get_dirlist(buf, dlen, 0);
+	for (j = dirlist->count; j--; ) {
+		struct file_struct *fp = dirlist->files[j];
+
+		if (fp->flags & FLAG_MOUNT_POINT)
+			continue;
+
+		f_name_to(fp, buf);
+		if (delete_item(buf, fp->mode, flags & ~DEL_TERSE) != 0) {
+			flist_free(dirlist);
+			return -1;
+		}
+	}
+	flist_free(dirlist);
+
+	pop_local_filters(save_filters);
+
+	if (max_delete && ++deletion_count > max_delete)
 		return 0;
 
-	return 1;
-}
+	if (do_rmdir(fname) == 0) {
+		if (!(flags & DEL_TERSE))
+			log_delete(fname, mode);
+	} else if (errno != ENOTEMPTY && errno != ENOENT) {
+		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
+			full_fname(fname));
+		return -1;
+	}
 
+	return 0;
+}
 
-#define SC_CHECKSUM_CHANGED (1<<0)
-#define SC_UPDATING (1<<1)
-#define SC_NO_DEST_AND_NO_UPDATE (1<<2)
-#define SC_SKIP_NL (1<<3)
 
-static void showchg(const char *fname, struct file_struct *file, int statret,
-		    STRUCT_STAT *st, int flags)
+/* This function is used to implement per-directory deletion, and is used by
+ * all the --delete-WHEN options.  Note that the fbuf pointer must point to a
+ * MAXPATHLEN buffer with the name of the directory in it (the functions we
+ * call will append names onto the end, but the old dir value will be restored
+ * on exit). */
+static void delete_in_dir(struct file_list *flist, char *fbuf,
+			  struct file_struct *file)
 {
-	static char ch[] = "*Xcstpog";
-	int keep_time;
-	char *s;
+	static int min_depth = MAXPATHLEN, cur_depth = -1;
+	static void *filt_array[MAXPATHLEN/2+1];
+	static int already_output_warning = 0;
+	struct file_list *dirlist;
+	char delbuf[MAXPATHLEN];
+	STRUCT_STAT st;
+	int dlen, i;
+
+	if (!flist) {
+		while (cur_depth >= min_depth)
+			pop_local_filters(filt_array[cur_depth--]);
+		min_depth = MAXPATHLEN;
+		cur_depth = -1;
+		return;
+	}
+
+	if (verbose > 2)
+		rprintf(FINFO, "delete_in_dir(%s)\n", safe_fname(fbuf));
+
+	if (allowed_lull)
+		maybe_send_keepalive();
+
+	if (file->dir.depth >= MAXPATHLEN/2+1)
+		return; /* Impossible... */
+
+	if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+		if (already_output_warning)
+			return;
+		rprintf(FINFO,
+			"IO error encountered -- skipping file deletion\n");
+		already_output_warning = 1;
+		return;
+	}
+
+	while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
+		pop_local_filters(filt_array[cur_depth--]);
+	cur_depth = file->dir.depth;
+	if (min_depth > cur_depth)
+		min_depth = cur_depth;
+	dlen = strlen(fbuf);
+	filt_array[cur_depth] = push_local_filters(fbuf, dlen);
+
+	if (link_stat(fbuf, &st, keep_dirlinks) < 0)
+		return;
+
+	if (one_file_system && file->flags & FLAG_TOP_DIR)
+		filesystem_dev = st.st_dev;
 
-	ch[0] = flags & SC_UPDATING ? '*' : ' ';
-	ch[1] = S_ISDIR(file->mode) ? 'd' : IS_DEVICE(file->mode) ? 'D'
-	      : S_ISLNK(file->mode) ? 'L' : 'f';
+	dirlist = get_dirlist(fbuf, dlen, 0);
 
-	if (statret < 0) {
-		for (s = ch + 2; *s; ) *s++ = '+';
-		goto print_it;
+	/* If an item in dirlist is not found in flist, delete it
+	 * from the filesystem. */
+	for (i = dirlist->count; i--; ) {
+		if (!dirlist->files[i]->basename)
+			continue;
+		if (flist_find(flist, dirlist->files[i]) < 0) {
+			int mode = dirlist->files[i]->mode;
+			f_name_to(dirlist->files[i], delbuf);
+			if (delete_item(delbuf, mode, DEL_FORCE_RECURSE) < 0)
+				break;
+		}
 	}
 
-	keep_time = !preserve_times ? 0
-		: S_ISDIR(file->mode) ? !omit_dir_times : !S_ISLNK(file->mode);
+	flist_free(dirlist);
+}
 
-	ch[2] = !(flags & SC_CHECKSUM_CHANGED) ? '-' : 'c';
-	ch[3] = !S_ISREG(file->mode) || file->length == st->st_size ? '-' : 's';
-	ch[4] = flags & SC_UPDATING && !keep_time ? 'T'
-	    : !keep_time || file->modtime == st->st_mtime ? '-' : 't';
-	ch[5] = !preserve_perms || file->mode == st->st_mode ? '-' : 'p';
-	ch[6] = !am_root || !preserve_uid || file->uid == st->st_uid ? '-' : 'o';
-	ch[7] = preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid  ? 'g' : '-';
+/* This deletes any files on the receiving side that are not present on the
+ * sending side.  This is used by --delete-before and --delete-after. */
+static void do_delete_pass(struct file_list *flist)
+{
+	char fbuf[MAXPATHLEN];
+	int j;
 
-	if (flags & SC_NO_DEST_AND_NO_UPDATE)
-	    ch[4] = ch[5] = ch[6] = ch[7] = '-';
+	if (dry_run > 1) /* destination doesn't exist yet */
+		return;
 
-	if (!(flags & SC_UPDATING)) {
-		for (s = ch + 2; *s == '-'; s++) {}
-		if (!*s)
-			return;
+	for (j = 0; j < flist->count; j++) {
+		struct file_struct *file = flist->files[j];
+
+		if (!(file->flags & FLAG_DEL_HERE))
+			continue;
+
+		f_name_to(file, fbuf);
+		if (verbose > 1 && file->flags & FLAG_TOP_DIR)
+			rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
+
+		delete_in_dir(flist, fbuf, file);
 	}
+}
+
+static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
+{
+	if (preserve_perms
+	 && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
+		return 0;
+
+	if (am_root && preserve_uid && st->st_uid != file->uid)
+		return 0;
+
+	if (preserve_gid && file->gid != GID_NONE && st->st_gid != file->gid)
+		return 0;
 
-    print_it:
-	rprintf(FINFO, "%s %s%s%s", ch, safe_fname(fname),
-		ch[1] == 'd' ? "/" : "",
-		flags & SC_SKIP_NL ? "" : "\n");
+	return 1;
+}
+
+
+void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
+	     int32 iflags, uchar fnamecmp_type, char *xname)
+{
+	if (statret == 0) {
+		if (S_ISREG(file->mode) && file->length != st->st_size)
+			iflags |= ITEM_REPORT_SIZE;
+		if (!(iflags & ITEM_NO_DEST_AND_NO_UPDATE)) {
+			int keep_time = !preserve_times ? 0
+			    : S_ISDIR(file->mode) ? !omit_dir_times
+			    : !S_ISLNK(file->mode);
+
+			if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time)
+			    || (keep_time && file->modtime != st->st_mtime))
+				iflags |= ITEM_REPORT_TIME;
+			if (preserve_perms && file->mode != st->st_mode)
+				iflags |= ITEM_REPORT_PERMS;
+			if (preserve_uid && am_root && file->uid != st->st_uid)
+				iflags |= ITEM_REPORT_OWNER;
+			if (preserve_gid && file->gid != GID_NONE
+			    && st->st_gid != file->gid)
+				iflags |= ITEM_REPORT_GROUP;
+		}
+	} else
+		iflags |= ITEM_IS_NEW;
+
+	iflags &= 0xffff;
+	if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
+	  || (xname && *xname)) && !read_batch) {
+		if (protocol_version >= 29) {
+			if (ndx >= 0)
+				write_int(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));
+		} else if (ndx >= 0)
+			log_item(file, &stats, iflags, xname);
+	}
 }
 
 
@@ -164,7 +384,7 @@ static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  * The block size is a rounded square root of file length.
  *
  * The checksum size is determined according to:
- *     blocksum_bits = BLOCKSUM_EXP + 2*log2(file_len) - log2(block_len)
+ *     blocksum_bits = BLOCKSUM_BIAS + 2*log2(file_len) - log2(block_len)
  * provided by Donovan Baarda which gives a probability of rsync
  * algorithm corrupting data and falling back using the whole md4
  * checksums.
@@ -332,8 +552,26 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 	return lowest_j;
 }
 
+void check_for_finished_hlinks(int itemizing, enum logcode code)
+{
+	struct file_struct *file;
+	int ndx;
 
-/* Acts on flist->file's ndx'th item, whose name is fname.  If a directory,
+	while ((ndx = get_hlink_num()) != -1) {
+		if (ndx < 0 || ndx >= the_file_list->count)
+			continue;
+
+		file = the_file_list->files[ndx];
+		if (!file->link_u.links)
+			continue;
+
+		hard_link_cluster(file, ndx, itemizing, code);
+	}
+}
+
+static int phase = 0;
+
+/* Acts on the_file_list->file's ndx'th item, 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
@@ -341,11 +579,11 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
  *
  * 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_list *flist,
-			   struct file_struct *file, int ndx,
-			   int f_out, int f_out_name)
+static void recv_generator(char *fname, struct file_struct *file, int ndx,
+			   int itemizing, int maybe_PERMS_REPORT,
+			   enum logcode code, int f_out)
 {
-	static int missing_below = -1;
+	static int missing_below = -1, excluded_below = -1;
 	static char *fuzzy_dirname = NULL;
 	static struct file_list *fuzzy_dirlist = NULL;
 	struct file_struct *fuzzy_file = NULL;
@@ -378,14 +616,24 @@ static void recv_generator(char *fname, struct file_list *flist,
 			safe_fname(fname), ndx);
 	}
 
-	if (server_filter_list.head
-	    && check_filter(&server_filter_list, fname,
-			    S_ISDIR(file->mode)) < 0) {
-		if (verbose) {
-			rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
-				safe_fname(fname));
+	if (server_filter_list.head) {
+		if (excluded_below >= 0) {
+			if (file->dir.depth > excluded_below)
+				goto skipping;
+			excluded_below = -1;
+		}
+		if (check_filter(&server_filter_list, fname,
+				 S_ISDIR(file->mode)) < 0) {
+			if (S_ISDIR(file->mode))
+				excluded_below = file->dir.depth;
+		    skipping:
+			if (verbose) {
+				rprintf(FINFO,
+					"skipping server-excluded file \"%s\"\n",
+					safe_fname(fname));
+			}
+			return;
 		}
-		return;
 	}
 
 	if (missing_below >= 0 && file->dir.depth <= missing_below) {
@@ -404,7 +652,8 @@ static void recv_generator(char *fname, struct file_list *flist,
 				if (fuzzy_dirlist)
 					flist_free(fuzzy_dirlist);
 				fuzzy_dirname = dn;
-				fuzzy_dirlist = get_dirlist(fuzzy_dirname, 1);
+				fuzzy_dirlist = get_dirlist(fuzzy_dirname, -1,
+							    1);
 			}
 		}
 
@@ -438,15 +687,17 @@ static void recv_generator(char *fname, struct file_list *flist,
 		 * we need to delete it.  If it doesn't exist, then
 		 * (perhaps recursively) create it. */
 		if (statret == 0 && !S_ISDIR(st.st_mode)) {
-			delete_file(fname, DEL_TERSE);
+			delete_item(fname, st.st_mode, DEL_TERSE);
 			statret = -1;
 		}
 		if (dry_run && statret != 0 && missing_below < 0) {
 			missing_below = file->dir.depth;
 			dry_run++;
 		}
-		if (itemize_changes && f_out != -1)
-			showchg(fname, file, statret, &st, 0);
+		if (itemizing && f_out != -1) {
+			itemize(file, ndx, statret, &st,
+				statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
+		}
 		if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
 			if (!relative_paths || errno != ENOENT
 			    || create_directory_path(fname, orig_umask) < 0
@@ -457,14 +708,14 @@ static void recv_generator(char *fname, struct file_list *flist,
 			}
 		}
 		if (set_perms(fname, file, statret ? NULL : &st, 0)
-		    && verbose && f_out != -1 && !itemize_changes)
-			rprintf(FINFO, "%s/\n", safe_fname(fname));
-		if (delete_during && f_out != -1 && csum_length != SUM_LENGTH
+		    && verbose && code && f_out != -1)
+			rprintf(code, "%s/\n", safe_fname(fname));
+		if (delete_during && f_out != -1 && !phase && dry_run < 2
 		    && (file->flags & FLAG_DEL_HERE))
-			delete_in_dir(flist, fname, file);
+			delete_in_dir(the_file_list, fname, file);
 		return;
 	}
-	
+
 	if (max_size && file->length > max_size) {
 		if (verbose > 1) {
 			rprintf(FINFO, "%s is over max-size\n",
@@ -485,42 +736,51 @@ static void recv_generator(char *fname, struct file_list *flist,
 			return;
 		}
 		if (statret == 0) {
-			int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
 			char lnk[MAXPATHLEN];
 			int len;
 
-			if (!dflag
+			if (!S_ISDIR(st.st_mode)
 			    && (len = readlink(fname, lnk, MAXPATHLEN-1)) > 0) {
 				lnk[len] = 0;
 				/* A link already pointing to the
 				 * right place -- no further action
 				 * required. */
 				if (strcmp(lnk, file->u.link) == 0) {
-					if (itemize_changes)
-						showchg(fname, file, 0, &st, 0);
+					if (itemizing) {
+						itemize(file, ndx, 0, &st, 0,
+							0, NULL);
+					}
 					set_perms(fname, file, &st,
-						  PERMS_REPORT);
+						  maybe_PERMS_REPORT);
 					return;
 				}
 			}
 			/* Not the right symlink (or not a symlink), so
 			 * delete it. */
-			delete_file(fname, dflag | DEL_TERSE);
+			if (S_ISLNK(st.st_mode))
+				delete_item(fname, st.st_mode, DEL_TERSE);
+			else {
+				delete_item(fname, st.st_mode, DEL_TERSE);
+				statret = -1;
+			}
 		}
 		if (do_symlink(file->u.link,fname) != 0) {
 			rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
 				full_fname(fname), safe_fname(file->u.link));
 		} else {
 			set_perms(fname,file,NULL,0);
-			if (itemize_changes) {
-				showchg(fname, file, statret, &st,
-					SC_UPDATING
-					| (verbose ? SC_SKIP_NL : 0));
+			if (itemizing) {
+				itemize(file, ndx, statret, &st,
+					ITEM_LOCAL_CHANGE, 0, NULL);
 			}
-			if (verbose) {
-				rprintf(FINFO, "%s -> %s\n",
-				    itemize_changes ? "" : safe_fname(fname),
-				    safe_fname(file->u.link));
+			if (code && verbose) {
+				rprintf(code, "%s -> %s\n", safe_fname(fname),
+					safe_fname(file->u.link));
+			}
+			if (remove_sent_files && !dry_run) {
+				char numbuf[4];
+				SIVAL(numbuf, 0, ndx);
+				send_msg(MSG_SUCCESS, numbuf, 4);
 			}
 		}
 #endif
@@ -531,10 +791,9 @@ static void recv_generator(char *fname, struct file_list *flist,
 		if (statret != 0 ||
 		    st.st_mode != file->mode ||
 		    st.st_rdev != file->u.rdev) {
-			int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
-			if (itemize_changes)
-				showchg(fname, file, statret, &st, SC_UPDATING);
-			delete_file(fname, dflag | DEL_TERSE);
+			delete_item(fname, st.st_mode, DEL_TERSE);
+			if (!IS_DEVICE(st.st_mode))
+				statret = -1;
 			if (verbose > 2) {
 				rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
 					safe_fname(fname),
@@ -545,20 +804,24 @@ static void recv_generator(char *fname, struct file_list *flist,
 					full_fname(fname));
 			} else {
 				set_perms(fname,file,NULL,0);
-				if (verbose && !itemize_changes) {
-					rprintf(FINFO, "%s\n",
+				if (itemizing) {
+					itemize(file, ndx, statret, &st,
+						ITEM_LOCAL_CHANGE, 0, NULL);
+				}
+				if (code && verbose) {
+					rprintf(code, "%s\n",
 						safe_fname(fname));
 				}
 			}
 		} else {
-			if (itemize_changes)
-				showchg(fname, file, statret, &st, 0);
-			set_perms(fname, file, &st, PERMS_REPORT);
+			if (itemizing)
+				itemize(file, ndx, statret, &st, 0, 0, NULL);
+			set_perms(fname, file, &st, maybe_PERMS_REPORT);
 		}
 		return;
 	}
 
-	if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
+	if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER))
 		return;
 
 	if (!S_ISREG(file->mode)) {
@@ -567,58 +830,80 @@ static void recv_generator(char *fname, struct file_list *flist,
 		return;
 	}
 
+	if (opt_ignore_existing && statret == 0) {
+		if (verbose > 1)
+			rprintf(FINFO, "%s exists\n", safe_fname(fname));
+		return;
+	}
+
+	if (update_only && statret == 0
+	    && cmp_modtime(st.st_mtime, file->modtime) > 0) {
+		if (verbose > 1)
+			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
+		return;
+	}
+
 	fnamecmp = fname;
 	fnamecmp_type = FNAMECMP_FNAME;
 
 	if (statret != 0 && basis_dir[0] != NULL) {
-		int fallback_match = -1;
+		int best_match = -1;
 		int match_level = 0;
 		int i = 0;
 		do {
 			pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
 				 basis_dir[i], fname);
-			if (link_stat(fnamecmpbuf, &st, 0) == 0
-			    && S_ISREG(st.st_mode)) {
-				statret = 0;
-				if (link_dest) {
-					if (!match_level) {
-						fallback_match = i;
-						match_level = 1;
-					} else if (match_level == 2
-					    && !unchanged_attrs(file, &st))
-						continue;
-					if (!unchanged_file(fnamecmpbuf, file, &st))
-						continue;
-					fallback_match = i;
-					match_level = 2;
-					if (!unchanged_attrs(file, &st))
-						continue;
-				}
+			if (link_stat(fnamecmpbuf, &st, 0) < 0
+			    || !S_ISREG(st.st_mode))
+				continue;
+			switch (match_level) {
+			case 0:
+				best_match = i;
+				match_level = 1;
+				/* FALL THROUGH */
+			case 1:
+				if (!unchanged_file(fnamecmpbuf, file, &st))
+					continue;
+				best_match = i;
+				match_level = 2;
+				/* FALL THROUGH */
+			case 2:
+				if (!unchanged_attrs(file, &st))
+					continue;
+				best_match = i;
 				match_level = 3;
 				break;
 			}
+			break;
 		} while (basis_dir[++i] != NULL);
-		if (statret == 0) {
-			if (match_level < 3) {
-				i = fallback_match;
+		if (match_level) {
+			statret = 0;
+			if (i != best_match) {
+				i = best_match;
 				pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
 					 basis_dir[i], fname);
+				if (link_stat(fnamecmpbuf, &st, 0) < 0) {
+					match_level = 0;
+					statret = -1;
+					stat_errno = errno;
+				}
 			}
 #ifdef HAVE_LINK
-			if (link_dest && match_level == 3 && !dry_run) {
-				if (do_link(fnamecmpbuf, fname) < 0) {
-					if (verbose) {
-						rsyserr(FINFO, errno,
-							"link %s => %s",
-							full_fname(fnamecmpbuf),
-							safe_fname(fname));
-					}
-					fnamecmp = fnamecmpbuf;
-					fnamecmp_type = i;
+			if (link_dest && match_level == 3) {
+				if (hard_link_one(file, ndx, fname, -1, &st,
+						  fnamecmpbuf, 1,
+						  itemizing && verbose > 1,
+						  code) == 0)
+					return;
+				if (verbose) {
+					rsyserr(FINFO, errno, "link %s => %s",
+						full_fname(fnamecmpbuf),
+						safe_fname(fname));
 				}
-			} else
+				match_level = 2;
+			}
 #endif
-			{
+			if (compare_dest || (match_level && match_level < 3)) {
 				fnamecmp = fnamecmpbuf;
 				fnamecmp_type = i;
 			}
@@ -626,8 +911,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 	}
 
 	if (statret == 0 && !S_ISREG(st.st_mode)) {
-		int dflag = S_ISDIR(st.st_mode) ? DEL_DIR : 0;
-		if (delete_file(fname, dflag | DEL_TERSE) != 0)
+		if (delete_item(fname, st.st_mode, DEL_TERSE) != 0)
 			return;
 		statret = -1;
 		stat_errno = ENOENT;
@@ -660,7 +944,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 	}
 
 	if (statret != 0) {
-		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+		if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
 			return;
 		if (stat_errno == ENOENT)
 			goto notify_others;
@@ -672,32 +956,25 @@ static void recv_generator(char *fname, struct file_list *flist,
 		return;
 	}
 
-	if (opt_ignore_existing && fnamecmp_type == FNAMECMP_FNAME) {
-		if (verbose > 1)
-			rprintf(FINFO, "%s exists\n", safe_fname(fname));
-		return;
-	}
-
-	if (update_only && fnamecmp_type == FNAMECMP_FNAME
-	    && cmp_modtime(st.st_mtime, file->modtime) > 0) {
-		if (verbose > 1)
-			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
-		return;
-	}
-
 	if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
 		;
 	else if (fnamecmp_type == FNAMECMP_FUZZY)
 		;
 	else if (unchanged_file(fnamecmp, file, &st)) {
-		if (itemize_changes) {
-			showchg(fname, file, statret, &st,
-				fnamecmp_type == FNAMECMP_FNAME ? 0
-				: SC_NO_DEST_AND_NO_UPDATE);
+		if (fnamecmp_type == FNAMECMP_FNAME) {
+			if (itemizing)
+				itemize(file, ndx, statret, &st, 0, 0, NULL);
+			set_perms(fname, file, &st, maybe_PERMS_REPORT);
+			if (preserve_hard_links && file->link_u.links)
+				hard_link_cluster(file, ndx, itemizing, code);
+			return;
+		}
+		/* Only --compare-dest gets here. */
+		if (unchanged_attrs(file, &st)) {
+			itemize(file, ndx, statret, &st,
+				ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
+			return;
 		}
-		if (fnamecmp_type == FNAMECMP_FNAME)
-			set_perms(fname, file, &st, PERMS_REPORT);
-		return;
 	}
 
 prepare_to_open:
@@ -708,13 +985,8 @@ prepare_to_open:
 		statret = 0;
 	}
 
-	if (dry_run || read_batch)
-		goto notify_others;
-	if (whole_file > 0) {
-		if (statret == 0)
-			statret = 1;
+	if (dry_run || read_batch || whole_file)
 		goto notify_others;
-	}
 
 	if (fuzzy_basis) {
 		int j = flist_find(fuzzy_dirlist, file);
@@ -730,13 +1002,13 @@ prepare_to_open:
 			full_fname(fnamecmp));
 	    pretend_missing:
 		/* pretend the file didn't exist */
-		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
+		if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
 			return;
 		statret = -1;
 		goto notify_others;
 	}
 
-	if (inplace && make_backups) {
+	if (inplace && make_backups && fnamecmp_type == FNAMECMP_FNAME) {
 		if (!(backupptr = get_backup_name(fname))) {
 			close(fd);
 			return;
@@ -773,102 +1045,130 @@ prepare_to_open:
 
 notify_others:
 	write_int(f_out, ndx);
-	if (protocol_version >= 29 && inplace && !read_batch)
-		write_byte(f_out, fnamecmp_type);
-	if (f_out_name >= 0) {
-		write_byte(f_out_name, fnamecmp_type);
-		if (fnamecmp_type == FNAMECMP_FUZZY) {
-			uchar lenbuf[3], *lb = lenbuf;
-			int len = strlen(fuzzy_file->basename);
-			if (len > 0x7F) {
-#if MAXPATHLEN > 0x7FFF
-				*lb++ = len / 0x10000 + 0x80;
-				*lb++ = len / 0x100;
-#else
-				*lb++ = len / 0x100 + 0x80;
-#endif
-			}
-			*lb = len;
-			write_buf(f_out_name, lenbuf, lb - lenbuf + 1);
-			write_buf(f_out_name, fuzzy_file->basename, len);
-		}
+	if (itemizing) {
+		int iflags = ITEM_TRANSFER;
+		if (always_checksum)
+			iflags |= ITEM_REPORT_CHECKSUM;
+		if (fnamecmp_type != FNAMECMP_FNAME)
+			iflags |= ITEM_BASIS_TYPE_FOLLOWS;
+		if (fnamecmp_type == FNAMECMP_FUZZY)
+			iflags |= ITEM_XNAME_FOLLOWS;
+		itemize(file, -1, statret, &st, iflags, fnamecmp_type,
+			fuzzy_file ? fuzzy_file->basename : NULL);
 	}
-	if (itemize_changes) {
-		showchg(fname, file, statret, &st,
-			(always_checksum ? SC_CHECKSUM_CHANGED : 0)
-			| SC_UPDATING);
+
+	if (dry_run) {
+		if (preserve_hard_links && file->link_u.links)
+			hard_link_cluster(file, ndx, itemizing, code);
+		return;
 	}
+	if (read_batch)
+		return;
 
-	if (dry_run || read_batch)
+	if (statret != 0 || whole_file) {
+		write_sum_head(f_out, NULL);
 		return;
+	}
 
-	if (statret == 0) {
-		generate_and_send_sums(fd, st.st_size, f_out, f_copy);
-
-		if (f_copy >= 0) {
-			close(f_copy);
-			set_perms(backupptr, back_file, NULL, 0);
-			if (verbose > 1) {
-				rprintf(FINFO, "backed up %s to %s\n",
-					safe_fname(fname), safe_fname(backupptr));
-			}
-			free(back_file);
+	generate_and_send_sums(fd, st.st_size, f_out, f_copy);
+
+	if (f_copy >= 0) {
+		close(f_copy);
+		set_perms(backupptr, back_file, NULL, 0);
+		if (verbose > 1) {
+			rprintf(FINFO, "backed up %s to %s\n",
+				safe_fname(fname), safe_fname(backupptr));
 		}
+		free(back_file);
+	}
 
-		close(fd);
-	} else
-		write_sum_head(f_out, NULL);
+	close(fd);
 }
 
 
-void generate_files(int f_out, struct file_list *flist, char *local_name,
-		    int f_out_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name)
 {
-	int i;
-	int phase = 0;
+	int i, lull_mod;
 	char fbuf[MAXPATHLEN];
+	int itemizing, maybe_PERMS_REPORT;
+	enum logcode code;
 	int need_retouch_dir_times = preserve_times && !omit_dir_times;
 	int need_retouch_dir_perms = 0;
 	int save_only_existing = only_existing;
 	int save_opt_ignore_existing = opt_ignore_existing;
 
+	allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
+	lull_mod = allowed_lull * 5;
+
+	if (protocol_version >= 29) {
+		itemizing = 1;
+		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
+		code = daemon_log_format_has_i ? 0 : FLOG;
+	} else if (am_daemon) {
+		itemizing = daemon_log_format_has_i && !dry_run;
+		maybe_PERMS_REPORT = PERMS_REPORT;
+		code = itemizing || dry_run ? FCLIENT : FINFO;
+	} else if (!am_server) {
+		itemizing = log_format_has_i;
+		maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
+		code = itemizing ? 0 : FINFO;
+	} else {
+		itemizing = 0;
+		maybe_PERMS_REPORT = PERMS_REPORT;
+		code = FINFO;
+	}
+
 	if (verbose > 2) {
 		rprintf(FINFO, "generator starting pid=%ld count=%d\n",
 			(long)getpid(), flist->count);
 	}
 
+	if (delete_before && !local_name && flist->count > 0)
+		do_delete_pass(flist);
+
+	if (whole_file < 0)
+		whole_file = 0;
 	if (verbose >= 2) {
-		rprintf(FINFO,
-			whole_file > 0
-			? "delta-transmission disabled for local transfer or --whole-file\n"
-			: "delta transmission enabled\n");
+		rprintf(FINFO, "delta-transmission %s\n",
+			whole_file
+			? "disabled for local transfer or --whole-file"
+			: "enabled");
 	}
 
-	/* We expect to just sit around now, so don't exit on a timeout.
-	 * If we really get a timeout then the other process should exit. */
-	io_timeout = 0;
+	if (protocol_version < 29)
+		ignore_timeout = 1;
 
 	for (i = 0; i < flist->count; i++) {
 		struct file_struct *file = flist->files[i];
-		struct file_struct copy;
 
 		if (!file->basename)
 			continue;
 
+		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
+			       file, i, itemizing, maybe_PERMS_REPORT, code,
+			       f_out);
+
 		/* We need to ensure that any dirs we create have writeable
 		 * permissions during the time we are putting files within
 		 * them.  This is then fixed after the transfer is done. */
 		if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) {
-			copy = *file;
-			copy.mode |= S_IWUSR; /* user write */
-			file = &copy;
+			int mode = file->mode | S_IWUSR; /* user write */
+			char *fname = local_name ? local_name : fbuf;
+			if (do_chmod(fname, mode & CHMOD_BITS) < 0) {
+				rsyserr(FERROR, errno,
+					"failed to modify permissions on %s",
+					full_fname(fname));
+			}
 			need_retouch_dir_perms = 1;
 		}
 
-		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       flist, file, i, f_out, f_out_name);
+		if (preserve_hard_links)
+			check_for_finished_hlinks(itemizing, code);
+
+		if (allowed_lull && !(i % lull_mod))
+			maybe_send_keepalive();
 	}
-	recv_generator(NULL, NULL, NULL, 0, -1, -1);
+	recv_generator(NULL, NULL, 0, 0, 0, code, -1);
 	if (delete_during)
 		delete_in_dir(NULL, NULL, NULL);
 
@@ -877,6 +1177,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	only_existing = max_size = opt_ignore_existing = 0;
 	update_only = always_checksum = size_only = 0;
 	ignore_times = 1;
+	make_backups = 0; /* avoid a duplicate backup for inplace processing */
+
+	/* We expect to just sit around now, so don't exit on a timeout.
+	 * If we really get a timeout then the other process should exit. */
+	ignore_timeout = 1;
 
 	if (verbose > 2)
 		rprintf(FINFO,"generate_files phase=%d\n",phase);
@@ -885,10 +1190,11 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 
 	/* files can cycle through the system more than once
 	 * to catch initial checksum errors */
-	while ((i = get_redo_num()) != -1) {
+	while ((i = get_redo_num(itemizing, code)) != -1) {
 		struct file_struct *file = flist->files[i];
 		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
-			       flist, file, i, f_out, f_out_name);
+			       file, i, itemizing, maybe_PERMS_REPORT, code,
+			       f_out);
 	}
 
 	phase++;
@@ -901,13 +1207,14 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	write_int(f_out, -1);
 
 	/* Read post-redo-phase MSG_DONE and any prior messages. */
-	get_redo_num();
+	get_redo_num(itemizing, code);
 
-	if (preserve_hard_links)
-		do_hard_links();
+	if (delete_after && !local_name && flist->count > 0)
+		do_delete_pass(flist);
 
 	if ((need_retouch_dir_perms || need_retouch_dir_times)
 	    && !list_only && !local_name && !dry_run) {
+		int j = 0;
 		/* Now we need to fix any directory permissions that were
 		 * modified during the transfer and/or re-set any tweaked
 		 * modified-time values. */
@@ -918,10 +1225,20 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 			if (!need_retouch_dir_times && file->mode & S_IWUSR)
 				continue;
 			recv_generator(local_name ? local_name : f_name(file),
-				       flist, file, i, -1, -1);
+				       file, i, itemizing, maybe_PERMS_REPORT,
+				       code, -1);
+			if (allowed_lull && !(j++ % lull_mod))
+				maybe_send_keepalive();
 		}
 	}
-	recv_generator(NULL, NULL, NULL, 0, -1, -1);
+	recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+
+	if (max_delete > 0 && deletion_count > max_delete) {
+		rprintf(FINFO,
+			"Deletions stopped due to --max-delete limit (%d skipped)\n",
+			deletion_count - max_delete);
+		io_error |= IOERR_DEL_LIMIT;
+	}
 
 	if (verbose > 2)
 		rprintf(FINFO,"generate_files finished\n");