From 065a6052705d6a1f5405d863d1680b2201485908 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 29 Jul 2004 16:45:48 +0000 Subject: [PATCH] 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). --- generator.c | 11 +---------- 1 file changed, 1 insertion(+), 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; -- 2.34.1