*/
#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;
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;
}
if (n == 0) {
if (eof_error) {
- rprintf(FERROR,"EOF in read_timeout\n");
+ rprintf(FERROR,"unexpected EOF in read_timeout\n");
}
exit_cleanup(1);
}
int ret;
int total=0;
- if (read_buffer_len < N && N < 1024) {
+ if ((read_buffer_len < N) && (N < 1024)) {
read_check(buffer_f_in);
}
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();
if (io_timeout)
last_io = time(NULL);
- continue;
}
}