always use a timeout to select, even if --timeout is not

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index d7140d2..3ea09e1 100644 (file)
--- a/io.c
+++ b/io.c
@@ -24,6 +24,9 @@
   */
 #include "rsync.h"
 
+/* if no timeout is specified then use a 60 second select timeout */
+#define SELECT_TIMEOUT 60
+
 static int io_multiplexing_out;
 static int io_multiplexing_in;
 static int multiplex_in_fd;
@@ -54,8 +57,8 @@ static void check_timeout(void)
 
        t = time(NULL);
 
-       if (last_io && io_timeout && (t-last_io)>io_timeout) {
-               rprintf(FERROR,"read timeout after %d second - exiting\n", 
+       if (last_io && io_timeout && (t-last_io) >= io_timeout) {
+               rprintf(FERROR,"io timeout after %d second - exiting\n", 
                        (int)(t-last_io));
                exit_cleanup(1);
        }
@@ -83,11 +86,10 @@ static int read_timeout(int fd, char *buf, int len)
 
                FD_ZERO(&fds);
                FD_SET(fd, &fds);
-               tv.tv_sec = io_timeout;
+               tv.tv_sec = io_timeout?io_timeout:SELECT_TIMEOUT;
                tv.tv_usec = 0;
 
-               if (select(fd+1, &fds, NULL, NULL, 
-                          io_timeout?&tv:NULL) != 1) {
+               if (select(fd+1, &fds, NULL, NULL, &tv) != 1) {
                        check_timeout();
                        continue;
                }
@@ -119,7 +121,7 @@ static int read_timeout(int fd, char *buf, int len)
 
                if (n == 0) {
                        if (eof_error) {
-                               rprintf(FERROR,"EOF in read_timeout\n");
+                               rprintf(FERROR,"unexpected EOF in read_timeout\n");
                        }
                        exit_cleanup(1);
                }
@@ -238,7 +240,7 @@ static void readfd(int fd,char *buffer,int N)
        int  ret;
        int total=0;  
        
-       if (read_buffer_len < N && N < 1024) {
+       if ((read_buffer_len < N) && (N < 1024)) {
                read_check(buffer_f_in);
        }
        
@@ -323,33 +325,38 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 
        no_flush++;
 
-       reading = (buffer_f_in != -1 && read_buffer_len < MAX_READ_BUFFER);
-
        while (total < len) {
                FD_ZERO(&w_fds);
                FD_ZERO(&r_fds);
                FD_SET(fd,&w_fds);
                fd_count = fd+1;
 
+               reading = (buffer_f_in != -1 && 
+                          read_buffer_len < MAX_READ_BUFFER);
+
                if (reading) {
                        FD_SET(buffer_f_in,&r_fds);
                        if (buffer_f_in > fd) 
                                fd_count = buffer_f_in+1;
                }
 
-               tv.tv_sec = io_timeout;
+               tv.tv_sec = io_timeout?io_timeout:SELECT_TIMEOUT;
                tv.tv_usec = 0;
 
                count = select(fd_count,
                               reading?&r_fds:NULL,
                               &w_fds,NULL,
-                              io_timeout?&tv:NULL);
+                              &tv);
 
                if (count <= 0) {
                        check_timeout();
                        continue;
                }
 
+               if (reading && FD_ISSET(buffer_f_in, &r_fds)) {
+                       read_check(buffer_f_in);
+               }
+
                if (FD_ISSET(fd, &w_fds)) {
                        int n = (len-total)>>blocked;
                        int ret = write(fd,buf+total,n?n:1);
@@ -375,11 +382,6 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 
                        if (io_timeout)
                                last_io = time(NULL);
-                       continue;
-               }
-
-               if (reading && FD_ISSET(buffer_f_in, &r_fds)) {
-                       read_check(buffer_f_in);
                }
        }