X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/554e0a8dd0079cd8d28dbb30ffd90010f2f97933..bd36966bed1d14461557973f91adf4f29bc92c08:/io.c diff --git a/io.c b/io.c index ae398f2d..26b6e4b3 100644 --- a/io.c +++ b/io.c @@ -255,9 +255,6 @@ static void read_check(int f) read_buffer_p = read_buffer; } - if (n > MAX_READ_BUFFER/4) - n = MAX_READ_BUFFER/4; - if (read_buffer_p != read_buffer) { memmove(read_buffer,read_buffer_p,read_buffer_len); read_buffer_p = read_buffer; @@ -385,7 +382,8 @@ static void writefd_unbuffered(int fd,char *buf,int len) fd_count = fd; if (!no_flush_read) { - reading = (buffer_f_in != -1); + reading = (buffer_f_in != -1) && + (read_buffer_len < MAX_READ_BUFFER); } if (reading) { @@ -614,7 +612,6 @@ void io_start_multiplex_in(int fd) multiplex_in_fd = fd; io_flush(); if (read_buffer_len) { - fprintf(stderr,"ERROR: data in read buffer at mplx start\n"); exit_cleanup(RERR_STREAMIO); }