X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b9f592fbf50b0dc9e3d1d33b8deb2bf9abad9ef6..7f290d5c825e81f5e589af63f8e0d83f7eb498b0:/generator.c

diff --git a/generator.c b/generator.c
index ffd7a0d3..b431cb74 100644
--- a/generator.c
+++ b/generator.c
@@ -52,6 +52,7 @@ extern int only_existing;
 extern int orig_umask;
 extern int safe_symlinks;
 extern unsigned int block_size;
+extern unsigned int max_map_size;
 
 extern struct exclude_list_struct server_exclude_list;
 
@@ -162,7 +163,9 @@ 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_MAP_SIZE);
 	}
+	max_map_size = MAX(MAX_MAP_SIZE, blength * 32);
 
 	if (protocol_version < 27) {
 		s2length = csum_length;
@@ -327,9 +330,6 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		return;
 	}
 
-	if (read_batch)
-		return;
-
 	if (preserve_links && S_ISLNK(file->mode)) {
 #if SUPPORT_LINKS
 		char lnk[MAXPATHLEN];
@@ -398,6 +398,9 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 	}
 #endif
 
+	if (read_batch)
+		return;
+
 	if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
 		return;