set network file descriptors non-blocking before starting main rsync

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 72c7ce9..beb3d37 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -356,7 +356,11 @@ static int skip_file(char *fname,
 /* use a larger block size for really big files */
 int adapt_block_size(struct file_struct *file, int bsize)
 {
-       int ret = file->length / (10000); /* rough heuristic */
+       int ret;
+
+       if (bsize != BLOCK_SIZE) return bsize;
+
+       ret = file->length / (10000); /* rough heuristic */
        ret = ret & ~15; /* multiple of 16 */
        if (ret < bsize) ret = bsize;
        if (ret > CHUNK_SIZE/2) ret = CHUNK_SIZE/2;