From: Wayne Davison <wayned@samba.org>
Date: Tue, 9 May 2006 18:31:00 +0000 (+0000)
Subject: Revised the logic for when to call log_exit() to handle the
X-Git-Tag: v2.6.9pre1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cfcb8af1164de16318e7d84320579a3010fa4d4;p=thirdparty%2Frsync.git

Revised the logic for when to call log_exit() to handle the
new --log-file option.
---

diff --git a/cleanup.c b/cleanup.c
index 8eb649e1..d6388689 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -23,10 +23,13 @@
 
 #include "rsync.h"
 
+extern int am_server;
+extern int am_daemon;
 extern int io_error;
 extern int keep_partial;
 extern int log_got_error;
 extern char *partial_dir;
+extern char *logfile_name;
 
 #ifdef HAVE_SIGACTION
 static struct sigaction sigact;
@@ -151,7 +154,7 @@ void _exit_cleanup(int code, const char *file, int line)
 			code = RERR_PARTIAL;
 	}
 
-	if (code)
+	if (code || am_daemon || (logfile_name && (am_server || !verbose)))
 		log_exit(code, file, line);
 
 	if (verbose > 2) {