You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

21 lines
640 B

  1. commit e02b89d0d35ab8acbd522983c08d2519d8bd12d4
  2. Author: Wayne Davison <wayned@samba.org>
  3. Date: Sat Oct 29 14:33:44 2016 -0700
  4. We need a LF after filelist-progress with a CR.
  5. Fixes bug 12367.
  6. diff --git a/flist.c b/flist.c
  7. index acb95f7..4a9f4e6 100644
  8. --- a/flist.c
  9. +++ b/flist.c
  10. @@ -156,7 +156,9 @@ static void start_filelist_progress(char *kind)
  11. static void emit_filelist_progress(int count)
  12. {
  13. + output_needs_newline = 0; /* avoid a newline in the middle of this filelist-progress output */
  14. rprintf(FCLIENT, " %d files...\r", count);
  15. + output_needs_newline = 1;
  16. }
  17. static void maybe_emit_filelist_progress(int count)