/* -*- 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
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);
int fd = io_error_fd;
int tag, len;
+ /* io_error_fd is temporarily disabled -- is this meant to
+ * prevent indefinite recursion? */
io_error_fd = -1;
read_loop(fd, buf, 4);
* 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.
+ * 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. 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)
{
if (n == 0) {
if (eof_error) {
- rprintf(FERROR,"unexpected EOF in read_timeout\n");
+ rprintf(FERROR,
+ "%s: connection to server unexpectedly closed"
+ " (%ld bytes read so far)\n",
+ RSYNC_NAME, stats.total_read);
}
exit_cleanup(RERR_STREAMIO);
}
}
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);
}