new error handling system

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 8e69fad..dae6e79 100644 (file)
--- 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,7 +125,7 @@ static void report(int f)
 }
 
 
-/* Start the remote shell. */
+/* Start the remote shell.   cmd may be NULL to use the default. */
 /* 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,
@@ -547,7 +553,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)
@@ -693,6 +699,8 @@ static RETSIGTYPE sigusr1_handler(int val) {
 }
 
 static RETSIGTYPE sigusr2_handler(int val) {
+       extern int log_got_error;
+       if (log_got_error) _exit(RERR_FILEIO);
        _exit(0);
 }
 
@@ -703,6 +711,7 @@ 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);
@@ -721,18 +730,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 +773,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;
 }