X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/96d910c770b9443e204e183d3f3a8720c346a79c..89f7eff382de3b817d6dc34969d4b37a386aca6d:/generator.c

diff --git a/generator.c b/generator.c
index 04975b6c..1adb7a71 100644
--- a/generator.c
+++ b/generator.c
@@ -154,7 +154,6 @@ static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
 			c >>= 1;
 		} while (c >= 8);	/* round to multiple of 8 */
 		blength = MAX(blength, BLOCK_SIZE);
-		blength = MIN(blength, MAX_BLOCK_SIZE);
 	}
 
 	if (protocol_version < 27) {
@@ -253,9 +252,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 			   int f_out)
 {
 	int fd;
-	STRUCT_STAT st;
+	STRUCT_STAT st, partial_st;
 	int statret, stat_errno;
-	char *fnamecmp;
+	char *fnamecmp, *partialptr = NULL;
 	char fnamecmpbuf[MAXPATHLEN];
 
 	if (list_only)
@@ -274,8 +273,14 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	statret = link_stat(fname, &st, keep_dirlinks && S_ISDIR(file->mode));
-	stat_errno = errno;
+	if (dry_run > 1) {
+		statret = -1;
+		stat_errno = ENOENT;
+	} else {
+		statret = link_stat(fname, &st,
+				    keep_dirlinks && S_ISDIR(file->mode));
+		stat_errno = errno;
+	}
 
 	if (only_existing && statret == -1 && stat_errno == ENOENT) {
 		/* we only want to update existing files */
@@ -443,6 +448,16 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		stat_errno = ENOENT;
 	}
 
+	if (partial_dir) {
+		if ((partialptr = partial_dir_fname(fname))
+		    && link_stat(partialptr, &partial_st, 0) == 0
+		    && S_ISREG(partial_st.st_mode)) {
+			if (statret == -1)
+				goto prepare_to_open;
+		} else
+			partialptr = NULL;
+	}
+
 	if (statret == -1) {
 		if (preserve_hard_links && hard_link_check(file, HL_SKIP))
 			return;
@@ -477,6 +492,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
+prepare_to_open:
 	if (dry_run || read_batch) {
 		write_int(f_out,i);
 		return;
@@ -488,14 +504,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	if (partial_dir) {
-		STRUCT_STAT st2;
-		char *partialptr = partial_dir_fname(fname);
-		if (partialptr && link_stat(partialptr, &st2, 0) == 0
-		    && S_ISREG(st2.st_mode)) {
-			st = st2;
-			fnamecmp = partialptr;
-		}
+	if (partialptr) {
+		st = partial_st;
+		fnamecmp = partialptr;
 	}
 
 	/* open the file */