From 088aff1a48b52821c19578bba0e3ead41fbe0ec5 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 19 Feb 2005 17:23:08 +0000 Subject: [PATCH] - Don't log a delete message to the daemon log in dry-run mode. - The daemon's wrote/read log message now uses the terms sent/received. --- log.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/log.c b/log.c index b2c46a79..47fbf155 100644 --- a/log.c +++ b/log.c @@ -27,6 +27,7 @@ */ #include "rsync.h" +extern int dry_run; extern int am_daemon; extern int am_server; extern int am_sender; @@ -534,7 +535,7 @@ void log_delete(char *fname, int mode) if (S_ISDIR(mode)) len++; /* directories include trailing null */ send_msg(MSG_DELETED, fname, len); - if (!am_daemon) + if (!am_daemon || dry_run) return; fmt = lp_log_format(module_id); code = FLOG; @@ -556,7 +557,7 @@ void log_delete(char *fname, int mode) void log_exit(int code, const char *file, int line) { if (code == 0) { - rprintf(FLOG,"wrote %.0f bytes read %.0f bytes total size %.0f\n", + rprintf(FLOG,"sent %.0f bytes received %.0f bytes total size %.0f\n", (double)stats.total_written, (double)stats.total_read, (double)stats.total_size); -- 2.34.1