Note about multiplexing.

[rsync/rsync.git] / io.c

diff --git a/io.c b/io.c
index 253344b..eca02fa 100644 (file)
--- a/io.c
+++ b/io.c
@@ -1,6 +1,6 @@
 /* -*- c-file-style: "linux" -*-
    
-   Copyright (C) 1996-2000 by Andrew Tridgell 
+   Copyright (C) 1996-2001 by Andrew Tridgell 
    Copyright (C) Paul Mackerras 1996
    
    This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,7 @@ static void check_timeout(void)
 
        if (last_io && io_timeout && (t-last_io) >= io_timeout) {
                if (!am_server && !am_daemon) {
-                       rprintf(FERROR,"io timeout after %d second - exiting\n", 
+                       rprintf(FERROR,"io timeout after %d seconds - exiting\n", 
                                (int)(t-last_io));
                }
                exit_cleanup(RERR_TIMEOUT);
@@ -104,9 +104,15 @@ static void read_error_fd(void)
 
 static int no_flush;
 
-/* read from a socket with IO timeout. return the number of
-   bytes read. If no bytes can be read then exit, never return
-   a number <= 0 */
+/*
+ * Read from a socket with IO timeout. return the number of bytes
+ * read. If no bytes can be read then exit, never return a number <= 0.
+ *
+ * TODO: If the remote shell connection fails, then current versions actually
+ * report an "unexpected EOF" error here.  Since it's a fairly common mistake
+ * to try to use rsh when ssh is required, we should trap that: if we fail
+ * to read any data at all, we should give a better explanation.
+ */
 static int read_timeout(int fd, char *buf, int len)
 {
        int n, ret=0;
@@ -378,7 +384,10 @@ static void writefd_unbuffered(int fd,char *buf,int len)
                        }
 
                        if (ret <= 0) {
-                               rprintf(FERROR,"erroring writing %d bytes - exiting\n", len);
+                               rprintf(FERROR,
+                                       "error writing %d unbuffered bytes"
+                                       " - exiting: %s\n", len,
+                                       strerror(errno));
                                exit_cleanup(RERR_STREAMIO);
                        }