X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/11832604264e49a6399352020fefa240a881b144..30e50494bbb057d4191e4636b963c6b7b0770ece:/generator.c

diff --git a/generator.c b/generator.c
index abdbaaf8..0721790d 100644
--- a/generator.c
+++ b/generator.c
@@ -95,9 +95,12 @@ extern struct filter_list_struct server_filter_list;
 
 int ignore_perishable = 0;
 int non_perishable_cnt = 0;
+int maybe_ATTRS_REPORT = 0;
 
 static int deletion_count = 0; /* used to implement --max-delete */
-static FILE *delete_delay_fp = NULL;
+static int deldelay_size = 0, deldelay_cnt = 0;
+static char *deldelay_buf = NULL;
+static int deldelay_fd = -1;
 static BOOL solo_file = 0;
 
 /* For calling delete_item() and delete_dir_contents(). */
@@ -245,7 +248,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
 			continue;
 		}
 
-		strlcpy(p, F_BASENAME(fp), remainder);
+		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)
@@ -267,67 +270,135 @@ static enum delret delete_dir_contents(char *fname, int flags)
 	return ret;
 }
 
-static void start_delete_temp(void)
+static int start_delete_delay_temp(void)
 {
 	char fnametmp[MAXPATHLEN];
-	int fd, save_dry_run = dry_run;
+	int save_dry_run = dry_run;
 
 	dry_run = 0;
 	if (!get_tmpname(fnametmp, "deldelay")
-	 || (fd = do_mkstemp(fnametmp, 0600)) < 0
-	 || !(delete_delay_fp = fdopen(fd, "w+"))) {
-		rprintf(FERROR, "Unable to create delete-delay temp file.\n");
-		exit_cleanup(RERR_FILEIO);
+	 || (deldelay_fd = do_mkstemp(fnametmp, 0600)) < 0) {
+		rprintf(FINFO, "NOTE: Unable to create delete-delay temp file--"
+			"switching to --delete-after.\n");
+		delete_during = 0;
+		delete_after = 1;
+		dry_run = save_dry_run;
+		return 0;
 	}
-	dry_run = save_dry_run;
 	unlink(fnametmp);
+	dry_run = save_dry_run;
+	return 1;
 }
 
-static int read_delay_line(FILE *fp, char *buf, int bsize)
+static int flush_delete_delay(void)
 {
-	int ch, mode = 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;
+		close(deldelay_fd);
+		return 0;
+	}
+	deldelay_cnt = 0;
+	return 1;
+}
 
