Doc.

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index a451c13..6a7b679 100644 (file)
--- a/io.c
+++ b/io.c
@@ -49,7 +49,7 @@ int kludge_around_eof = False;
 
 static int io_error_fd = -1;
 
-static void read_loop(int fd, char *buf, int len);
+static void read_loop(int fd, char *buf, size_t len);
 
 static void check_timeout(void)
 {
@@ -86,7 +86,7 @@ void io_set_error_fd(int fd)
 static void read_error_fd(void)
 {
        char buf[200];
-       int n;
+       size_t n;
        int fd = io_error_fd;
        int tag, len;
 
@@ -103,7 +103,8 @@ static void read_error_fd(void)
 
        while (len) {
                n = len;
-               if (n > (sizeof(buf)-1)) n = sizeof(buf)-1;
+               if (n > (sizeof(buf)-1))
+                       n = sizeof(buf)-1;
                read_loop(fd, buf, n);
                rwrite((enum logcode)tag, buf, n);
                len -= n;
@@ -163,7 +164,7 @@ static void die_from_readerr (int err)
  * give a better explanation.  We can tell whether the connection has
  * started by looking e.g. at whether the remote version is known yet.
  */
-static int read_timeout (int fd, char *buf, int len)
+static int read_timeout (int fd, char *buf, size_t len)
 {
        int n, ret=0;
 
@@ -174,6 +175,7 @@ static int read_timeout (int fd, char *buf, int len)
                fd_set fds;
                struct timeval tv;
                int fd_count = fd+1;
+               int count;
 
                FD_ZERO(&fds);
                FD_SET(fd, &fds);
@@ -187,11 +189,16 @@ static int read_timeout (int fd, char *buf, int len)
 
                errno = 0;
 
-               if (select(fd_count, &fds, NULL, NULL, &tv) < 1) {
+               count = select(fd_count, &fds, NULL, NULL, &tv);
+
+               if (count == 0) {
+                       check_timeout();
+               }
+
+               if (count <= 0) {
                        if (errno == EBADF) {
                                exit_cleanup(RERR_SOCKETIO);
                        }
-                       check_timeout();
                        continue;
                }
 
@@ -230,7 +237,7 @@ static int read_timeout (int fd, char *buf, int len)
 
 /*! Continue trying to read len bytes - don't return until len has
   been read.   */
-static void read_loop (int fd, char *buf, int len)
+static void read_loop (int fd, char *buf, size_t len)
 {
        while (len) {
                int n = read_timeout(fd, buf, len);
@@ -247,10 +254,10 @@ static void read_loop (int fd, char *buf, int len)
  * 
  * Never returns <= 0. 
  */
-static int read_unbuffered(int fd, char *buf, int len)
+static int read_unbuffered(int fd, char *buf, size_t len)
 {
-       static int remaining;
-       int tag, ret=0;
+       static size_t remaining;
+       int tag, ret = 0;
        char line[1024];
 
        if (!io_multiplexing_in || fd != multiplex_in_fd)
@@ -265,23 +272,24 @@ static int read_unbuffered(int fd, char *buf, int len)
                        continue;
                }
 
-               read_loop (fd, line, 4);
+               read_loop(fd, line, 4);
                tag = IVAL(line, 0);
 
                remaining = tag & 0xFFFFFF;
                tag = tag >> 24;
 
-               if (tag == MPLEX_BASE) continue;
+               if (tag == MPLEX_BASE)
+                       continue;
 
                tag -= MPLEX_BASE;
 
                if (tag != FERROR && tag != FINFO) {
-                       rprintf(FERROR,"unexpected tag %d\n", tag);
+                       rprintf(FERROR, "unexpected tag %d\n", tag);
                        exit_cleanup(RERR_STREAMIO);
                }
 
-               if (remaining > sizeof(line)-1) {
-                       rprintf(FERROR,"multiplexing overflow %d\n\n", 
+               if (remaining > sizeof(line) - 1) {
+                       rprintf(FERROR, "multiplexing overflow %d\n\n",
                                remaining);
                        exit_cleanup(RERR_STREAMIO);
                }
@@ -289,7 +297,7 @@ static int read_unbuffered(int fd, char *buf, int len)
                read_loop(fd, line, remaining);
                line[remaining] = 0;
 
-               rprintf((enum logcode)tag,"%s", line);
+               rprintf((enum logcode) tag, "%s", line);
                remaining = 0;
        }
 
@@ -297,12 +305,13 @@ static int read_unbuffered(int fd, char *buf, int len)
 }
 
 
+
 /* do a buffered read from fd. don't return until all N bytes
    have been read. If all N can't be read then exit with an error */
-static void readfd (int fd, char *buffer, int N)
+static void readfd (int fd, char *buffer, size_t N)
 {
        int  ret;
-       int total=0;  
+       size_t total=0;  
        
        while (total < N) {
                io_flush();
@@ -350,12 +359,12 @@ int64 read_longint(int f)
        return ret;
 }
 
-void read_buf(int f,char *buf,int len)
+void read_buf(int f,char *buf,size_t len)
 {
        readfd(f,buf,len);
 }
 
-void read_sbuf(int f,char *buf,int len)
+void read_sbuf(int f,char *buf,size_t len)
 {
        read_buf (f,buf,len);
        buf[len] = 0;
@@ -369,9 +378,9 @@ unsigned char read_byte(int f)
 }
 
 /* write len bytes to fd */
-static void writefd_unbuffered(int fd,char *buf,int len)
+static void writefd_unbuffered(int fd,char *buf,size_t len)
 {
-       int total = 0;
+       size_t total = 0;
        fd_set w_fds, r_fds;
        int fd_count, count;
        struct timeval tv;
@@ -402,11 +411,14 @@ static void writefd_unbuffered(int fd,char *buf,int len)
                               &w_fds,NULL,
                               &tv);
 
+               if (count == 0) {
+                       check_timeout();
+               }
+
                if (count <= 0) {
                        if (errno == EBADF) {
                                exit_cleanup(RERR_SOCKETIO);
                        }
-                       check_timeout();
                        continue;
                }
 
@@ -415,7 +427,8 @@ static void writefd_unbuffered(int fd,char *buf,int len)
                }
 
                if (FD_ISSET(fd, &w_fds)) {
-                       int ret, n = len-total;
+                       int ret;
+                       size_t n = len-total;
                        ret = write(fd,buf+total,n);
 
                        if (ret == -1 && errno == EINTR) {
@@ -474,10 +487,10 @@ void io_start_buffering(int fd)
 
 /* write an message to a multiplexed stream. If this fails then rsync
    exits */
-static void mplex_write(int fd, enum logcode code, char *buf, int len)
+static void mplex_write(int fd, enum logcode code, char *buf, size_t len)
 {
        char buffer[4096];
-       int n = len;
+       size_t n = len;
 
        SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
 
@@ -514,8 +527,7 @@ void io_flush(void)
 }
 
 
-/* XXX: fd is ignored, which seems a little strange. */
-void io_end_buffering(int fd)
+void io_end_buffering(void)
 {
        io_flush();
        if (!io_multiplexing_out) {
@@ -524,7 +536,7 @@ void io_end_buffering(int fd)
        }
 }
 
-static void writefd(int fd,char *buf,int len)
+static void writefd(int fd,char *buf,size_t len)
 {
        stats.total_written += len;
 
@@ -536,7 +548,7 @@ static void writefd(int fd,char *buf,int len)
        }
 
        while (len) {
-               int n = MIN(len, IO_BUFFER_SIZE-io_buffer_count);
+               int n = MIN((int) len, IO_BUFFER_SIZE-io_buffer_count);
                if (n > 0) {
                        memcpy(io_buffer+io_buffer_count, buf, n);
                        buf += n;
@@ -578,7 +590,7 @@ void write_longint(int f, int64 x)
        writefd(f,b,8);
 }
 
-void write_buf(int f,char *buf,int len)
+void write_buf(int f,char *buf,size_t len)
 {
        writefd(f,buf,len);
 }
@@ -597,7 +609,7 @@ void write_byte(int f,unsigned char c)
 
 
 
-int read_line(int f, char *buf, int maxlen)
+int read_line(int f, char *buf, size_t maxlen)
 {
        while (maxlen) {
                buf[0] = 0;
@@ -655,7 +667,7 @@ void io_start_multiplex_in(int fd)
 }
 
 /* write an message to the multiplexed error stream */
-int io_multiplex_write(enum logcode code, char *buf, int len)
+int io_multiplex_write(enum logcode code, char *buf, size_t len)
 {
        if (!io_multiplexing_out) return 0;