X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/af77cc6b57c37115e1442a0662320956aadc3b9b..cb13abfed024d0320c0aa865ad652c946321df3c:/log.c diff --git a/log.c b/log.c index 86da03a7..62394090 100644 --- a/log.c +++ b/log.c @@ -87,8 +87,11 @@ void log_open(void) int len; FILE *f=NULL; extern int am_daemon; + extern int quiet; /* recursion can happen with certain fatal conditions */ + if (quiet != 0 && fd == FINFO) return; + va_start(ap, format); len = vslprintf(buf, sizeof(buf), format, ap); va_end(ap); @@ -289,9 +292,9 @@ void log_recv(struct file_struct *file, struct stats *initial_stats) extern char *log_format; if (lp_transfer_logging(module_id)) { - log_formatted(FLOG, lp_log_format(module_id), "send", file, initial_stats); + log_formatted(FLOG, lp_log_format(module_id), "recv", file, initial_stats); } else if (log_format && !am_server) { - log_formatted(FINFO, log_format, "send", file, initial_stats); + log_formatted(FINFO, log_format, "recv", file, initial_stats); } }