From d8169e6f6bfc312f0ecf603616fb462ff8230e9d Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 23 Apr 2005 17:48:31 +0000 Subject: [PATCH] - Call hard_link_check() with its new args. - Got rid of a duplicate error after the hard_link_one() call. --- generator.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/generator.c b/generator.c index 7e3ba7fb..3bb37497 100644 --- a/generator.c +++ b/generator.c @@ -829,7 +829,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, return; } - if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER)) + if (preserve_hard_links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_CHECK_MASTER)) return; if (!S_ISREG(file->mode)) { @@ -914,11 +916,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, itemizing && verbose > 1, code) == 0) return; - if (verbose) { - rsyserr(FINFO, errno, "link %s => %s", - full_fname(fnamecmpbuf), - safe_fname(fname)); - } match_level = 2; } #endif @@ -987,7 +984,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx, } if (statret != 0) { - if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) + if (preserve_hard_links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_SKIP)) return; if (stat_errno == ENOENT) goto notify_others; @@ -1045,7 +1044,9 @@ prepare_to_open: full_fname(fnamecmp)); pretend_missing: /* pretend the file didn't exist */ - if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP)) + if (preserve_hard_links + && hard_link_check(file, ndx, fname, statret, &st, + itemizing, code, HL_SKIP)) return; statret = real_ret = -1; goto notify_others; -- 2.34.1