Make sure that the line buffer in readfd_unbuffered() is large

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 1650073..bdfebaf 100644 (file)
--- a/io.c
+++ b/io.c
@@ -706,7 +706,11 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
        static size_t remaining;
        static size_t iobuf_in_ndx;
        int tag, ret = 0;
-       char line[MAXPATHLEN+1];
+#if MAXPATHLEN < 4096
+       char line[4096+1024];
+#else
+       char line[MAXPATHLEN+1024];
+#endif
 
        if (!iobuf_in || fd != sock_f_in)
                return read_timeout(fd, buf, len);
@@ -888,7 +892,7 @@ int read_vstring(int f, char *buf, int bufsize)
        if (len >= bufsize) {
                rprintf(FERROR, "over-long vstring received (%d > %d)\n",
                        len, bufsize - 1);
-               exit_cleanup(RERR_PROTOCOL);
+               return -1;
        }
 
        if (len)
@@ -1006,7 +1010,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
 {
        size_t n, total = 0;
        fd_set w_fds, r_fds;
-       int maxfd, count, ret;
+       int maxfd, count, ret, using_r_fds;
        struct timeval tv;
 
        no_flush++;
@@ -1021,7 +1025,9 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                        FD_SET(msg_fd_in,&r_fds);
                        if (msg_fd_in > maxfd)
                                maxfd = msg_fd_in;
-               }
+                       using_r_fds = 1;
+               } else
+                       using_r_fds = 0;
                if (fd != sock_f_out && iobuf_out_cnt && no_flush == 1) {
                        FD_SET(sock_f_out, &w_fds);
                        if (sock_f_out > maxfd)
@@ -1032,7 +1038,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                tv.tv_usec = 0;
 
                errno = 0;
-               count = select(maxfd + 1, msg_fd_in >= 0 ? &r_fds : NULL,
+               count = select(maxfd + 1, using_r_fds ? &r_fds : NULL,
                               &w_fds, NULL, &tv);
 
                if (count <= 0) {
@@ -1042,17 +1048,11 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
                        continue;
                }
 
-               if (msg_fd_in >= 0 && FD_ISSET(msg_fd_in, &r_fds))
+               if (using_r_fds && FD_ISSET(msg_fd_in, &r_fds))
                        read_msg_fd();
 
-               if (!FD_ISSET(fd, &w_fds)) {
-                       if (fd != sock_f_out && iobuf_out_cnt) {
-                               no_flush--;
-                               io_flush(NORMAL_FLUSH);
-                               no_flush++;
-                       }
+               if (!FD_ISSET(fd, &w_fds))
                        continue;
-               }
 
                n = len - total;
                if (bwlimit && n > bwlimit_writemax)