summaryrefslogtreecommitdiff
path: root/generator.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2004-07-29 16:45:48 +0000
committerWayne Davison <wayned@samba.org>2004-07-29 16:45:48 +0000
commit065a6052705d6a1f5405d863d1680b2201485908 (patch)
tree2a635ca455a352f507a3d870b5e549eb44a42c89 /generator.c
parenta7260c403733b10e3d25abf334441f3ed4cc3b91 (diff)
downloadrsync-065a6052705d6a1f5405d863d1680b2201485908.tar.gz
Got rid of bogus compare_dest scan in skip_file() -- it must checksum
the same file that we used for the stat() (in the parent routine).
Diffstat (limited to 'generator.c')
-rw-r--r--generator.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/generator.c b/generator.c
index 68a996e2..8a73420d 100644
--- 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];
- 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;
@@ -480,7 +471,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
return;
}
- if (skip_file(fname, file, &st)) {
+ if (skip_file(fnamecmp, file, &st)) {
if (fnamecmp == fname)
set_perms(fname, file, &st, PERMS_REPORT);
return;