X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/67b8f3dfe7d2ae0aa31ece00242e990ed8e256a4..da1319128ac3e8d563a6959e82e471e8f5544a83:/io.c

diff --git a/io.c b/io.c
index 326b2d09..62990b97 100644
--- a/io.c
+++ b/io.c
@@ -377,6 +377,10 @@ static void read_msg_fd(void)
 		}
 		flist = recv_file_list(fd);
 		flist->parent_ndx = IVAL(buf,0);
+#ifdef SUPPORT_HARD_LINKS
+		if (preserve_hard_links)
+			match_hard_links(flist);
+#endif
 		break;
 	case MSG_FLIST_EOF:
 		if (len != 0 || !am_generator || !inc_recurse)
@@ -1435,7 +1439,7 @@ static void writefd_unbuffered(int fd, const char *buf, size_t len)
 				(long)len, who_am_i());
 			/* 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) {
+			while (!am_server && fd == sock_f_out && io_multiplexing_in) {
 				set_io_timeout(30);
 				ignore_timeout = 0;
 				readfd_unbuffered(sock_f_in, io_filesfrom_buf,