X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f9185203ee03152001530db5624a2b8c93e1ea94..4e2a7e59e540a7a66da0c3e159f0464b05559f7f:/io.c

diff --git a/io.c b/io.c
index 1e2f2187..b717b431 100644
--- a/io.c
+++ b/io.c
@@ -541,8 +541,8 @@ static char *perform_io(size_t needed, int flags)
 		if (DEBUG_GTE(IO, 3)) {
 			rprintf(FINFO, "[%s] perform_io(%ld, outroom) needs to flush %ld\n",
 				who_am_i(), (long)needed,
-				iobuf.out.len > iobuf.out.size - needed
-				? (long)iobuf.out.len - (iobuf.out.size - needed) : 0L);
+				iobuf.out.len + needed > iobuf.out.size
+				? (long)(iobuf.out.len + needed - iobuf.out.size) : 0L);
 		}
 		break;
 
@@ -557,8 +557,8 @@ static char *perform_io(size_t needed, int flags)
 		if (DEBUG_GTE(IO, 3)) {
 			rprintf(FINFO, "[%s] perform_io(%ld, msgroom) needs to flush %ld\n",
 				who_am_i(), (long)needed,
-				iobuf.out.len > iobuf.msg.size - needed
-				? (long)iobuf.out.len - (iobuf.msg.size - needed) : 0L);
+				iobuf.msg.len + needed > iobuf.msg.size
+				? (long)(iobuf.msg.len + needed - iobuf.msg.size) : 0L);
 		}
 		break;
 
@@ -578,11 +578,13 @@ static char *perform_io(size_t needed, int flags)
 				goto double_break;
 			break;
 		case PIO_NEED_OUTROOM:
-			if (iobuf.out.len <= iobuf.out.size - needed)
+			/* Note that iobuf.out_empty_len doesn't factor into this check
+			 * because iobuf.out.len already holds any needed header len. */
+			if (iobuf.out.len + needed <= iobuf.out.size)
 				goto double_break;
 			break;
 		case PIO_NEED_MSGROOM:
-			if (iobuf.msg.len <= iobuf.msg.size - needed)
+			if (iobuf.msg.len + needed <= iobuf.msg.size)
 				goto double_break;
 			break;
 		}
@@ -638,6 +640,7 @@ static char *perform_io(size_t needed, int flags)
 					iobuf.raw_data_header_pos = iobuf.raw_flushing_ends_before;
 					if (iobuf.raw_data_header_pos >= iobuf.out.size)
 						iobuf.raw_data_header_pos -= iobuf.out.size;
+					/* Yes, it is possible for this to make len > size for a while. */
 					iobuf.out.len += 4;
 				}
 
@@ -807,6 +810,7 @@ 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);
@@ -1312,9 +1316,10 @@ static void read_a_msg(void)
 		if (msg_bytes != 4 || am_sender)
 			goto invalid_msg;
 		data = perform_io(4, PIO_INPUT_AND_CONSUME);
-		io_error |= IVAL(data, 0);
+		val = IVAL(data, 0);
+		io_error |= val;
 		if (!am_generator)
-			send_msg(MSG_IO_ERROR, data, 4, 0);
+			send_msg_int(MSG_IO_ERROR, val);
 		break;
 	case MSG_IO_TIMEOUT:
 		if (msg_bytes != 4 || am_server || am_generator)
@@ -1324,7 +1329,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:
@@ -1391,19 +1396,21 @@ static void read_a_msg(void)
 			exit_cleanup(RERR_STREAMIO);
 		}
 		data = perform_io(4, PIO_INPUT_AND_CONSUME);
+		val = IVAL(data, 0);
 		if (am_generator)
-			got_flist_entry_status(FES_SUCCESS, IVAL(data, 0));
+			got_flist_entry_status(FES_SUCCESS, val);
 		else
-			successful_send(IVAL(data, 0));
+			successful_send(val);
 		break;
 	case MSG_NO_SEND:
 		if (msg_bytes != 4)
 			goto invalid_msg;
 		data = perform_io(4, PIO_INPUT_AND_CONSUME);
+		val = IVAL(data, 0);
 		if (am_generator)
-			got_flist_entry_status(FES_NO_SEND, IVAL(data, 0));
+			got_flist_entry_status(FES_NO_SEND, val);
 		else
-			send_msg(MSG_NO_SEND, data, 4, 0);
+			send_msg_int(MSG_NO_SEND, val);
 		break;
 	case MSG_ERROR_SOCKET:
 	case MSG_ERROR_UTF8:
@@ -1437,15 +1444,26 @@ static void read_a_msg(void)
 		}
 		break;
 	case MSG_ERROR_EXIT:
-		if (msg_bytes != 4)
+		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;
-		data = perform_io(4, PIO_INPUT_AND_CONSUME);
-		val = IVAL(data, 0);
-		if (am_generator && protocol_version >= 31)
-			send_msg_int(MSG_ERROR_EXIT, val);
-		if (am_generator)
-			val = RERR_RCVR_ERROR; /* avoids duplicate errors */
-		exit_cleanup(val);
+		/* 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" : "");
@@ -1894,7 +1912,7 @@ void write_buf(int f, const char *buf, size_t len)
 		goto batch_copy;
 	}
 
-	if (iobuf.out.size - iobuf.out.len < len)
+	if (iobuf.out.len + len > iobuf.out.size)
 		perform_io(len, PIO_NEED_OUTROOM);
 
 	pos = iobuf.out.pos + iobuf.out.len; /* Must be set after any flushing. */