X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/05c629f778acaf7b83583426c0138ef463fb41af..feaa89c410544775afc19eac4a966e8345d5134a:/io.c

diff --git a/io.c b/io.c
index 51fc0cb0..54ceb281 100644
--- a/io.c
+++ b/io.c
@@ -211,33 +211,12 @@ int write_sparse(int f,char *buf,int len)
   return len;
 }
 
-int read_write(int fd_in,int fd_out,int size)
-{
-  static char *buf=NULL;
-  int bufsize = sparse_files?SPARSE_WRITE_SIZE:WRITE_SIZE;
-  int total=0;
-  
-  if (!buf) {
-    buf = (char *)malloc(bufsize);
-    if (!buf) out_of_memory("read_write");
-  }
-
-  while (total < size) {
-    int n = MIN(size-total,bufsize);
-    read_buf(fd_in,buf,n);
-    if (write_sparse(fd_out,buf,n) != n)
-      return total;
-    total += n;
-  }
-  return total;
-}
-
 
 static int writefd(int fd,char *buf,int len)
 {
   int total = 0;
   fd_set w_fds, r_fds;
-  int fd_count;
+  int fd_count, count, got_select=0;
   struct timeval tv;
 
   if (buffer_f_in == -1) 
@@ -251,6 +230,20 @@ static int writefd(int fd,char *buf,int len)
     if (ret == -1 && !(errno == EWOULDBLOCK || errno == EAGAIN)) 
       return -1;
 
+    if (ret == -1 && got_select) {
+	    /* hmmm, we got a write select on the fd and then failed to write.
+	       Why doesn't that mean that the fd is dead? It doesn't on some
+	       systems it seems (eg. IRIX) */
+	    u_sleep(1000);
+#if 0
+	    fprintf(FERROR,"write exception\n");
+	    exit_cleanup(1);
+#endif
+    }
+
+    got_select = 0;
+
+
     if (ret == -1) {
       read_check(buffer_f_in);
 
@@ -263,9 +256,22 @@ static int writefd(int fd,char *buf,int len)
 	      if (buffer_f_in > fd) 
 		      fd_count = buffer_f_in+1;
       }
+
       tv.tv_sec = BLOCKING_TIMEOUT;
       tv.tv_usec = 0;
-      select(fd_count,buffer_f_in == -1? NULL: &r_fds,&w_fds,NULL,&tv);
+      count = select(fd_count,buffer_f_in == -1? NULL: &r_fds,
+		     &w_fds,NULL,&tv);
+      if (count == -1 && errno != EINTR) {
+	      if (verbose > 1) 
+		      fprintf(FERROR,"select error: %s\n", strerror(errno));
+	      exit_cleanup(1);
+      }
+
+      if (count == 0) continue;
+      
+      if (FD_ISSET(fd, &w_fds)) {
+	      got_select = 1;
+      }
     } else {
       total += ret;
     }