X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a1a440c23e50c1a711bbe404456234895b8db79d..8ca5756339487aa97594c4ea60555c9050a703bf:/main.c

diff --git a/main.c b/main.c
index 63fab0dc..4ecf46d1 100644
--- a/main.c
+++ b/main.c
@@ -504,16 +504,16 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 			rprintf(FINFO,"file list sent\n");
 
 		send_files(flist,f_out,f_in);
+		if (remote_version >= 24) {
+			/* final goodbye message */		
+			read_int(f_in);
+		}
 		if (pid != -1) {
 			if (verbose > 3)
 				rprintf(FINFO,"client_run waiting on %d\n",pid);
 			io_flush();
 			wait_process(pid, &status);
 		}
-		if (remote_version >= 24) {
-			/* final goodbye message */		
-			read_int(f_in);
-		}
 		report(-1);
 		exit_cleanup(status);
 	}
@@ -700,6 +700,9 @@ static RETSIGTYPE sigusr2_handler(int val) {
 }
 
 static RETSIGTYPE sigchld_handler(int val) {
+#ifdef WNOHANG
+	while (waitpid(-1, NULL, WNOHANG) > 0) ;
+#endif
 }
 
 int main(int argc,char *argv[])