X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/82980a23840452c069c37dd7c99c3ac937536847..205c27ac6717fc54709a326202c649e09e2c4f03:/main.c

diff --git a/main.c b/main.c
index 4bd721c7..648c2371 100644
--- a/main.c
+++ b/main.c
@@ -32,7 +32,7 @@ wait for a process to exit, calling io_flush while waiting
 void wait_process(pid_t pid, int *status)
 {
 	while (waitpid(pid, status, WNOHANG) == 0) {
-		sleep(1);
+		msleep(20);
 		io_flush();
 	}
 	*status = WEXITSTATUS(*status);
@@ -349,14 +349,13 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 		close(recv_pipe[1]);
 		io_flush();
 		/* finally we go to sleep until our parent kills us
-		   with a USR2 signal. We sleepp for a short time as on
+		   with a USR2 signal. We sleep for a short time as on
 		   some OSes a signal won't interrupt a sleep! */
-		while (1) sleep(1);
+		while (1) msleep(20);
 	}
 
 	close(recv_pipe[1]);
 	close(error_pipe[1]);
-	io_close_input(f_in);
 	if (f_in != f_out) close(f_in);
 
 	io_start_buffering(f_out);
@@ -465,7 +464,6 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 	int status = 0, status2 = 0;
 	char *local_name = NULL;
 	extern int am_sender;
-	extern int list_only;
 	extern int remote_version;
 
 	set_nonblocking(f_in);
@@ -503,13 +501,18 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
 		exit_cleanup(status);
 	}
 
-	if (argc == 0) list_only = 1;
+	if (argc == 0) {
+		extern int list_only;
+		list_only = 1;
+	}
 	
 	send_exclude_list(f_out);
 	
 	flist = recv_file_list(f_in);
 	if (!flist || flist->count == 0) {
-		rprintf(FINFO,"client: nothing to do\n");
+		rprintf(FINFO, "client: nothing to do: "
+                        "perhaps you need to specify some filenames or "
+                        "the --recursive option?\n");
 		exit_cleanup(0);
 	}
 	
@@ -641,6 +644,11 @@ static int start_client(int argc, char *argv[])
 		usage(FERROR);
 		exit_cleanup(RERR_SYNTAX);
 	}
+
+	if (argc == 0 && !am_sender) {
+		extern int list_only;
+		list_only = 1;
+	}
 	
 	pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);