summaryrefslogtreecommitdiff
path: root/cleanup.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-05-09 18:31:00 +0000
committerWayne Davison <wayned@samba.org>2006-05-09 18:31:00 +0000
commit1cfcb8af1164de16318e7d84320579a3010fa4d4 (patch)
tree11c7f460cd29ab3bb595eb8e10b758f95b5d3417 /cleanup.c
parent56aaa4c44cc2bb6a4179627582b5f57c69614451 (diff)
downloadrsync-1cfcb8af1164de16318e7d84320579a3010fa4d4.tar.gz
rsync-1cfcb8af1164de16318e7d84320579a3010fa4d4.tar.bz2
rsync-1cfcb8af1164de16318e7d84320579a3010fa4d4.zip
Revised the logic for when to call log_exit() to handle the
new --log-file option.
Diffstat (limited to 'cleanup.c')
-rw-r--r--cleanup.c5
1 files changed, 4 insertions, 1 deletions
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) {