summaryrefslogtreecommitdiff
path: root/cleanup.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-04-15 08:39:59 -0700
committerWayne Davison <wayned@samba.org>2008-04-15 08:50:14 -0700
commit59d2cd5a7fd922e5e32c8fc9790c35a6343d91bc (patch)
treed4a2d81d37925b02dfdd525040b9bca73c4095df /cleanup.c
parent1c3e6e8b2611f85cdf3ada054ef2c419ecaf399c (diff)
downloadrsync-59d2cd5a7fd922e5e32c8fc9790c35a6343d91bc.tar.gz
When running in --progress mode with a progress message active, the
client now outputs a newline prior to an error message, which avoids overwriting the active file's last progress line.
Diffstat (limited to 'cleanup.c')
-rw-r--r--cleanup.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/cleanup.c b/cleanup.c
index e59565da..c0596413 100644
--- a/cleanup.c
+++ b/cleanup.c
@@ -27,6 +27,7 @@ extern int am_daemon;
extern int io_error;
extern int keep_partial;
extern int got_xfer_error;
+extern int progress_is_active;
extern char *partial_dir;
extern char *logfile_name;
@@ -115,6 +116,9 @@ NORETURN void _exit_cleanup(int code, const char *file, int line)
exit_code = unmodified_code = code;
+ if (progress_is_active && exit_code && !am_server)
+ rprintf(FINFO, "\n");
+
if (verbose > 3) {
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",