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
Decided that we don't need to limit the block size after all now
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
68a996e
..
9c78e64
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-79,15
+79,6
@@
static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
- char fnamecmpdest[MAXPATHLEN];
-
- if (compare_dest != NULL) {
- if (access(fname, 0) != 0) {
- pathjoin(fnamecmpdest, sizeof fnamecmpdest,
- compare_dest, fname);
- fname = fnamecmpdest;
- }
- }
file_checksum(fname,sum,st->st_size);
return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
: MD4_SUM_LENGTH) == 0;
file_checksum(fname,sum,st->st_size);
return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
: MD4_SUM_LENGTH) == 0;
@@
-163,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);
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
- blength = MIN(blength, MAX_MAP_SIZE);
}
if (protocol_version < 27) {
}
if (protocol_version < 27) {
@@
-218,7
+208,7
@@
static void generate_and_send_sums(int fd, OFF_T len, int f_out)
sum_sizes_sqroot(&sum, len);
if (len > 0)
sum_sizes_sqroot(&sum, len);
if (len > 0)
- mapbuf = map_file(fd, len, sum.blength);
+ mapbuf = map_file(fd, len,
MAX_MAP_SIZE,
sum.blength);
else
mapbuf = NULL;
else
mapbuf = NULL;
@@
-480,7
+470,7
@@
static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
return;
}
- if (skip_file(fname, file, &st)) {
+ if (skip_file(fname
cmp
, file, &st)) {
if (fnamecmp == fname)
set_perms(fname, file, &st, PERMS_REPORT);
return;
if (fnamecmp == fname)
set_perms(fname, file, &st, PERMS_REPORT);
return;