X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ee6e80c7532696f04bd021a26b3b2e5178cf5f31..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/io.c

diff --git a/io.c b/io.c
index 819c17f4..e75f66a5 100644
--- a/io.c
+++ b/io.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996-2001 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2008 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -413,15 +413,17 @@ static void read_msg_fd(void)
 		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;
-		if (tag == MSG_SOCKERR)
+		if (tag == MSG_ERROR_SOCKET)
 			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;
@@ -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();
-				rsyserr(FSOCKERR, errno, "read error");
+				rsyserr(FERROR_SOCKET, errno, "read error");
 			} 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:
+		case MSG_ERROR_XFER:
+		case MSG_WARNING:
 			if (msg_bytes >= sizeof line) {
 			    overflow:
 				rprintf(FERROR,