X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/98f8c9a5e54d90043248f8c64228e15a2baeec30..7162c65df75c2cf20423e74776c9f6037518b6b0:/io.c

diff --git a/io.c b/io.c
index 5d5b030c..1cfcd722 100644
--- a/io.c
+++ b/io.c
@@ -679,8 +679,9 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
 		case MSG_INFO:
 		case MSG_ERROR:
 			if (remaining >= sizeof line) {
-				rprintf(FERROR, "multiplexing overflow %d:%ld\n\n",
-					tag, (long)remaining);
+				rprintf(FERROR,
+					"[%s] multiplexing overflow %d:%ld\n\n",
+					who_am_i(), tag, (long)remaining);
 				exit_cleanup(RERR_STREAMIO);
 			}
 			read_loop(fd, line, remaining);
@@ -688,7 +689,8 @@ static int readfd_unbuffered(int fd, char *buf, size_t len)
 			remaining = 0;
 			break;
 		default:
-			rprintf(FERROR, "unexpected tag %d\n", tag);
+			rprintf(FERROR, "[%s] unexpected tag %d\n",
+				who_am_i(), tag);
 			exit_cleanup(RERR_STREAMIO);
 		}
 	}
@@ -916,7 +918,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len)
 			/* If the other side is sending us error messages, try
 			 * to grab any messages they sent before they died. */
 			while (fd == sock_f_out && io_multiplexing_in) {
-				io_timeout = 30;
+				io_timeout = select_timeout = 30;
 				readfd_unbuffered(sock_f_in, io_filesfrom_buf,
 						  sizeof io_filesfrom_buf);
 			}