Make the auto-generated protect filters use the perishable flag so

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index bb4abf2..b69816a 100644 (file)
--- a/io.c
+++ b/io.c
@@ -4,12 +4,11 @@
  * Copyright (C) 1996-2001 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003, 2004, 2005, 2006 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
@@ -398,7 +397,7 @@ void increment_active_files(int ndx, int itemizing, enum logcode code)
        }
 
        active_filecnt++;
-       active_bytecnt += F_LENGTH(cur_flist->files[ndx]);
+       active_bytecnt += F_LENGTH(cur_flist->files[ndx - cur_flist->ndx_start]);
 }
 
 static void decrement_active_files(int ndx)
@@ -805,9 +804,10 @@ void io_end_buffering_out(void)
        iobuf_f_out = -1;
 }
 
-void maybe_flush_socket(void)
+void maybe_flush_socket(int important)
 {
-       if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io_out >= 5)
+       if (iobuf_out && iobuf_out_cnt
+        && (important || time(NULL) - last_io_out >= 5))
                io_flush(NORMAL_FLUSH);
 }