Split code out into separate files and remove some global variables to

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 168f83e..b946e75 100644 (file)
--- a/main.c
+++ b/main.c
@@ -23,8 +23,7 @@
 
 time_t starttime = 0;
 
-struct stats stats;
-
+extern struct stats stats;
 extern int verbose;
 
 static void show_malloc_stats(void);
@@ -231,7 +230,7 @@ static pid_t do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int
        if (local_server) {
                if (read_batch)
                    create_flist_from_batch(); /* sets batch_flist */
-               ret = local_child(argc, args, f_in, f_out);
+               ret = local_child(argc, args, f_in, f_out, child_main);
        } else {
                ret = piped_child(args,f_in,f_out);
        }
@@ -493,6 +492,12 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 }
 
 
+void child_main(int argc, char *argv[])
+{
+       start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
+}
+
+
 void start_server(int f_in, int f_out, int argc, char *argv[])
 {
        extern int cvs_exclude;
@@ -796,6 +801,39 @@ static RETSIGTYPE sigchld_handler(int UNUSED(val)) {
 #endif
 }
 
+
+/**
+ * This routine catches signals and tries to send them to gdb.
+ *
+ * Because it's called from inside a signal handler it ought not to
+ * use too many library routines.
+ *
+ * @todo Perhaps use "screen -X" instead/as well, to help people
+ * debugging without easy access to X.  Perhaps use an environment
+ * variable, or just call a script?
+ *
+ * @todo The /proc/ magic probably only works on Linux (and
+ * Solaris?)  Can we be more portable?
+ **/
+#ifdef MAINTAINER_MODE
+static RETSIGTYPE rsync_panic_handler(int UNUSED(whatsig))
+{
+       char cmd_buf[300];
+       int ret;
+       sprintf(cmd_buf, 
+               "xterm -display :0 -T Panic -n Panic "
+               "-e gdb /proc/%d/exe %d", 
+               getpid(), getpid());
+
+       /* Unless we failed to execute gdb, we allow the process to
+        * continue.  I'm not sure if that's right. */
+       ret = system(cmd_buf);
+       if (ret)
+               _exit(ret);
+}
+#endif
+
+
 int main(int argc,char *argv[])
 {       
        extern int am_root;
@@ -814,6 +852,12 @@ int main(int argc,char *argv[])
        signal(SIGUSR1, sigusr1_handler);
        signal(SIGUSR2, sigusr2_handler);
        signal(SIGCHLD, sigchld_handler);
+#ifdef MAINTAINER_MODE
+       signal(SIGSEGV, rsync_panic_handler);
+       signal(SIGFPE, rsync_panic_handler);
+       signal(SIGABRT, rsync_panic_handler);
+       signal(SIGBUS, rsync_panic_handler);
+#endif /* def MAINTAINER_MODE */
 
        starttime = time(NULL);
        am_root = (getuid() == 0);
@@ -881,8 +925,10 @@ int main(int argc,char *argv[])
 
        ret = start_client(argc, argv);
        if (ret == -1) 
-           exit_cleanup(RERR_STARTCLIENT);
+               exit_cleanup(RERR_STARTCLIENT);
        else
-           exit_cleanup(ret);
-       return ret;
+               exit_cleanup(ret);
+
+       exit(ret);
+       /* NOTREACHED */
 }