X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/84c11e85a4c4a12ecacba24afe9617222e4361e6..304d7b5817d6e1d3cf59b9edae2213433d901cdc:/io.c?ds=sidebyside

diff --git a/io.c b/io.c
index e7cb76e3..d79ec1eb 100644
--- a/io.c
+++ b/io.c
@@ -752,7 +752,7 @@ static char *perform_io(size_t needed, int flags)
 					/* Don't write errors on a dead socket. */
 					msgs2stderr = 1;
 					out->len = iobuf.raw_flushing_ends_before = out->pos = 0;
-					rsyserr(FERROR_SOCKET, errno, "write error");
+					rsyserr(FERROR_SOCKET, errno, "[%s] write error", who_am_i());
 					exit_cleanup(RERR_STREAMIO);
 				}
 			}
@@ -802,6 +802,17 @@ static char *perform_io(size_t needed, int flags)
 	return data;
 }
 
+void noop_io_until_death(void)
+{
+	char buf[1024];
+
+	kluge_around_eof = 1;
+	set_io_timeout(protocol_version >= 31 ? 10 : 1);
+
+	while (1)
+		read_buf(iobuf.in_fd, buf, sizeof buf);
+}
+
 /* Buffer a message for the multiplexed output stream.  Is never used for MSG_DATA. */
 int send_msg(enum msgcode code, const char *buf, size_t len, int convert)
 {
@@ -1314,7 +1325,7 @@ static void read_a_msg(void)
 		if (!io_timeout || io_timeout > val) {
 			if (INFO_GTE(MISC, 2))
 				rprintf(FINFO, "Setting --timeout=%d to match server\n", val);
-			io_timeout = val;
+			set_io_timeout(val);
 		}
 		break;
 	case MSG_NOOP:
@@ -1426,6 +1437,27 @@ static void read_a_msg(void)
 			first_message = 0;
 		}
 		break;
+	case MSG_ERROR_EXIT:
+		if (msg_bytes == 0) {
+			if (!am_sender && !am_generator) {
+				send_msg(MSG_ERROR_EXIT, "", 0, 0);
+				io_flush(FULL_FLUSH);
+			}
+			val = 0;
+		} else if (msg_bytes == 4) {
+			data = perform_io(4, PIO_INPUT_AND_CONSUME);
+			val = IVAL(data, 0);
+			if (protocol_version >= 31) {
+				if (am_generator)
+					send_msg_int(MSG_ERROR_EXIT, val);
+				else
+					send_msg(MSG_ERROR_EXIT, "", 0, 0);
+			}
+		} else
+			goto invalid_msg;
+		/* Send a negative linenum so that we don't end up
+		 * with a duplicate exit message. */
+		_exit_cleanup(val, __FILE__, 0 - __LINE__);
 	default:
 		rprintf(FERROR, "unexpected tag %d [%s%s]\n",
 			tag, who_am_i(), inc_recurse ? "/inc" : "");