standard input on server may be nonblocking

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index fda04dd..3886875 100644 (file)
--- a/io.c
+++ b/io.c
@@ -103,7 +103,15 @@ static int readfd(int fd,char *buffer,int N)
        read_buffer_p += ret;
        read_buffer_len -= ret;
       } else {
-       ret = read(fd,buffer + total,N - total);
+       while ((ret = read(fd,buffer + total,N - total)) == -1) {
+         fd_set fds;
+
+         if (errno != EAGAIN && errno != EWOULDBLOCK)
+           return -1;
+         FD_ZERO(&fds);
+         FD_SET(fd, &fds);
+         select(fd+1, &fds, NULL, NULL, NULL);
+       }
       }
 
       if (ret <= 0)
@@ -116,10 +124,12 @@ static int readfd(int fd,char *buffer,int N)
 
 int read_int(int f)
 {
+  int ret;
   char b[4];
-  if (readfd(f,b,4) != 4) {
+  if ((ret=readfd(f,b,4)) != 4) {
     if (verbose > 1) 
-      fprintf(stderr,"Error reading %d bytes : %s\n",4,strerror(errno));
+      fprintf(stderr,"Error reading %d bytes : %s\n",
+             4,ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_read += 4;
@@ -128,9 +138,11 @@ int read_int(int f)
 
 void read_buf(int f,char *buf,int len)
 {
-  if (readfd(f,buf,len) != len) {
+  int ret;
+  if ((ret=readfd(f,buf,len)) != len) {
     if (verbose > 1) 
-      fprintf(stderr,"Error reading %d bytes : %s\n",len,strerror(errno));
+      fprintf(stderr,"Error reading %d bytes : %s\n",
+             len,ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_read += len;
@@ -179,8 +191,8 @@ static int writefd(int fd,char *buf,int len)
 
     if (ret == 0) return total;
 
-    if (ret == -1 && errno != EWOULDBLOCK) 
-      return total?total:-1;
+    if (ret == -1 && !(errno == EWOULDBLOCK || errno == EAGAIN)) 
+      return -1;
 
     if (ret == -1) {
       read_check(buffer_f_in);
@@ -189,7 +201,7 @@ static int writefd(int fd,char *buf,int len)
       FD_SET(fd,&fds);
       tv.tv_sec = BLOCKING_TIMEOUT;
       tv.tv_usec = 0;
-      select(16,NULL,&fds,NULL,&tv);
+      select(fd+1,NULL,&fds,NULL,&tv);
     } else {
       total += ret;
     }
@@ -202,10 +214,12 @@ static int writefd(int fd,char *buf,int len)
 
 void write_int(int f,int x)
 {
+  int ret;
   char b[4];
   SIVAL(b,0,x);
-  if (writefd(f,b,4) != 4) {
-    fprintf(stderr,"write_int failed : %s\n",strerror(errno));
+  if ((ret=writefd(f,b,4)) != 4) {
+    fprintf(stderr,"write_int failed : %s\n",
+           ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_written += 4;
@@ -213,8 +227,10 @@ void write_int(int f,int x)
 
 void write_buf(int f,char *buf,int len)
 {
-  if (writefd(f,buf,len) != len) {
-    fprintf(stderr,"write_buf failed : %s\n",strerror(errno));
+  int ret;
+  if ((ret=writefd(f,buf,len)) != len) {
+    fprintf(stderr,"write_buf failed : %s\n",
+           ret==-1?strerror(errno):"EOF");
     exit(1);
   }
   total_written += len;