X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/305ab1331bda5ed1c4678bd720865ad1ee7fc7ce..ba35824322939b54352443461bc645c29f61cfb6:/main.c

diff --git a/main.c b/main.c
index 8e69fad3..f696474c 100644
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
 /* -*- c-file-style: "linux" -*-
    
-   Copyright (C) 1996-2001 by Andrew Tridgell 
+   Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
    Copyright (C) Paul Mackerras 1996
    
    This program is free software; you can redistribute it and/or modify
@@ -36,6 +36,12 @@ void wait_process(pid_t pid, int *status)
 		msleep(20);
 		io_flush();
 	}
+        
+        /* TODO: If the child exited on a signal, then log an
+         * appropriate error message.  Perhaps we should also accept a
+         * message describing the purpose of the child.  Also indicate
+         * this to the caller so that thhey know something went
+         * wrong.  */
 	*status = WEXITSTATUS(*status);
 }
 
@@ -119,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;
@@ -478,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);
@@ -547,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)
@@ -577,7 +574,8 @@ 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;
@@ -693,9 +691,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;
@@ -703,9 +706,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);
@@ -721,18 +726,13 @@ int main(int argc,char *argv[])
 	   carried across */
 	orig_umask = (int)umask(0);
 
-	if (!parse_arguments(argc, argv, 1)) {
+	if (!parse_arguments(&argc, (const char ***) &argv, 1)) {
                 /* FIXME: We ought to call the same error-handling
                  * code here, rather than relying on getopt. */
-		/* option_error(); */
+		option_error();
 		exit_cleanup(RERR_SYNTAX);
 	}
 
-	argc -= optind;
-	argv += optind;
-	optind = 0;
-
-	signal(SIGCHLD,SIG_IGN);
 	signal(SIGINT,SIGNAL_CAST sig_int);
 	signal(SIGPIPE,SIGNAL_CAST sig_int);
 	signal(SIGHUP,SIGNAL_CAST sig_int);
@@ -769,6 +769,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;
 }