-	if ((ch = fgetc(fp)) == EOF)
-		return -1;
+static int remember_delete(struct file_struct *file, const char *fname)
+{
+	int len;
+	
+	while (1) {
+		len = snprintf(deldelay_buf + deldelay_cnt,
+			       deldelay_size - deldelay_cnt,
+			       "%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;
+	}
+
+	return 1;
+}
+
+static int read_delay_line(char *buf)
+{
+	static int read_pos = 0;
+	int j, len, mode;
+	char *bp, *past_space;
 
 	while (1) {
-		if (ch == ' ')
+		for (j = read_pos; j < deldelay_cnt && deldelay_buf[j]; j++) {}
+		if (j < deldelay_cnt)
 			break;
-		if (ch > '7' || ch < '0') {
-			rprintf(FERROR, "invalid data in delete-delay file.\n");
-			exit_cleanup(RERR_FILEIO);
+		if (deldelay_fd < 0) {
+			if (j > read_pos)
+				goto invalid_data;
+			return -1;
 		}
-		mode = mode*8 + ch - '0';
-		if ((ch = fgetc(fp)) == EOF) {
-		  unexpected_eof:
-			rprintf(FERROR, "unexpected EOF in delete-delay file.\n");
-			exit_cleanup(RERR_FILEIO);
+		deldelay_cnt -= read_pos;
+		if (deldelay_cnt == deldelay_size)
+			goto invalid_data;
+		if (deldelay_cnt && read_pos) {
+			memmove(deldelay_buf, deldelay_buf + read_pos,
+				deldelay_cnt);
 		}
+		len = read(deldelay_fd, deldelay_buf + deldelay_cnt,
+			   deldelay_size - deldelay_cnt);
+		if (len == 0) {
+			if (deldelay_cnt) {
+				rprintf(FERROR,
+				    "ERROR: unexpected EOF in delete-delay file.\n");
+			}
+			return -1;
+		}
+		if (len < 0) {
+			rsyserr(FERROR, errno,
+				"reading delete-delay file");
+			return -1;
+		}
+		deldelay_cnt += len;
+		read_pos = 0;
 	}
 
-	while (1) {
-		if ((ch = fgetc(fp)) == EOF)
-			goto unexpected_eof;
-		if (bsize-- <= 0) {
-			rprintf(FERROR, "filename too long in delete-delay file.\n");
-			exit_cleanup(RERR_FILEIO);
-		}
-		*buf++ = (char)ch;
-		if (ch == '\0')
-			break;
+	bp = deldelay_buf + read_pos;
+
+	if (sscanf(bp, "%x ", &mode) != 1) {
+	  invalid_data:
+		rprintf(FERROR, "ERROR: invalid data in delete-delay file.\n");
+		return -1;
+	}
+	past_space = strchr(bp, ' ') + 1;
+	len = j - read_pos - (past_space - bp) + 1; /* count the '\0' */
+	read_pos = j + 1;
+
+	if (len > MAXPATHLEN) {
+		rprintf(FERROR, "ERROR: filename too long in delete-delay file.\n");
+		return -1;
 	}
 
+	/* The caller needs the name in a MAXPATHLEN buffer, so we copy it
+	 * instead of returning a pointer to our buffer. */
+	memcpy(buf, past_space, len);
+
 	return mode;
 }
 
-static void delayed_deletions(char *delbuf)
+static void do_delayed_deletions(char *delbuf)
 {
 	int mode;
 
-	fseek(delete_delay_fp, 0, 0);
-	while ((mode = read_delay_line(delete_delay_fp, delbuf, MAXPATHLEN)) >= 0)
+	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);
-	fclose(delete_delay_fp);
+	if (deldelay_fd >= 0)
+		close(deldelay_fd);
 }
 
 /* This function is used to implement per-directory deletion, and is used by
@@ -359,7 +430,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 	if (allowed_lull)
 		maybe_send_keepalive();
 
-	if (file->dir.depth >= MAXPATHLEN/2+1)
+	if (F_DEPTH(file) >= MAXPATHLEN/2+1)
 		return; /* Impossible... */
 
 	if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
@@ -371,9 +442,9 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 		return;
 	}
 
-	while (cur_depth >= file->dir.depth && cur_depth >= min_depth)
+	while (cur_depth >= F_DEPTH(file) && cur_depth >= min_depth)
 		pop_local_filters(filt_array[cur_depth--]);
-	cur_depth = file->dir.depth;
+	cur_depth = F_DEPTH(file);
 	if (min_depth > cur_depth)
 		min_depth = cur_depth;
 	dlen = strlen(fbuf);
@@ -402,9 +473,10 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
 		}
 		if (flist_find(flist, fp) < 0) {
 			f_name(fp, delbuf);
-			if (delete_delay_fp)
-				fprintf(delete_delay_fp, "%o %s%c", (short)fp->mode, delbuf, '\0');
-			else
+			if (delete_during == 2) {
+				if (!remember_delete(fp, delbuf))
+					break;
+			} else
 				delete_item(delbuf, fp->mode, NULL, DEL_RECURSE);
 		}
 	}
