X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e7c67065c060d500eba8d073da9568db2c658aad..91f4b31fe1031adc3ec3e3066534c9d6be979d21:/generator.c

diff --git a/generator.c b/generator.c
index 26970cea..1860b0d1 100644
--- a/generator.c
+++ b/generator.c
@@ -50,6 +50,8 @@ extern int delete_before;
 extern int delete_during;
 extern int delete_after;
 extern int module_id;
+extern int sanitize_paths;
+extern int startdir_depth;
 extern int ignore_errors;
 extern int remove_sent_files;
 extern int delay_updates;
@@ -606,10 +608,16 @@ 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)
 {
+	int save_ignore_times = ignore_times;
+	int save_size_only = size_only;
 	int best_match = -1;
 	int match_level = 0;
 	int j = 0;
 
+	/* We can't let these send-affecting options affect our checking
+	 * for identical files in the alternate basis dirs. */
+	ignore_times = size_only = 0;
+
 	do {
 		pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
 		if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode))
@@ -628,7 +636,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		case 2:
 			if (!unchanged_attrs(file, stp))
 				continue;
-			if ((always_checksum || ignore_times)
+			if (always_checksum
 			 && cmp_time(stp->st_mtime, file->modtime))
 				continue;
 			best_match = j;
@@ -638,6 +646,9 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
 		break;
 	} while (basis_dir[++j] != NULL);
 
+	ignore_times = save_ignore_times;
+	size_only = save_size_only;
+
 	if (!match_level)
 		return -1;
 
@@ -944,6 +955,10 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			}
 			return;
 		}
+		if (sanitize_paths) {
+			sanitize_path(file->u.link, file->u.link, "",
+				      startdir_depth + file->dir.depth - 1);
+		}
 		if (statret == 0) {
 			char lnk[MAXPATHLEN];
 			int len;