X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/363c3ece3ac7a8980d00e82c565be8e61c9250b7..c3cbcfb8ef1f8b6a6894593a7bcb5ce05e7c8edd:/generator.c

diff --git a/generator.c b/generator.c
index 9dff3449..44a7b93a 100644
--- a/generator.c
+++ b/generator.c
@@ -149,7 +149,7 @@ static int delete_item(char *fname, int mode, int flags)
 			full_fname(fname));
 		return -1;
 	}
-	flags |= DEL_FORCE_RECURSE;
+	flags |= DEL_FORCE_RECURSE; /* mark subdir dels as not "in the way" */
 
 	dlen = strlcpy(buf, fname, MAXPATHLEN);
 	save_filters = push_local_filters(buf, dlen);
@@ -299,21 +299,13 @@ static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
 }
 
 
-#define SID_UPDATING		  ITEM_UPDATING
-#define SID_REPORT_CHECKSUM	  ITEM_REPORT_CHECKSUM
-#define SID_USING_ALT_BASIS	  ITEM_USING_ALT_BASIS
-/* This flag doesn't get sent, so it must be outside 0xffff. */
-#define SID_NO_DEST_AND_NO_UPDATE (1<<16)
-
 static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st,
-		    int32 sflags, int f_out, int ndx)
+		    int32 iflags, int f_out, int ndx)
 {
-	int iflags = sflags & 0xffff;
-
 	if (statret >= 0) {
 		if (S_ISREG(file->mode) && file->length != st->st_size)
 			iflags |= ITEM_REPORT_SIZE;
-		if (!(sflags & SID_NO_DEST_AND_NO_UPDATE)) {
+		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);
@@ -332,6 +324,7 @@ static void itemize(struct file_struct *file, int statret, STRUCT_STAT *st,
 	} else
 		iflags |= ITEM_IS_NEW | ITEM_UPDATING;
 
+	iflags &= 0xffff;
 	if ((iflags || verbose > 1) && !read_batch) {
 		if (protocol_version >= 29) {
 			if (ndx >= 0)
@@ -746,7 +739,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 		} else {
 			set_perms(fname,file,NULL,0);
 			if (itemizing) {
-				itemize(file, statret, &st, SID_UPDATING,
+				itemize(file, statret, &st, ITEM_UPDATING,
 					f_out, ndx);
 			}
 			if (code && verbose) {
@@ -781,7 +774,7 @@ static void recv_generator(char *fname, struct file_list *flist,
 			} else {
 				set_perms(fname,file,NULL,0);
 				if (itemizing) {
-					itemize(file, statret, &st, SID_UPDATING,
+					itemize(file, statret, &st, ITEM_UPDATING,
 						f_out, ndx);
 				}
 				if (code && verbose) {
@@ -808,58 +801,76 @@ 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
+			    && do_link(fnamecmpbuf, fname) < 0) {
+				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;
 			}
@@ -912,33 +923,23 @@ 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 (itemizing) {
-			itemize(file, statret, &st,
-				fnamecmp_type == FNAMECMP_FNAME
-					       ? 0 : SID_NO_DEST_AND_NO_UPDATE,
+		if (fnamecmp_type == FNAMECMP_FNAME) {
+			if (itemizing)
+				itemize(file, statret, &st, 0, f_out, ndx);
+			set_perms(fname, file, &st, maybe_PERMS_REPORT);
+			return;
+		}
+		/* Only --compare-dest gets here. */
+		if (unchanged_attrs(file, &st)) {
+			itemize(file, statret, &st, ITEM_NO_DEST_AND_NO_UPDATE,
 				f_out, ndx);
+			return;
 		}
-		if (fnamecmp_type == FNAMECMP_FNAME)
-			set_perms(fname, file, &st, maybe_PERMS_REPORT);
-		return;
 	}
 
 prepare_to_open:
@@ -1015,11 +1016,11 @@ prepare_to_open:
 notify_others:
 	write_int(f_out, ndx);
 	if (itemizing) {
-		int iflags = SID_UPDATING;
+		int iflags = ITEM_UPDATING;
 		if (always_checksum)
-			iflags |= SID_REPORT_CHECKSUM;
+			iflags |= ITEM_REPORT_CHECKSUM;
 		if (fnamecmp_type != FNAMECMP_FNAME)
-			iflags |= SID_USING_ALT_BASIS;
+			iflags |= ITEM_USING_ALT_BASIS;
 		itemize(file, statret, &st, iflags, f_out, -1);
 	}
 	if (f_out_name >= 0) {
@@ -1075,7 +1076,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	int need_retouch_dir_perms = 0;
 	int save_only_existing = only_existing;
 	int save_opt_ignore_existing = opt_ignore_existing;
-	int allowed_lull = read_batch ? 0 : io_timeout / 2;
+	int allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
+	int lull_mod = allowed_lull * 5;
 
 	if (protocol_version >= 29) {
 		itemizing = 1;
@@ -1134,7 +1136,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 			       flist, file, i, itemizing, maybe_PERMS_REPORT,
 			       code, allowed_lull, f_out, f_out_name);
 
-		if (allowed_lull && !(i % 100))
+		if (allowed_lull && !(i % lull_mod))
 			maybe_send_keepalive(allowed_lull, flist->count);
 	}
 	recv_generator(NULL, NULL, NULL, 0, 0, 0, code, 0, -1, -1);
@@ -1146,6 +1148,7 @@ 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. */
@@ -1163,8 +1166,6 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 		recv_generator(local_name ? local_name : f_name_to(file, fbuf),
 			       flist, file, i, itemizing, maybe_PERMS_REPORT,
 			       code, allowed_lull, f_out, f_out_name);
-		if (allowed_lull)
-			maybe_send_keepalive(allowed_lull, flist->count);
 	}
 
 	phase++;
@@ -1180,13 +1181,14 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 	get_redo_num();
 
 	if (preserve_hard_links)
-		do_hard_links();
+		do_hard_links(allowed_lull, flist->count);
 
 	if (delete_after && !local_name && flist->count > 0)
 		do_delete_pass(flist, allowed_lull);
 
 	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. */
@@ -1200,6 +1202,8 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 				       flist, file, i, itemizing,
 				       maybe_PERMS_REPORT, code, allowed_lull,
 				       -1, -1);
+			if (allowed_lull && !(j++ % lull_mod))
+				maybe_send_keepalive(allowed_lull, flist->count);
 		}
 	}
 	recv_generator(NULL, NULL, NULL, 0, 0, 0, code, 0, -1, -1);