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

diff --git a/main.c b/main.c
index ac5c1d2f..f7e52bed 100644
--- a/main.c
+++ b/main.c
@@ -321,9 +321,12 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 		recv_files(f_in,flist,local_name,recv_pipe[1]);
 		report(f_in);
 
-		write_int(recv_pipe[1],-1);
+		write_int(recv_pipe[1],1);
+		close(recv_pipe[1]);
 		io_flush();
-		_exit(0);
+		/* finally we go to sleep until our parent kills us with
+		   a USR2 signal */
+		while (1) sleep(60);
 	}
 
 	close(recv_pipe[1]);
@@ -337,13 +340,15 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
 	generate_files(f_out,flist,local_name,recv_pipe[0]);
 
-	read_int(recv_pipe[1]);
+	read_int(recv_pipe[0]);
+	close(recv_pipe[0]);
 	if (remote_version >= 24) {
 		/* send a final goodbye message */
 		write_int(f_out, -1);
 	}
 	io_flush();
 
+	kill(pid, SIGUSR2);
 	wait_process(pid, &status);
 	return status;
 }
@@ -412,6 +417,9 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 
 	setup_protocol(f_out, f_in);
 
+	set_nonblocking(f_in);
+	set_nonblocking(f_out);
+
 	if (remote_version >= 23)
 		io_start_multiplex_out(f_out);
 
@@ -435,6 +443,9 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 	extern int list_only;
 	extern int remote_version;
 
+	set_nonblocking(f_in);
+	set_nonblocking(f_out);
+
 	setup_protocol(f_out,f_in);
 
 	if (remote_version >= 23)
@@ -621,6 +632,10 @@ static RETSIGTYPE sigusr1_handler(int val) {
 	exit_cleanup(RERR_SIGNAL);
 }
 
+static RETSIGTYPE sigusr2_handler(int val) {
+	_exit(0);
+}
+
 int main(int argc,char *argv[])
 {       
 	extern int am_root;
@@ -630,6 +645,7 @@ int main(int argc,char *argv[])
 	extern int am_server;
 
 	signal(SIGUSR1, sigusr1_handler);
+	signal(SIGUSR2, sigusr2_handler);
 
 	starttime = time(NULL);
 	am_root = (getuid() == 0);
@@ -685,6 +701,8 @@ int main(int argc,char *argv[])
 #endif
 
 	if (am_server) {
+		set_nonblocking(STDIN_FILENO);
+		set_nonblocking(STDOUT_FILENO);
 		start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
 	}