From: Wayne Davison <wayned@samba.org>
Date: Sat, 29 Oct 2016 21:33:44 +0000 (-0700)
Subject: We need a LF after filelist-progress with a CR.
X-Git-Tag: v3.1.3pre1~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e02b89d0d35ab8acbd522983c08d2519d8bd12d4;p=thirdparty%2Frsync.git

We need a LF after filelist-progress with a CR.
Fixes bug 12367.
---

diff --git a/flist.c b/flist.c
index acb95f71..4a9f4e63 100644
--- a/flist.c
+++ b/flist.c
@@ -156,7 +156,9 @@ static void start_filelist_progress(char *kind)
 
 static void emit_filelist_progress(int count)
 {
+	output_needs_newline = 0; /* avoid a newline in the middle of this filelist-progress output */
 	rprintf(FCLIENT, " %d files...\r", count);
+	output_needs_newline = 1;
 }
 
 static void maybe_emit_filelist_progress(int count)