aboutsummaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2004-06-19 07:09:57 +0000
committerWayne Davison <wayned@samba.org>2004-06-19 07:09:57 +0000
commitbd717af8ab588cd9d05825ff8adfbe5dc91049ca (patch)
tree6df82867c8ef00b7583eb3c421d79dfbc114c780 /io.c
parentc54f5170bf2469c1f10749931eb82282eb2d4e33 (diff)
downloadandroid_external_rsync-bd717af8ab588cd9d05825ff8adfbe5dc91049ca.tar.gz
android_external_rsync-bd717af8ab588cd9d05825ff8adfbe5dc91049ca.tar.bz2
android_external_rsync-bd717af8ab588cd9d05825ff8adfbe5dc91049ca.zip
Must not call check_timeout() before checking the errno value.
Diffstat (limited to 'io.c')
-rw-r--r--io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/io.c b/io.c
index 13f4d3d1..ef4735c4 100644
--- a/io.c
+++ b/io.c
@@ -419,9 +419,9 @@ static int read_timeout(int fd, char *buf, size_t len)
NULL, &tv);
if (count <= 0) {
- check_timeout();
if (errno == EBADF)
exit_cleanup(RERR_SOCKETIO);
+ check_timeout();
continue;
}
@@ -827,9 +827,9 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
&w_fds, NULL, &tv);
if (count <= 0) {
- check_timeout();
if (count < 0 && errno == EBADF)
exit_cleanup(RERR_SOCKETIO);
+ check_timeout();
continue;
}