@@ -448,8 +520,7 @@ static void do_delete_pass(struct file_list *flist)
 
 int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
 {
-	if (preserve_perms
-	 && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
+	if (preserve_perms && !BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
 		return 0;
 
 	if (am_root && preserve_uid && st->st_uid != F_UID(file))
@@ -476,7 +547,7 @@ void itemize(struct file_struct *file, int ndx, int statret, STRUCT_STAT *st,
 		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
 		 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
 			iflags |= ITEM_REPORT_TIME;
-		if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+		if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
 			iflags |= ITEM_REPORT_PERMS;
 		if (preserve_uid && am_root && F_UID(file) != st->st_uid)
 			iflags |= ITEM_REPORT_OWNER;
@@ -665,7 +736,7 @@ static void generate_and_send_sums(int fd, OFF_T len, int f_out, int f_copy)
 static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 {
 	int fname_len, fname_suf_len;
-	const char *fname_suf, *fname = F_BASENAME(file);
+	const char *fname_suf, *fname = file->basename;
 	uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
 	int j, lowest_j = -1;
 
@@ -681,7 +752,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 		if (!S_ISREG(fp->mode) || !F_LENGTH(fp) || fp->flags & FLAG_SENT)
 			continue;
 
-		name = F_BASENAME(fp);
+		name = fp->basename;
 
 		if (F_LENGTH(fp) == F_LENGTH(file)
 		    && cmp_time(fp->modtime, file->modtime) == 0) {
@@ -717,6 +788,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
 void check_for_finished_hlinks(int itemizing, enum logcode code)
 {
 	struct file_struct *file;
+	char fbuf[MAXPATHLEN];
 	int ndx;
 
 	while ((ndx = get_hlink_num()) != -1) {
@@ -727,7 +799,7 @@ void check_for_finished_hlinks(int itemizing, enum logcode code)
 		if (!F_IS_HLINKED(file))
 			continue;
 
-		hard_link_cluster(file, ndx, itemizing, code, -1);
+		finish_hard_link(file, f_name(file, fbuf), NULL, itemizing, code, -1);
 	}
 }
 #endif
@@ -737,7 +809,7 @@ void check_for_finished_hlinks(int itemizing, enum logcode code)
  * 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,
-			 int maybe_ATTRS_REPORT, enum logcode code)
+			 enum logcode code)
 {
 	int best_match = -1;
 	int match_level = 0;
@@ -784,24 +856,28 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 	if (match_level == 3 && !copy_dest) {
 #ifdef SUPPORT_HARD_LINKS
 		if (link_dest) {
-			int i = itemizing && (verbose > 1 || stdout_format_has_i > 1);
-			if (hard_link_one(file, ndx, fname, 0, stp,
-					  cmpbuf, 1, i, code) < 0)
+			if (!hard_link_one(file, fname, cmpbuf, 1))
 				goto try_a_copy;
 			if (preserve_hard_links && F_IS_HLINKED(file))
-				hard_link_cluster(file, ndx, itemizing, code, j);
+				finish_hard_link(file, fname, stp, itemizing, code, j);
+			if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+				itemize(file, ndx, 1, stp,
+					ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS,
+					0, "");
+			}
 		} else
 #endif
 		if (itemizing)
 			itemize(file, ndx, 0, stp, 0, 0, NULL);
-		if (verbose > 1 && maybe_ATTRS_REPORT) {
+		if (verbose > 1 && maybe_ATTRS_REPORT)
 			rprintf(FCLIENT, "%s is uptodate\n", fname);
-		}
 		return -2;
 	}
 
 	if (match_level >= 2) {
+#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",
@@ -821,7 +897,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))
-			hard_link_cluster(file, ndx, itemizing, code, j);
+			finish_hard_link(file, fname, stp, itemizing, code, -1);
 #endif
 		return -2;
 	}
@@ -834,13 +910,13 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
  * 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,
-			 int maybe_ATTRS_REPORT, enum logcode code)
+			 enum logcode code)
 {
 	char lnk[MAXPATHLEN];
 	int best_match = -1;
 	int match_level = 0;
-	uint32 *devp;
 	enum nonregtype type;
+	uint32 *devp;
 	int len, j = 0;
 
 #ifndef SUPPORT_LINKS
@@ -949,7 +1025,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 				return j;
 			}
 			if (preserve_hard_links && F_IS_HLINKED(file))
-				hard_link_cluster(file, ndx, itemizing, code, -1);
+				finish_hard_link(file, fname, NULL, itemizing, code, -1);
 		} else
 #endif
 			match_level = 2;
