We need a LF after filelist-progress with a CR.
authorWayne Davison <wayned@samba.org>
Sat, 29 Oct 2016 21:33:44 +0000 (14:33 -0700)
committerWayne Davison <wayned@samba.org>
Sat, 29 Oct 2016 21:33:44 +0000 (14:33 -0700)
Fixes bug 12367.

flist.c

diff --git a/flist.c b/flist.c
index acb95f71ec1649584329b128475d0b1eae874440..4a9f4e63e756bb8e73aadb50c1d710bf49b1ab39 100644 (file)
--- 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)