aboutsummaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-11-07 09:45:43 -0800
committerWayne Davison <wayned@samba.org>2009-11-07 09:45:43 -0800
commit4655dcf218be15551c974a034b9c9f95e2505842 (patch)
tree028fab0ed1fa9f95ed22b028ae4a08bc79104d0b /io.c
parentf9185203ee03152001530db5624a2b8c93e1ea94 (diff)
downloadandroid_external_rsync-4655dcf218be15551c974a034b9c9f95e2505842.tar.gz
android_external_rsync-4655dcf218be15551c974a034b9c9f95e2505842.tar.bz2
android_external_rsync-4655dcf218be15551c974a034b9c9f95e2505842.zip
Give noop_io_until_death() a time limit.
Diffstat (limited to 'io.c')
-rw-r--r--io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/io.c b/io.c
index 1e2f2187..b5fd3776 100644
--- a/io.c
+++ b/io.c
@@ -807,6 +807,7 @@ void noop_io_until_death(void)
char buf[1024];
kluge_around_eof = 1;
+ set_io_timeout(10);
while (1)
read_buf(iobuf.in_fd, buf, sizeof buf);
@@ -1324,7 +1325,7 @@ static void read_a_msg(void)
if (!io_timeout || io_timeout > val) {
if (INFO_GTE(MISC, 2))
rprintf(FINFO, "Setting --timeout=%d to match server\n", val);
- io_timeout = val;
+ set_io_timeout(val);
}
break;
case MSG_NOOP: