Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
c2c43ca
..
3ea09e1
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-24,6
+24,9
@@
*/
#include "rsync.h"
*/
#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;
static int io_multiplexing_out;
static int io_multiplexing_in;
static int multiplex_in_fd;
@@
-83,11
+86,10
@@
static int read_timeout(int fd, char *buf, int len)
FD_ZERO(&fds);
FD_SET(fd, &fds);
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;
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;
}
check_timeout();
continue;
}
@@
-119,7
+121,7
@@
static int read_timeout(int fd, char *buf, int len)
if (n == 0) {
if (eof_error) {
if (n == 0) {
if (eof_error) {
- rprintf(FERROR,"EOF in read_timeout\n");
+ rprintf(FERROR,"
unexpected
EOF in read_timeout\n");
}
exit_cleanup(1);
}
}
exit_cleanup(1);
}
@@
-338,13
+340,13
@@
static void writefd_unbuffered(int fd,char *buf,int len)
fd_count = buffer_f_in+1;
}
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,
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 (count <= 0) {
check_timeout();