@@ -984,8 +1060,7 @@ static int phase = 0;
  * 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, int maybe_ATTRS_REPORT,
-			   enum logcode code, int f_out)
+			   int itemizing, enum logcode code, int f_out)
 {
 	static int missing_below = -1, excluded_below = -1;
 	static const char *parent_dirname = "";
@@ -1023,14 +1098,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if (server_filter_list.head) {
 		if (excluded_below >= 0) {
-			if (file->dir.depth > excluded_below)
+			if (F_DEPTH(file) > 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;
+				excluded_below = F_DEPTH(file);
 		  skipping:
 			if (verbose) {
 				rprintf(FINFO,
@@ -1042,7 +1117,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 	if (missing_below >= 0) {
-		if (file->dir.depth <= missing_below) {
+		if (F_DEPTH(file) <= missing_below) {
 			if (dry_run)
 				dry_run--;
 			missing_below = -1;
@@ -1111,7 +1186,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			statret = -1;
 		}
 		if (dry_run && statret != 0 && missing_below < 0) {
-			missing_below = file->dir.depth;
+			missing_below = F_DEPTH(file);
 			dry_run++;
 		}
 		real_ret = statret;
@@ -1123,7 +1198,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		if (statret != 0 && basis_dir[0] != NULL) {
 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-					      itemizing, maybe_ATTRS_REPORT, code);
+					      itemizing, code);
 			if (j == -2) {
 				itemizing = 0;
 				code = FNONE;
@@ -1143,10 +1218,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 					full_fname(fname));
 				file->flags |= FLAG_MISSING_DIR;
 				if (ndx+1 < the_file_list->count
-				 && the_file_list->files[ndx+1]->dir.depth > file->dir.depth) {
+				 && F_DEPTH(the_file_list->files[ndx+1]) > F_DEPTH(file)) {
 					rprintf(FERROR,
 					    "*** Skipping everything below this failed directory ***\n");
-					missing_below = file->dir.depth;
+					missing_below = F_DEPTH(file);
 				}
 				return;
 			}
@@ -1163,9 +1238,8 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	}
 
 #ifdef SUPPORT_HARD_LINKS
-	if (preserve_hard_links && F_IS_HLINKED(file)
-	    && hard_link_check(file, ndx, fname, statret, &st,
-			       itemizing, code, HL_CHECK_MASTER))
+	if (preserve_hard_links && F_HLINK_NOT_FIRST(file)
+	 && hard_link_check(file, ndx, fname, statret, &st, itemizing, code))
 		return;
 #endif
 
@@ -1196,7 +1270,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
 #ifdef SUPPORT_HARD_LINKS
 				if (preserve_hard_links && F_IS_HLINKED(file))
-					hard_link_cluster(file, ndx, itemizing, code, -1);
+					finish_hard_link(file, fname, &st, itemizing, code, -1);
 #endif
 				if (remove_source_files == 1)
 					goto return_with_success;
@@ -1208,7 +1282,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				return;
 		} else if (basis_dir[0] != NULL) {
 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-					      itemizing, maybe_ATTRS_REPORT, code);
+					      itemizing, code);
 			if (j == -2) {
 #ifndef CAN_HARDLINK_SYMLINK
 				if (link_dest) {
@@ -1223,9 +1297,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				statret = 1;
 		}
 #ifdef SUPPORT_HARD_LINKS
-		if (preserve_hard_links && F_IS_HLINKED(file)
-		    && hard_link_check(file, ndx, fname, -1, &st,
-				       itemizing, code, HL_SKIP))
+		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
 			return;
 #endif
 		if (do_symlink(sl, fname) != 0) {
@@ -1241,7 +1313,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				rprintf(code, "%s -> %s\n", fname, sl);
 #ifdef SUPPORT_HARD_LINKS
 			if (preserve_hard_links && F_IS_HLINKED(file))
-				hard_link_cluster(file, ndx, itemizing, code, -1);
+				finish_hard_link(file, fname, NULL, itemizing, code, -1);
 #endif
 			/* This does not check remove_source_files == 1
 			 * because this is one of the items that the old
@@ -1269,7 +1341,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				t = "special file";
 			}
 			if (statret == 0
-			 && (st.st_mode & ~CHMOD_BITS) == (file->mode & ~CHMOD_BITS)
+			 && BITS_EQUAL(st.st_mode, file->mode, _S_IFMT)
 			 && st.st_rdev == rdev) {
 				/* The device or special file is identical. */
 				if (itemizing)
@@ -1277,7 +1349,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
 #ifdef SUPPORT_HARD_LINKS
 				if (preserve_hard_links && F_IS_HLINKED(file))
-					hard_link_cluster(file, ndx, itemizing, code, -1);
+					finish_hard_link(file, fname, &st, itemizing, code, -1);
 #endif
 				if (remove_source_files == 1)
 					goto return_with_success;
@@ -1287,7 +1359,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				return;
 		} else if (basis_dir[0] != NULL) {
 			int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &st,
-					      itemizing, maybe_ATTRS_REPORT, code);
+					      itemizing, code);
 			if (j == -2) {
 #ifndef CAN_HARDLINK_SPECIAL
 				if (link_dest) {
@@ -1302,9 +1374,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				statret = 1;
 		}
 #ifdef SUPPORT_HARD_LINKS
-		if (preserve_hard_links && F_IS_HLINKED(file)
-		    && hard_link_check(file, ndx, fname, -1, &st,
-				       itemizing, code, HL_SKIP))
+		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
 			return;
 #endif
 		if (verbose > 2) {
@@ -1325,7 +1395,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				rprintf(code, "%s\n", fname);
 #ifdef SUPPORT_HARD_LINKS
 			if (preserve_hard_links && F_IS_HLINKED(file))
-				hard_link_cluster(file, ndx, itemizing, code, -1);
+				finish_hard_link(file, fname, NULL, itemizing, code, -1);
 #endif
 			if (remove_source_files == 1)
 				goto return_with_success;
@@ -1382,7 +1452,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if (statret != 0 && basis_dir[0] != NULL) {
 		int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
-				      itemizing, maybe_ATTRS_REPORT, code);
+				      itemizing, code);
 		if (j == -2) {
 			if (remove_source_files == 1)
 				goto return_with_success;
@@ -1424,9 +1494,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 	if (statret != 0) {
 #ifdef SUPPORT_HARD_LINKS
-		if (preserve_hard_links && F_IS_HLINKED(file)
-		    && hard_link_check(file, ndx, fname, statret, &st,
-				       itemizing, code, HL_SKIP))
+		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
 			return;
 #endif
 		if (stat_errno == ENOENT)
@@ -1448,14 +1516,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			do_unlink(partialptr);
 			handle_partial_dir(partialptr, PDIR_DELETE);
 		}
-		if (itemizing) {
-			itemize(file, ndx, real_ret, &real_st,
-				0, 0, NULL);
-		}
+		if (itemizing)
+			itemize(file, ndx, statret, &st, 0, 0, NULL);
 		set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_IS_HLINKED(file))
-			hard_link_cluster(file, ndx, itemizing, code, -1);
+			finish_hard_link(file, fname, &st, itemizing, code, -1);
 #endif
 		if (remove_source_files != 1)
 			return;
@@ -1491,9 +1557,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	  pretend_missing:
 		/* pretend the file didn't exist */
 #ifdef SUPPORT_HARD_LINKS
-		if (preserve_hard_links && F_IS_HLINKED(file)
-		    && hard_link_check(file, ndx, fname, statret, &st,
-				       itemizing, code, HL_SKIP))
+		if (preserve_hard_links && F_HLINK_NOT_LAST(file))
 			return;
 #endif
 		statret = real_ret = -1;
@@ -1538,6 +1602,10 @@ 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);
+#ifdef SUPPORT_HARD_LINKS
+	if (preserve_hard_links && F_IS_HLINKED(file))
+		file->flags |= FLAG_SENT;
+#endif
 	write_int(f_out, ndx);
 	if (itemizing) {
 		int iflags = ITEM_TRANSFER;
@@ -1548,13 +1616,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (fnamecmp_type == FNAMECMP_FUZZY)
 			iflags |= ITEM_XNAME_FOLLOWS;
 		itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
-			fuzzy_file ? F_BASENAME(fuzzy_file) : NULL);
+			fuzzy_file ? fuzzy_file->basename : NULL);
 	}
 
 	if (!do_xfers) {
 #ifdef SUPPORT_HARD_LINKS
 		if (preserve_hard_links && F_IS_HLINKED(file))
-			hard_link_cluster(file, ndx, itemizing, code, -1);
+			finish_hard_link(file, fname, &st, itemizing, code, -1);
 #endif
 		return;
 	}
@@ -1585,7 +1653,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 {
 	int i;
 	char fbuf[MAXPATHLEN];
-	int itemizing, maybe_ATTRS_REPORT;
+	int itemizing;
 	enum logcode code;
 	int lull_mod = allowed_lull * 5;
 	int need_retouch_dir_times = preserve_times && !omit_dir_times;
@@ -1622,8 +1690,12 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 
 	if (delete_before && !local_name && flist->count > 0)
 		do_delete_pass(flist);
-	if (delete_during == 2)
-		start_delete_temp();
+	if (delete_during == 2) {
+		deldelay_size = BIGPATHBUFLEN * 4;
+		deldelay_buf = new_array(char, deldelay_size);
+		if (!deldelay_buf)
+			out_of_memory("delete-delay");
+	}
 	do_progress = 0;
 
 	if (append_mode || whole_file < 0)
@@ -1651,8 +1723,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 			strlcpy(fbuf, local_name, sizeof fbuf);
 		else
 			f_name(file, fbuf);
-		recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT,
-			       code, f_out);
+		recv_generator(fbuf, file, i, itemizing, code, f_out);
 
 		/* We need to ensure that any dirs we create have writeable
 		 * permissions during the time we are putting files within
@@ -1681,7 +1752,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		else if (!(i % 200))
 			maybe_flush_socket();
 	}
-	recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+	recv_generator(NULL, NULL, 0, 0, code, -1);
 	if (delete_during)
 		delete_in_dir(NULL, NULL, NULL, NULL);
 
@@ -1707,8 +1778,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 			strlcpy(fbuf, local_name, sizeof fbuf);
 		else
 			f_name(file, fbuf);
-		recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT,
-			       code, f_out);
+		recv_generator(fbuf, file, i, itemizing, code, f_out);
 	}
 
 	phase++;
@@ -1738,8 +1808,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	}
 
 	do_progress = save_do_progress;
-	if (delete_delay_fp)
-		delayed_deletions(fbuf);
+	if (delete_during == 2)
+		do_delayed_deletions(fbuf);
 	if (delete_after && !local_name && flist->count > 0)
 		do_delete_pass(flist);
 
@@ -1755,24 +1825,24 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 			if (!need_retouch_dir_times && file->mode & S_IWUSR)
 				continue;
 			if (file->flags & FLAG_MISSING_DIR) {
-				int missing = file->dir.depth;
+				int missing = F_DEPTH(file);
 				while (++i < flist->count) {
 					file = flist->files[i];
-					if (file->dir.depth <= missing)
+					if (F_DEPTH(file) <= missing)
 						break;
 				}
 				i--;
 				continue;
 			}
 			recv_generator(f_name(file, NULL), file, i, itemizing,
-				       maybe_ATTRS_REPORT, code, -1);
+				       code, -1);
 			if (allowed_lull && !(++j % lull_mod))
 				maybe_send_keepalive();
 			else if (!(j % 200))
 				maybe_flush_socket();
 		}
 	}
-	recv_generator(NULL, NULL, 0, 0, 0, code, -1);
+	recv_generator(NULL, NULL, 0, 0, code, -1);
 
 	if (max_delete >= 0 && deletion_count > max_delete) {
 		rprintf(FINFO,