don't clobber argv[0], so ps shows the right thing

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 32d47e6..e54ae8b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -25,6 +25,19 @@ struct stats stats;
 
 extern int verbose;
 
+
+/****************************************************************************
+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) {
+               msleep(20);
+               io_flush();
+       }
+       *status = WEXITSTATUS(*status);
+}
+
 static void report(int f)
 {
        time_t t = time(NULL);
@@ -336,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);
@@ -452,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);
@@ -490,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);
        }
        
@@ -541,11 +557,12 @@ static int start_client(int argc, char *argv[])
        extern int am_sender;
        extern char *shell_cmd;
        extern int rsync_port;
+       char *argv0 = strdup(argv[0]);
 
-       if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
+       if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
                char *host, *path;
 
-               host = argv[0] + strlen(URL_PREFIX);
+               host = argv0 + strlen(URL_PREFIX);
                p = strchr(host,'/');
                if (p) {
                        *p = 0;
@@ -561,12 +578,12 @@ static int start_client(int argc, char *argv[])
                return start_socket_client(host, path, argc-1, argv+1);
        }
 
-       p = find_colon(argv[0]);
+       p = find_colon(argv0);
 
        if (p) {
                if (p[1] == ':') {
                        *p = 0;
-                       return start_socket_client(argv[0], p+2, argc-1, argv+1);
+                       return start_socket_client(argv0, p+2, argc-1, argv+1);
                }
 
                if (argc < 1) {
@@ -628,6 +645,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);