- Moved the second send_extr_file_list() call to a better spot.

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index 8c9577b..e8a0265 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -4,12 +4,11 @@
  * Copyright (C) 1996-2000 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -1662,7 +1661,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
                if (allowed_lull && !(++j % lull_mod))
                        maybe_send_keepalive();
                else if (!(j % 200))
-                       maybe_flush_socket();
+                       maybe_flush_socket(0);
        }
 }
 
@@ -1726,8 +1725,10 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                if (first_flist->in_progress || first_flist->to_redo)
                        break;
 
-               if (!read_batch)
+               if (!read_batch) {
                        write_ndx(sock_f_out, NDX_DONE);
+                       maybe_flush_socket(1);
+               }
 
                if (delete_during == 2 || !dir_tweaking) {
                        /* Skip directory touch-up. */
@@ -1848,7 +1849,7 @@ void generate_files(int f_out, const char *local_name)
                        if (allowed_lull && !(i % lull_mod))
                                maybe_send_keepalive();
                        else if (!(i % 200))
-                               maybe_flush_socket();
+                               maybe_flush_socket(0);
                }
 
                if (!inc_recurse) {