X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b11ed3b1504d526a4b571bc3d80f4e5f1628dc75..27d3cdbc943a57d64f4f2a35a4f1e1b15d9ca41f:/main.c

diff --git a/main.c b/main.c
index 2cd5912b..146f1e53 100644
--- a/main.c
+++ b/main.c
@@ -36,7 +36,7 @@ static void report(int f)
 	extern int do_stats;
 
 	if (am_daemon) {
-		syslog(LOG_INFO,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
+		rprintf(FLOG,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
 		       (double)stats.total_written,
 		       (double)stats.total_read,
 		       (double)stats.total_size);
@@ -250,15 +250,15 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 		argv[0] = ".";
 	}
 	
+	set_nonblocking(f_out);
+	if (f_in != f_out)
+		set_nonblocking(f_in);
+		
 	flist = send_file_list(f_out,argc,argv);
 	if (!flist || flist->count == 0) {
 		exit_cleanup(0);
 	}
 
-	set_nonblocking(f_out);
-	if (f_in != f_out)
-		set_nonblocking(f_in);
-		
 	send_files(flist,f_out,f_in);
 	report(f_out);
 	io_flush();
@@ -288,6 +288,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 		if (f_in != f_out) close(f_out);
 
 		set_nonblocking(f_in);
+		set_nonblocking(recv_pipe[1]);
 
 		recv_files(f_in,flist,local_name,recv_pipe[1]);
 		report(f_in);
@@ -301,6 +302,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	if (f_in != f_out) close(f_in);
 
 	set_nonblocking(f_out);
+	set_nonblocking(recv_pipe[0]);
 
 	io_start_buffering(f_out);
 
@@ -362,8 +364,12 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 	extern int cvs_exclude;
 	extern int am_sender;
 
+	set_nonblocking(f_out);
+	if (f_in != f_out)
+		set_nonblocking(f_in);
+			
 	setup_protocol(f_out, f_in);
-	
+
 	if (am_sender) {
 		recv_exclude_list(f_in);
 		if (cvs_exclude)
@@ -538,7 +544,7 @@ static int start_client(int argc, char *argv[])
 }
 
 
-RETSIGTYPE sigusr1_handler(int val) {
+static RETSIGTYPE sigusr1_handler(int val) {
 	exit_cleanup(1);
 }
 
@@ -578,6 +584,7 @@ int main(int argc,char *argv[])
 	signal(SIGINT,SIGNAL_CAST sig_int);
 	signal(SIGPIPE,SIGNAL_CAST sig_int);
 	signal(SIGHUP,SIGNAL_CAST sig_int);
+	signal(SIGTERM,SIGNAL_CAST sig_int);
 
 	if (am_daemon) {
 		return daemon_main();