Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved the read_batch abort check below the code that handles the
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
72b6905
..
b431cb7
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-165,7
+165,7
@@
static void sum_sizes_sqroot(struct sum_struct *sum, uint64 len)
blength = MAX(blength, BLOCK_SIZE);
blength = MIN(blength, MAX_MAP_SIZE);
}
blength = MAX(blength, BLOCK_SIZE);
blength = MIN(blength, MAX_MAP_SIZE);
}
- max_map_size = M
IN
(MAX_MAP_SIZE, blength * 32);
+ max_map_size = M
AX
(MAX_MAP_SIZE, blength * 32);
if (protocol_version < 27) {
s2length = csum_length;
if (protocol_version < 27) {
s2length = csum_length;
@@
-330,9
+330,6
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
return;
}
- if (read_batch)
- return;
-
if (preserve_links && S_ISLNK(file->mode)) {
#if SUPPORT_LINKS
char lnk[MAXPATHLEN];
if (preserve_links && S_ISLNK(file->mode)) {
#if SUPPORT_LINKS
char lnk[MAXPATHLEN];
@@
-401,6
+398,9
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
}
#endif
}
#endif
+ if (read_batch)
+ return;
+
if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
return;
if (preserve_hard_links && hard_link_check(file, HL_CHECK_MASTER))
return;