From e71c1c26df8c6ca29b0c26f82d4770a8685eb509 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 2 May 2006 16:46:48 +0000 Subject: [PATCH] Fixed a problem in the --link-dest processing where -I (--ignore-times) or --size-only could adversely affect our ability to find identical files to hard-link. --- generator.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/generator.c b/generator.c index 26970cea..4c711cd5 100644 --- a/generator.c +++ b/generator.c @@ -606,10 +606,16 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, char *cmpbuf, STRUCT_STAT *stp, int itemizing, int maybe_ATTRS_REPORT, enum logcode code) { + int save_ignore_times = ignore_times; + int save_size_only = size_only; int best_match = -1; int match_level = 0; int j = 0; + /* We can't let these send-affecting options affect our checking + * for identical files in the alternate basis dirs. */ + ignore_times = size_only = 0; + do { pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname); if (link_stat(cmpbuf, stp, 0) < 0 || !S_ISREG(stp->st_mode)) @@ -628,7 +634,7 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, case 2: if (!unchanged_attrs(file, stp)) continue; - if ((always_checksum || ignore_times) + if (always_checksum && cmp_time(stp->st_mtime, file->modtime)) continue; best_match = j; @@ -638,6 +644,9 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, break; } while (basis_dir[++j] != NULL); + ignore_times = save_ignore_times; + size_only = save_size_only; + if (!match_level) return -1; -- 2.34.1