X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f7b9377863c25088412a704cc0834460d0d6c86b..86ffe37f11f3d3d2f855f9d4384a22ac72d5b6fb:/io.c

diff --git a/io.c b/io.c
index 7909e0b1..469eef3e 100644
--- a/io.c
+++ b/io.c
@@ -54,8 +54,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);
 	}
@@ -319,6 +319,7 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 	int fd_count, count;
 	struct timeval tv;
 	int reading;
+	int blocked=0;
 
 	no_flush++;
 
@@ -350,7 +351,8 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 		}
 
 		if (FD_ISSET(fd, &w_fds)) {
-			int ret = write(fd,buf+total,len-total);
+			int n = (len-total)>>blocked;
+			int ret = write(fd,buf+total,n?n:1);
 
 			if (ret == -1 && errno == EINTR) {
 				continue;
@@ -358,10 +360,7 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 
 			if (ret == -1 && 
 			    (errno == EAGAIN || errno == EWOULDBLOCK)) {
-				/* this shouldn't happen, if it does then
-				   sleep for a short time to prevent us
-				   chewing too much CPU */
-				u_sleep(100);
+				blocked++;
 				continue;
 			}
 
@@ -370,6 +369,7 @@ static void writefd_unbuffered(int fd,char *buf,int len)
 				exit_cleanup(1);
 			}
 
+			blocked = 0;
 			total += ret;
 			stats.total_written += ret;