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

diff --git a/generator.c b/generator.c
index 26970cea..d8863d7c 100644
--- a/generator.c
+++ b/generator.c
@@ -606,10 +606,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 +634,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 +644,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;
 
@@ -731,7 +740,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		} else {
 			rprintf(FERROR,
 				"internal: try_dests_non() called with invalid mode (%o)\n",
-				file->mode);
+				(int)file->mode);
 			exit_cleanup(RERR_UNSUPPORTED);
 		}
 		if (link_dest
@@ -742,7 +751,10 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
 		 && !IS_SPECIAL(file->mode) && !IS_DEVICE(file->mode)
 #endif
 		) {
-			if (do_link(fnamebuf, fname) < 0) {
+#ifdef SUPPORT_HARD_LINKS
+			if (do_link(fnamebuf, fname) < 0) 
+#endif
+			{
 				rsyserr(FERROR, errno,
 					"failed to hard-link %s with %s",
 					fnamebuf, fname);
@@ -848,7 +860,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		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
+			 && safe_stat(dn, &st) < 0
 			 && create_directory_path(fname) < 0) {
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",