applied simple nohang patch from Wayne Davison

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index d12dea3..38df5a0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -125,24 +125,12 @@ static void report(int f)
 }
 
 
-/* Start the remote shell. */
-/* TODO: When the shell exits, look at its return value, as this may
- * well tell us if something went wrong in trying to connect to the
- * remote machine.  Although it doesn't seem to be specified anywhere,
- * ssh and the shell seem to return these values:
- *
- * 124 if the command exited with status 255
- * 125 if the command is killed by a signal
- * 126 if the command cannot be run
- * 127 if the command is not found
- *
- * and we could use this to give a better explanation if the remote
- * command is not found.
- */
-static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+/* Start the remote shell.   cmd may be NULL to use the default. */
+static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
 {
        char *args[100];
-       int i,argc=0, ret;
+       int i,argc=0;
+       pid_t ret;
        char *tok,*dir=NULL;
        extern int local_server;
        extern char *rsync_path;
@@ -484,13 +472,16 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
  * This is called once the connection has been negotiated.  It is used
  * for rsyncd, remote-shell, and local connections.
  */
-int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
+int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 {
        struct file_list *flist;
        int status = 0, status2 = 0;
        char *local_name = NULL;
        extern int am_sender;
        extern int remote_version;
+       extern pid_t cleanup_child_pid;
+
+       cleanup_child_pid = pid;
 
        set_nonblocking(f_in);
        set_nonblocking(f_out);
@@ -513,16 +504,16 @@ int client_run(int f_in, int f_out, int 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);
        }
@@ -553,7 +544,7 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
                wait_process(pid, &status);
        }
        
-       return status | status2;
+       return MAX(status, status2);
 }
 
 static char *find_colon(char *s)
@@ -583,12 +574,14 @@ static int start_client(int argc, char *argv[])
        char *shell_machine = NULL;
        char *shell_path = NULL;
        char *shell_user = NULL;
-       int pid, ret;
+       int ret;
+       pid_t pid;
        int f_in,f_out;
        extern int local_server;
        extern int am_sender;
        extern char *shell_cmd;
        extern int rsync_port;
+       extern int whole_file;
        char *argv0 = strdup(argv[0]);
 
        if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
@@ -635,6 +628,8 @@ static int start_client(int argc, char *argv[])
                p = find_colon(argv[argc-1]);
                if (!p) {
                        local_server = 1;
+                       /* disable "rsync algorithm" when both sides local */
+                       whole_file = 1;
                } else if (p[1] == ':') {
                        *p = 0;
                        return start_socket_client(argv[argc-1], p+2, argc-1, argv);
@@ -699,9 +694,14 @@ static RETSIGTYPE sigusr1_handler(int val) {
 }
 
 static RETSIGTYPE sigusr2_handler(int val) {
+       extern int log_got_error;
+       if (log_got_error) _exit(RERR_PARTIAL);
        _exit(0);
 }
 
+static RETSIGTYPE sigchld_handler(int val) {
+}
+
 int main(int argc,char *argv[])
 {       
        extern int am_root;
@@ -709,9 +709,11 @@ int main(int argc,char *argv[])
        extern int dry_run;
        extern int am_daemon;
        extern int am_server;
+       int ret;
 
        signal(SIGUSR1, sigusr1_handler);
        signal(SIGUSR2, sigusr2_handler);
+       signal(SIGCHLD, sigchld_handler);
 
        starttime = time(NULL);
        am_root = (getuid() == 0);
@@ -734,7 +736,6 @@ int main(int argc,char *argv[])
                exit_cleanup(RERR_SYNTAX);
        }
 
-       signal(SIGCHLD,SIG_IGN);
        signal(SIGINT,SIGNAL_CAST sig_int);
        signal(SIGPIPE,SIGNAL_CAST sig_int);
        signal(SIGHUP,SIGNAL_CAST sig_int);
@@ -771,6 +772,8 @@ int main(int argc,char *argv[])
                start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
        }
 
-       return start_client(argc, argv);
+       ret = start_client(argc, argv);
+       exit_cleanup(ret);
+       return ret;
 }