Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the name "ChangeLog" for the ftp copy of the repository history.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
819c17f
..
f886a55
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-413,15
+413,17
@@
static void read_msg_fd(void)
readfd(fd, buf, 4);
got_flist_entry_status(FES_NO_SEND, buf);
break;
readfd(fd, buf, 4);
got_flist_entry_status(FES_NO_SEND, buf);
break;
- case MSG_
SOCKERR
:
+ case MSG_
ERROR_SOCKET
:
case MSG_CLIENT:
if (!am_generator)
goto invalid_msg;
case MSG_CLIENT:
if (!am_generator)
goto invalid_msg;
- if (tag == MSG_
SOCKERR
)
+ if (tag == MSG_
ERROR_SOCKET
)
io_end_multiplex_out();
/* FALL THROUGH */
case MSG_INFO:
case MSG_ERROR:
io_end_multiplex_out();
/* FALL THROUGH */
case MSG_INFO:
case MSG_ERROR:
+ case MSG_ERROR_XFER:
+ case MSG_WARNING:
case MSG_LOG:
while (len) {
n = len;
case MSG_LOG:
while (len) {
n = len;
@@
-751,7
+753,7
@@
static int read_timeout(int fd, char *buf, size_t len)
/* Don't write errors on a dead socket. */
if (fd == sock_f_in) {
io_end_multiplex_out();
/* Don't write errors on a dead socket. */
if (fd == sock_f_in) {
io_end_multiplex_out();
- rsyserr(F
SOCKERR
, errno, "read error");
+ rsyserr(F
ERROR_SOCKET
, errno, "read error");
} else
rsyserr(FERROR, errno, "read error");
exit_cleanup(RERR_STREAMIO);
} else
rsyserr(FERROR, errno, "read error");
exit_cleanup(RERR_STREAMIO);
@@
-1106,6
+1108,8
@@
static int readfd_unbuffered(int fd, char *buf, size_t len)
break;
case MSG_INFO:
case MSG_ERROR:
break;
case MSG_INFO:
case MSG_ERROR:
+ case MSG_ERROR_XFER:
+ case MSG_WARNING:
if (msg_bytes >= sizeof line) {
overflow:
rprintf(FERROR,
if (msg_bytes >= sizeof line) {
overflow:
rprintf(FERROR,