X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4ecf3e067151e45dc7dead9862416722dcb4a20f..f31850966f7f60b8c58fa44d6948044571c060f6:/log.c?ds=sidebyside diff --git a/log.c b/log.c index f486db0d..975ebaf3 100644 --- a/log.c +++ b/log.c @@ -37,6 +37,7 @@ extern int protocol_version; extern int preserve_times; extern int uid_ndx; extern int gid_ndx; +extern int progress_is_active; extern int stdout_format_has_i; extern int stdout_format_has_o_or_i; extern int logfile_format_has_i; @@ -320,6 +321,11 @@ void rwrite(enum logcode code, const char *buf, int len, int is_utf8) exit_cleanup(RERR_MESSAGEIO); } + if (progress_is_active && !am_server) { + fputc('\n', f); + progress_is_active = 0; + } + trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r') ? buf[--len] : 0;