From d6631cf3a5287c66b61691557305c486dcb74cae Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 15 Jan 2004 08:56:33 +0000 Subject: [PATCH] If we're a daemon talking with a pre-28 protocol, use FERROR for a vanished-file message (not FINFO). --- sender.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sender.c b/sender.c index 1d9a132b..da51cb4c 100644 --- a/sender.c +++ b/sender.c @@ -25,6 +25,8 @@ extern struct stats stats; extern int io_error; extern int dry_run; extern int am_server; +extern int am_daemon; +extern int protocol_version; /** @@ -36,8 +38,6 @@ extern int am_server; **/ void read_sum_head(int f, struct sum_struct *sum) { - extern int protocol_version; - sum->count = read_int(f); sum->blength = read_int(f); if (protocol_version < 27) { @@ -198,8 +198,11 @@ void send_files(struct file_list *flist, int f_out, int f_in) fd = do_open(fname, O_RDONLY, 0); if (fd == -1) { if (errno == ENOENT) { + enum logcode c = am_daemon + && protocol_version < 28 ? FERROR + : FINFO; io_error |= IOERR_VANISHED; - rprintf(FINFO, "file has vanished: %s\n", + rprintf(c, "file has vanished: %s\n", full_fname(fname)); } else { io_error |= IOERR_GENERAL; -- 2.34.1