open on paths starting with // fails on win32

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index dbd9f64..4fd1a13 100644 (file)
--- a/io.c
+++ b/io.c
@@ -60,7 +60,7 @@ static void check_timeout(void)
        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);
+               exit_cleanup(RERR_TIMEOUT);
        }
 }
 
@@ -112,24 +112,19 @@ static int read_timeout(int fd, char *buf, int len)
                        continue;
                }
 
-               if (n == -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);
-                       continue;
-               }
 
                if (n == 0) {
                        if (eof_error) {
                                rprintf(FERROR,"unexpected EOF in read_timeout\n");
                        }
-                       exit_cleanup(1);
+                       exit_cleanup(RERR_STREAMIO);
                }
 
+               /* this prevents us trying to write errors on a dead socket */
+               io_multiplexing_out = 0;
+
                rprintf(FERROR,"read error: %s\n", strerror(errno));
-               exit_cleanup(1);
+               exit_cleanup(RERR_STREAMIO);
        }
 
        return ret;
@@ -181,13 +176,13 @@ static int read_unbuffered(int fd, char *buf, int len)
 
                if (tag != FERROR && tag != FINFO) {
                        rprintf(FERROR,"unexpected tag %d\n", tag);
-                       exit_cleanup(1);
+                       exit_cleanup(RERR_STREAMIO);
                }
 
                if (remaining > sizeof(line)-1) {
                        rprintf(FERROR,"multiplexing overflow %d\n\n", 
                                remaining);
-                       exit_cleanup(1);
+                       exit_cleanup(RERR_STREAMIO);
                }
 
                read_loop(fd, line, remaining);
@@ -292,7 +287,7 @@ int64 read_longint(int f)
 
 #ifdef NO_INT64
        rprintf(FERROR,"Integer overflow - attempted 64 bit offset\n");
-       exit_cleanup(1);
+       exit_cleanup(RERR_UNSUPPORTED);
 #else
        if (remote_version >= 16) {
                readfd(f,b,8);
@@ -333,7 +328,6 @@ static void writefd_unbuffered(int fd,char *buf,int len)
        int fd_count, count;
        struct timeval tv;
        int reading=0;
-       int blocked=0;
 
        no_flush++;
 
@@ -371,25 +365,21 @@ static void writefd_unbuffered(int fd,char *buf,int len)
                }
 
                if (FD_ISSET(fd, &w_fds)) {
-                       int n = (len-total)>>blocked;
-                       int ret = write(fd,buf+total,n?n:1);
+                       int ret, n = len-total;
+                       
+                       if (n > PIPE_BUF) n = PIPE_BUF;
 
-                       if (ret == -1 && errno == EINTR) {
-                               continue;
-                       }
+                       ret = write(fd,buf+total,n?n:1);
 
-                       if (ret == -1 && 
-                           (errno == EAGAIN || errno == EWOULDBLOCK)) {
-                               blocked++;
+                       if (ret == -1 && errno == EINTR) {
                                continue;
                        }
 
                        if (ret <= 0) {
                                rprintf(FERROR,"erroring writing %d bytes - exiting\n", len);
-                               exit_cleanup(1);
+                               exit_cleanup(RERR_STREAMIO);
                        }
 
-                       blocked = 0;
                        total += ret;
 
                        if (io_timeout)
@@ -538,10 +528,10 @@ void io_printf(int fd, const char *format, ...)
        int len;
        
        va_start(ap, format);
-       len = vslprintf(buf, sizeof(buf)-1, format, ap);
+       len = vslprintf(buf, sizeof(buf), format, ap);
        va_end(ap);
 
-       if (len < 0) exit_cleanup(1);
+       if (len < 0) exit_cleanup(RERR_STREAMIO);
 
        write_sbuf(fd, buf);
 }
@@ -563,7 +553,7 @@ void io_start_multiplex_in(int fd)
        io_flush();
        if (read_buffer_len) {
                fprintf(stderr,"ERROR: data in read buffer at mplx start\n");
-               exit_cleanup(1);
+               exit_cleanup(RERR_STREAMIO);
        }
 
        io_multiplexing_in = 1;