My modified version of Chris Shoemaker's improved batch-file handling.
[rsync/rsync.git] / main.c
diff --git a/main.c b/main.c
index 44ad964..b34127c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,17 +1,19 @@
-/* 
-   Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+
+   Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
    Copyright (C) Paul Mackerras 1996
-   
+   Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 #include "rsync.h"
 
-int verbose = 0;
-int always_checksum = 0;
-time_t starttime;
-off_t total_size = 0;
-int block_size=BLOCK_SIZE;
-
-char *backup_suffix = BACKUP_SUFFIX;
-
-static char *rsync_path = RSYNC_NAME;
-
-int make_backups = 0;
-int preserve_links = 0;
-int preserve_hard_links = 0;
-int preserve_perms = 0;
-int preserve_devices = 0;
-int preserve_uid = 0;
-int preserve_gid = 0;
-int preserve_times = 0;
-int update_only = 0;
-int cvs_exclude = 0;
-int dry_run=0;
-int local_server=0;
-int ignore_times=0;
-int delete_mode=0;
-int one_file_system=0;
-int remote_version=0;
-int sparse_files=0;
-int do_compression=0;
-
-extern int csum_length;
-
-int am_server = 0;
-static int sender = 0;
-int recurse = 0;
-
-static void usage(FILE *f);
+time_t starttime = 0;
+
+extern struct stats stats;
+extern int am_root;
+extern int am_server;
+extern int am_sender;
+extern int am_generator;
+extern int am_daemon;
+extern int verbose;
+extern int blocking_io;
+extern int cvs_exclude;
+extern int delete_mode;
+extern int delete_excluded;
+extern int delete_after;
+extern int daemon_over_rsh;
+extern int do_stats;
+extern int dry_run;
+extern int list_only;
+extern int local_server;
+extern int log_got_error;
+extern int module_id;
+extern int orig_umask;
+extern int keep_dirlinks;
+extern int preserve_hard_links;
+extern int protocol_version;
+extern int recurse;
+extern int relative_paths;
+extern int rsync_port;
+extern int whole_file;
+extern int read_batch;
+extern int write_batch;
+extern int batch_fd;
+extern int filesfrom_fd;
+extern pid_t cleanup_child_pid;
+extern char *files_from;
+extern char *remote_filesfrom_file;
+extern char *rsync_path;
+extern char *shell_cmd;
+extern char *batch_prefix;
+
+
+/* there's probably never more than at most 2 outstanding child processes,
+ * but set it higher just in case.
+ */
+#define MAXCHILDPROCS 5
+
+struct pid_status {
+       pid_t pid;
+       int   status;
+} pid_stat_table[MAXCHILDPROCS];
+
+static void show_malloc_stats(void);
+
+/****************************************************************************
+wait for a process to exit, calling io_flush while waiting
+****************************************************************************/
+void wait_process(pid_t pid, int *status)
+{
+       pid_t waited_pid;
+       int cnt;
+
+       while ((waited_pid = waitpid(pid, status, WNOHANG)) == 0) {
+               msleep(20);
+               io_flush(FULL_FLUSH);
+       }
+
+       if (waited_pid == -1 && errno == ECHILD) {
+               /* status of requested child no longer available.
+                * check to see if it was processed by the sigchld_handler.
+                */
+               for (cnt = 0;  cnt < MAXCHILDPROCS; cnt++) {
+                       if (pid == pid_stat_table[cnt].pid) {
+                               *status = pid_stat_table[cnt].status;
+                               pid_stat_table[cnt].pid = 0;
+                               break;
+                       }
+               }
+       }
+
+       /* 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);
+}
 
+/* This function gets called from all 3 processes.  We want the client side
+ * to actually output the text, but the sender is the only process that has
+ * all the stats we need.  So, if we're a client sender, we do the report.
+ * If we're a server sender, we write the stats on the supplied fd.  If
+ * we're the client receiver we read the stats from the supplied fd and do
+ * the report.  All processes might also generate a set of debug stats, if
+ * the verbose level is high enough (this is the only thing that the
+ * generator process and the server receiver ever do here). */
 static void report(int f)
 {
-  int in,out,tsize;
-  time_t t = time(NULL);
-  
-  if (!verbose) return;
-
-  if (am_server && sender) {
-    write_int(f,read_total());
-    write_int(f,write_total());
-    write_int(f,total_size);
-    write_flush(f);
-    return;
-  }
-    
-  if (sender) {
-    in = read_total();
-    out = write_total();
-    tsize = (int)total_size;
-  } else {
-    in = read_int(f);
-    out = read_int(f);
-    tsize = read_int(f);
-  }
-
-  printf("wrote %d bytes  read %d bytes  %g bytes/sec\n",
-        out,in,(in+out)/(0.5 + (t-starttime)));        
-  printf("total size is %d  speedup is %g\n",
-        tsize,(1.0*tsize)/(in+out));
+       /* Cache two stats because the read/write code can change it. */
+       int64 total_read = stats.total_read;
+       int64 total_written = stats.total_written;
+       time_t t = time(NULL);
+
+       if (do_stats && verbose > 1) {
+               /* These come out from every process */
+               show_malloc_stats();
+               show_flist_stats();
+       }
+
+       if (am_generator)
+               return;
+
+       if (am_daemon) {
+               log_exit(0, __FILE__, __LINE__);
+               if (f == -1 || !am_sender)
+                       return;
+       }
+
+       if (am_server) {
+               if (am_sender) {
+                       write_longint(f, total_read);
+                       write_longint(f, total_written);
+                       write_longint(f, stats.total_size);
+               }
+               return;
+       }
+
+       /* this is the client */
+
+       if (!am_sender) {
+               total_written = read_longint(f);
+               total_read = read_longint(f);
+               stats.total_size = read_longint(f);
+       } else if (write_batch) {
+               /* The --read-batch process is going to be a client
+                * receiver, so we need to give it the stats. */
+               write_longint(batch_fd, total_read);
+               write_longint(batch_fd, total_written);
+               write_longint(batch_fd, stats.total_size);
+       }
+
+       if (do_stats) {
+               rprintf(FINFO,"\nNumber of files: %d\n", stats.num_files);
+               rprintf(FINFO,"Number of files transferred: %d\n",
+                       stats.num_transferred_files);
+               rprintf(FINFO,"Total file size: %.0f bytes\n",
+                       (double)stats.total_size);
+               rprintf(FINFO,"Total transferred file size: %.0f bytes\n",
+                       (double)stats.total_transferred_size);
+               rprintf(FINFO,"Literal data: %.0f bytes\n",
+                       (double)stats.literal_data);
+               rprintf(FINFO,"Matched data: %.0f bytes\n",
+                       (double)stats.matched_data);
+               rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+               rprintf(FINFO,"Total bytes written: %.0f\n",
+                       (double)total_written);
+               rprintf(FINFO,"Total bytes read: %.0f\n",
+                       (double)total_read);
+       }
+
+       if (verbose || do_stats) {
+               rprintf(FINFO,
+                       "\nwrote %.0f bytes  read %.0f bytes  %.2f bytes/sec\n",
+                       (double)total_written, (double)total_read,
+                       (total_written + total_read)/(0.5 + (t - starttime)));
+               rprintf(FINFO, "total size is %.0f  speedup is %.2f\n",
+                       (double)stats.total_size,
+                       (double)stats.total_size / (total_written+total_read));
+       }
+
+       fflush(stdout);
+       fflush(stderr);
 }
 
 
-static void server_options(char **args,int *argc)
+/**
+ * If our C library can get malloc statistics, then show them to FINFO
+ **/
+static void show_malloc_stats(void)
 {
-  int ac = *argc;
-  static char argstr[50];
-  static char bsize[30];
-  int i, x;
-
-  args[ac++] = "--server";
-
-  if (!sender)
-    args[ac++] = "--sender";
-
-  x = 1;
-  argstr[0] = '-';
-  for (i=0;i<verbose;i++)
-    argstr[x++] = 'v';
-  if (make_backups)
-    argstr[x++] = 'b';
-  if (update_only)
-    argstr[x++] = 'u';
-  if (dry_run)
-    argstr[x++] = 'n';
-  if (preserve_links)
-    argstr[x++] = 'l';
-  if (preserve_hard_links)
-    argstr[x++] = 'H';
-  if (preserve_uid)
-    argstr[x++] = 'o';
-  if (preserve_gid)
-    argstr[x++] = 'g';
-  if (preserve_devices)
-    argstr[x++] = 'D';
-  if (preserve_times)
-    argstr[x++] = 't';
-  if (preserve_perms)
-    argstr[x++] = 'p';
-  if (recurse)
-    argstr[x++] = 'r';
-  if (always_checksum)
-    argstr[x++] = 'c';
-  if (cvs_exclude)
-    argstr[x++] = 'C';
-  if (ignore_times)
-    argstr[x++] = 'I';
-  if (one_file_system)
-    argstr[x++] = 'x';
-  if (sparse_files)
-    argstr[x++] = 'S';
-  if (do_compression)
-    argstr[x++] = 'z';
-  argstr[x] = 0;
-
-  if (x != 1) args[ac++] = argstr;
-
-  if (block_size != BLOCK_SIZE) {
-    sprintf(bsize,"-B%d",block_size);
-    args[ac++] = bsize;
-  }    
-
-  if (delete_mode)
-    args[ac++] = "--delete";
-
-  *argc = ac;
+#ifdef HAVE_MALLINFO
+       struct mallinfo mi;
+
+       mi = mallinfo();
+
+       rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n",
+               getpid(),
+               am_server ? "server " : "",
+               am_daemon ? "daemon " : "",
+               who_am_i());
+       rprintf(FINFO, "  arena:     %10d   (bytes from sbrk)\n", mi.arena);
+       rprintf(FINFO, "  ordblks:   %10d   (chunks not in use)\n", mi.ordblks);
+       rprintf(FINFO, "  smblks:    %10d\n", mi.smblks);
+       rprintf(FINFO, "  hblks:     %10d   (chunks from mmap)\n", mi.hblks);
+       rprintf(FINFO, "  hblkhd:    %10d   (bytes from mmap)\n", mi.hblkhd);
+       rprintf(FINFO, "  allmem:    %10d   (bytes from sbrk + mmap)\n",
+           mi.arena + mi.hblkhd);
+       rprintf(FINFO, "  usmblks:   %10d\n", mi.usmblks);
+       rprintf(FINFO, "  fsmblks:   %10d\n", mi.fsmblks);
+       rprintf(FINFO, "  uordblks:  %10d   (bytes used)\n", mi.uordblks);
+       rprintf(FINFO, "  fordblks:  %10d   (bytes free)\n", mi.fordblks);
+       rprintf(FINFO, "  keepcost:  %10d   (bytes in releasable chunk)\n", mi.keepcost);
+#endif /* HAVE_MALLINFO */
 }
 
 
-
-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;
-  char *tok,*p;
-
-  if (!local_server) {
-    if (!cmd)
-      cmd = getenv(RSYNC_RSH_ENV);
-    if (!cmd)
-      cmd = RSYNC_RSH;
-    cmd = strdup(cmd);
-    if (!cmd) 
-      goto oom;
-
-    for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
-      args[argc++] = tok;
-    }
-
-    if (user) {
-      args[argc++] = "-l";
-      args[argc++] = user;
-    }
-    args[argc++] = machine;
-  }
-
-  args[argc++] = rsync_path;
-
-  server_options(args,&argc);
-
-  if (path && *path) {
-    char *dir = strdup(path);
-    p = strrchr(dir,'/');
-    if (p) {
-      *p = 0;
-      args[argc++] = dir;
-      p++;
-    } else {
-      args[argc++] = ".";
-      p = dir;
-    }
-    if (p[0])
-      args[argc++] = path;
-  }
-
-  args[argc] = NULL;
-
-  if (verbose > 3) {
-    fprintf(FERROR,"cmd=");
-    for (i=0;i<argc;i++)
-      fprintf(FERROR,"%s ",args[i]);
-    fprintf(FERROR,"\n");
-  }
-
-  return piped_child(args,f_in,f_out);
+       int i, argc = 0;
+       char *args[MAX_ARGS];
+       pid_t ret;
+       char *tok, *dir = NULL;
+       int dash_l_set = 0;
+
+       if (!read_batch && !local_server) {
+               char *rsh_env = getenv(RSYNC_RSH_ENV);
+               if (!cmd)
+                       cmd = rsh_env;
+               if (!cmd)
+                       cmd = RSYNC_RSH;
+               cmd = strdup(cmd);
+               if (!cmd)
+                       goto oom;
+
+               for (tok = strtok(cmd, " "); tok; tok = strtok(NULL, " ")) {
+                       /* Comparison leaves rooms for server_options(). */
+                       if (argc >= MAX_ARGS - 100) {
+                               rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       args[argc++] = tok;
+               }
+
+               /* check to see if we've already been given '-l user' in
+                * the remote-shell command */
+               for (i = 0; i < argc-1; i++) {
+                       if (!strcmp(args[i], "-l") && args[i+1][0] != '-')
+                               dash_l_set = 1;
+               }
+
+#if HAVE_REMSH
+               /* remsh (on HPUX) takes the arguments the other way around */
+               args[argc++] = machine;
+               if (user && !(daemon_over_rsh && dash_l_set)) {
+                       args[argc++] = "-l";
+                       args[argc++] = user;
+               }
+#else
+               if (user && !(daemon_over_rsh && dash_l_set)) {
+                       args[argc++] = "-l";
+                       args[argc++] = user;
+               }
+               args[argc++] = machine;
+#endif
+
+               args[argc++] = rsync_path;
+
+               if (blocking_io < 0) {
+                       char *cp;
+                       if ((cp = strrchr(cmd, '/')) != NULL)
+                               cp++;
+                       else
+                               cp = cmd;
+                       if (strcmp(cp, "rsh") == 0 || strcmp(cp, "remsh") == 0)
+                               blocking_io = 1;
+               }
+
+               server_options(args,&argc);
+
+               if (argc >= MAX_ARGS - 2) {
+                       rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+                       exit_cleanup(RERR_SYNTAX);
+               }
+       }
+
+       args[argc++] = ".";
+
+       if (!daemon_over_rsh && path && *path)
+               args[argc++] = path;
+
+       args[argc] = NULL;
+
+       if (verbose > 3) {
+               rprintf(FINFO,"cmd=");
+               for (i = 0; i < argc; i++)
+                       rprintf(FINFO,"%s ",args[i]);
+               rprintf(FINFO,"\n");
+       }
+
+       if (local_server) {
+               /* If the user didn't request --[no-]whole-file, force
+                * it on, but only if we're not batch processing. */
+               if (whole_file < 0 && !read_batch && !write_batch)
+                       whole_file = 1;
+               ret = local_child(argc, args, f_in, f_out, child_main);
+       } else {
+               ret = piped_child(args,f_in,f_out);
+       }
+
+       if (dir)
+               free(dir);
+
+       return ret;
 
 oom:
-  out_of_memory("do_cmd");
-  return 0; /* not reached */
+       out_of_memory("do_cmd");
+       return 0; /* not reached */
 }
 
 
+static char *get_local_name(struct file_list *flist,char *name)
+{
+       STRUCT_STAT st;
+       int e;
+
+       if (verbose > 2)
+               rprintf(FINFO,"get_local_name count=%d %s\n",
+                       flist->count, NS(name));
+
+       if (!name)
+               return NULL;
+
+       if (do_stat(name,&st) == 0) {
+               if (S_ISDIR(st.st_mode)) {
+                       if (!push_dir(name)) {
+                               rsyserr(FERROR, errno, "push_dir#1 %s failed",
+                                       full_fname(name));
+                               exit_cleanup(RERR_FILESELECT);
+                       }
+                       return NULL;
+               }
+               if (flist->count > 1) {
+                       rprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
+                       exit_cleanup(RERR_FILESELECT);
+               }
+               return name;
+       }
+
+       if (flist->count <= 1 && ((e = strlen(name)) <= 1 || name[e-1] != '/'))
+               return name;
+
+       if (do_mkdir(name,0777 & ~orig_umask) != 0) {
+               rsyserr(FERROR, errno, "mkdir %s failed", full_fname(name));
+               exit_cleanup(RERR_FILEIO);
+       } else {
+               if (verbose > 0)
+                       rprintf(FINFO,"created directory %s\n",name);
+       }
 
+       if (!push_dir(name)) {
+               rsyserr(FERROR, errno, "push_dir#2 %s failed",
+                       full_fname(name));
+               exit_cleanup(RERR_FILESELECT);
+       }
 
-static char *get_local_name(struct file_list *flist,char *name)
+       return NULL;
+}
+
+
+static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 {
-  struct stat st;
-
-  if (stat(name,&st) == 0) {
-    if (S_ISDIR(st.st_mode)) {
-      if (chdir(name) != 0) {
-       fprintf(FERROR,"chdir %s : %s\n",name,strerror(errno));
-       exit_cleanup(1);
-      }
-      return NULL;
-    }
-    if (flist->count > 1) {
-      fprintf(FERROR,"ERROR: destination must be a directory when copying more than 1 file\n");
-      exit_cleanup(1);
-    }
-    return name;
-  }
-
-  if (flist->count == 1)
-    return name;
-
-  if (!name) 
-    return NULL;
-
-  if (mkdir(name,0777) != 0) {
-    fprintf(FERROR,"mkdir %s : %s\n",name,strerror(errno));
-    exit_cleanup(1);
-  } else {
-    fprintf(FINFO,"created directory %s\n",name);
-  }
-
-  if (chdir(name) != 0) {
-    fprintf(FERROR,"chdir %s : %s\n",name,strerror(errno));
-    exit_cleanup(1);
-  }
-
-  return NULL;
+       int i;
+       struct file_list *flist;
+       char *dir = argv[0];
+
+       if (verbose > 2) {
+               rprintf(FINFO, "server_sender starting pid=%ld\n",
+                       (long)getpid());
+       }
+
+       if (am_daemon && lp_write_only(module_id) && am_sender) {
+               rprintf(FERROR, "ERROR: module is write only\n");
+               exit_cleanup(RERR_SYNTAX);
+               return;
+       }
+
+       if (!relative_paths && !push_dir(dir)) {
+               rsyserr(FERROR, errno, "push_dir#3 %s failed",
+                       full_fname(dir));
+               exit_cleanup(RERR_FILESELECT);
+       }
+       argc--;
+       argv++;
+
+       if (strcmp(dir,".")) {
+               int l = strlen(dir);
+               if (strcmp(dir,"/") == 0)
+                       l = 0;
+               for (i = 0; i < argc; i++)
+                       argv[i] += l+1;
+       }
+
+       if (argc == 0 && recurse) {
+               argc = 1;
+               argv--;
+               argv[0] = ".";
+       }
+
+       flist = send_file_list(f_out,argc,argv);
+       if (!flist || flist->count == 0) {
+               exit_cleanup(0);
+       }
+
+       io_start_buffering_in(f_in);
+       io_start_buffering_out(f_out);
+       send_files(flist,f_out,f_in);
+       io_flush(FULL_FLUSH);
+       report(f_out);
+       if (protocol_version >= 24) {
+               /* final goodbye message */
+               read_int(f_in);
+       }
+       io_flush(FULL_FLUSH);
+       exit_cleanup(0);
 }
 
 
+static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
+{
+       int pid;
+       int status = 0;
+       int error_pipe[2];
+
+       if (preserve_hard_links)
+               init_hard_links(flist);
+
+       if (!delete_after) {
+               /* I moved this here from recv_files() to prevent a race condition */
+               if (recurse && delete_mode && !local_name && flist->count>0) {
+                       delete_files(flist);
+               }
+       }
+
+       if (fd_pair(error_pipe) < 0) {
+               rprintf(FERROR,"error pipe failed in do_recv\n");
+               exit_cleanup(RERR_SOCKETIO);
+       }
+
+       io_flush(NORMAL_FLUSH);
+
+       if ((pid = do_fork()) == 0) {
+               close(error_pipe[0]);
+               if (f_in != f_out)
+                       close(f_out);
+
+               /* we can't let two processes write to the socket at one time */
+               io_multiplexing_close();
+
+               /* set place to send errors */
+               set_msg_fd_out(error_pipe[1]);
+
+               recv_files(f_in,flist,local_name);
+               io_flush(FULL_FLUSH);
+               report(f_in);
+
+               send_msg(MSG_DONE, "", 0);
+               io_flush(FULL_FLUSH);
+               /* finally we go to sleep until our parent kills us
+                * with a USR2 signal. We sleep for a short time as on
+                * some OSes a signal won't interrupt a sleep! */
+               while (1)
+                       msleep(20);
+       }
 
+       am_generator = 1;
+       if (write_batch)
+               stop_write_batch();
 
-void do_server_sender(int argc,char *argv[])
+       close(error_pipe[1]);
+       if (f_in != f_out)
+               close(f_in);
+
+       io_start_buffering_out(f_out);
+
+       set_msg_fd_in(error_pipe[0]);
+
+       generate_files(f_out, flist, local_name);
+
+       get_redo_num(); /* Read final MSG_DONE and any prior messages. */
+       report(-1);
+       io_flush(FULL_FLUSH);
+       if (protocol_version >= 24) {
+               /* send a final goodbye message */
+               write_int(f_out, -1);
+       }
+       io_flush(FULL_FLUSH);
+
+       set_msg_fd_in(-1);
+       kill(pid, SIGUSR2);
+       wait_process(pid, &status);
+       return status;
+}
+
+
+static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 {
-  int i;
-  char *dir = argv[0];
-  struct file_list *flist;
-
-  if (verbose > 2)
-    fprintf(FERROR,"server_sender starting pid=%d\n",(int)getpid());
-  
-  if (chdir(dir) != 0) {
-    fprintf(FERROR,"chdir %s: %s\n",dir,strerror(errno));
-    exit_cleanup(1);
-  }
-  argc--;
-  argv++;
-  
-  if (strcmp(dir,".")) {
-    int l = strlen(dir);
-    for (i=0;i<argc;i++)
-      argv[i] += l+1;
-  }
-
-  if (argc == 0 && recurse) {
-    argc=1;
-    argv--;
-    argv[0] = ".";
-  }
-    
-
-  flist = send_file_list(STDOUT_FILENO,recurse,argc,argv);
-  send_files(flist,STDOUT_FILENO,STDIN_FILENO);
-  report(STDOUT_FILENO);
-  exit_cleanup(0);
+       int status;
+       struct file_list *flist;
+       char *local_name = NULL;
+       char *dir = NULL;
+
+       if (verbose > 2) {
+               rprintf(FINFO, "server_recv(%d) starting pid=%ld\n",
+                       argc, (long)getpid());
+       }
+
+       if (am_daemon && lp_read_only(module_id) && !am_sender) {
+               rprintf(FERROR,"ERROR: module is read only\n");
+               exit_cleanup(RERR_SYNTAX);
+               return;
+       }
+
+
+       if (argc > 0) {
+               dir = argv[0];
+               argc--;
+               argv++;
+               if (!am_daemon && !push_dir(dir)) {
+                       rsyserr(FERROR, errno, "push_dir#4 %s failed",
+                               full_fname(dir));
+                       exit_cleanup(RERR_FILESELECT);
+               }
+       }
+
+       io_start_buffering_in(f_in);
+       if (delete_mode && !delete_excluded)
+               recv_exclude_list(f_in);
+
+       if (filesfrom_fd >= 0) {
+               /* We're receiving the file info from the sender, so we need
+                * the IO routines to automatically write out the names onto
+                * our f_out socket as we read the list info from the sender.
+                * This avoids both deadlock and extra delays/buffers. */
+               io_set_filesfrom_fds(filesfrom_fd, f_out);
+               filesfrom_fd = -1;
+       }
+
+       flist = recv_file_list(f_in);
+       if (!flist) {
+               rprintf(FERROR,"server_recv: recv_file_list error\n");
+               exit_cleanup(RERR_FILESELECT);
+       }
+
+       if (argc > 0) {
+               if (strcmp(dir,".")) {
+                       argv[0] += strlen(dir);
+                       if (argv[0][0] == '/')
+                               argv[0]++;
+               }
+               local_name = get_local_name(flist,argv[0]);
+       }
+
+       status = do_recv(f_in,f_out,flist,local_name);
+       exit_cleanup(status);
 }
 
 
-static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
+int child_main(int argc, char *argv[])
 {
-  int pid;
-  int status=0;
-  int recv_pipe[2];
+       start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
+       return 0;
+}
 
-  if (preserve_hard_links)
-    init_hard_links(flist);
 
-  if (pipe(recv_pipe) < 0) {
-    fprintf(FERROR,"pipe failed in do_recv\n");
-    exit(1);
-  }
-  
+void start_server(int f_in, int f_out, int argc, char *argv[])
+{
+       setup_protocol(f_out, f_in);
+
+       set_nonblocking(f_in);
+       set_nonblocking(f_out);
+
+       if (protocol_version >= 23)
+               io_start_multiplex_out(f_out);
+
+       if (am_sender) {
+               keep_dirlinks = 0; /* Must be disabled on the sender. */
+               
+               recv_exclude_list(f_in);
+               if (cvs_exclude)
+                       add_cvs_excludes();
+               do_server_sender(f_in, f_out, argc, argv);
+       } else {
+               do_server_recv(f_in, f_out, argc, argv);
+       }
+       exit_cleanup(0);
+}
 
-  if ((pid=fork()) == 0) {
-    recv_files(f_in,flist,local_name,recv_pipe[1]);
-    if (preserve_hard_links)
-      do_hard_links(flist);
-    if (verbose > 2)
-      fprintf(FERROR,"receiver read %d\n",read_total());
-    exit_cleanup(0);
-  }
 
-  generate_files(f_out,flist,local_name,recv_pipe[0]);
+/*
+ * 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, pid_t pid, int argc, char *argv[])
+{
+       struct file_list *flist = NULL;
+       int status = 0, status2 = 0;
+       char *local_name = NULL;
+
+       cleanup_child_pid = pid;
+       if (read_batch) {
+               /* This is the heart of the read_batch approach:
+                * Switcher-roo the file descriptors, and
+                * nobody's the wiser. */
+               close(f_in);
+               close(f_out);
+               f_in = batch_fd;
+               f_out = do_open("/dev/null", O_WRONLY, 0);
+               assert(am_sender == 0);
+       } else {
+               set_nonblocking(f_in);
+               set_nonblocking(f_out);
+       }
+
+       setup_protocol(f_out,f_in);
+
+       if (protocol_version >= 23 && !read_batch)
+               io_start_multiplex_in(f_in);
+
+       if (am_sender) {
+               keep_dirlinks = 0; /* Must be disabled on the sender. */
+               io_start_buffering_out(f_out);
+               if (cvs_exclude)
+                       add_cvs_excludes();
+               if (delete_mode && !delete_excluded)
+                       send_exclude_list(f_out);
+               if (remote_filesfrom_file)
+                       filesfrom_fd = f_in;
+
+               if (write_batch)
+                       start_write_batch(f_out);
+               /* Can be unconditional, but this is theoretically
+                * more efficent for read_batch case. */
+               if (!read_batch) /* don't write to pipe */
+                       flist = send_file_list(f_out,argc,argv);
+               if (verbose > 3)
+                       rprintf(FINFO,"file list sent\n");
+
+               io_flush(NORMAL_FLUSH);
+               send_files(flist,f_out,f_in);
+               io_flush(FULL_FLUSH);
+               if (protocol_version >= 24) {
+                       /* final goodbye message */
+                       read_int(f_in);
+               }
+               if (pid != -1) {
+                       if (verbose > 3)
+                               rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
+                       io_flush(FULL_FLUSH);
+                       wait_process(pid, &status);
+               }
+               report(-1);
+               io_flush(FULL_FLUSH);
+               exit_cleanup(status);
+       }
+
+       if (argc == 0)
+               list_only = 1;
 
-  waitpid(pid, &status, 0);
+       /* Can be unconditional, but this is theoretically more
+        * efficient for the read_batch case. */
+       if (!read_batch)
+               send_exclude_list(f_out);
 
-  return status;
+       if (filesfrom_fd >= 0) {
+               io_set_filesfrom_fds(filesfrom_fd, f_out);
+               filesfrom_fd = -1;
+       }
+
+       if (write_batch)
+               start_write_batch(f_in);
+       flist = recv_file_list(f_in);
+       if (!flist || flist->count == 0) {
+               rprintf(FINFO, "client: nothing to do: "
+                       "perhaps you need to specify some filenames or "
+                       "the --recursive option?\n");
+               exit_cleanup(0);
+       }
+
+       local_name = get_local_name(flist,argv[0]);
+
+       status2 = do_recv(f_in,f_out,flist,local_name);
+
+       if (pid != -1) {
+               if (verbose > 3)
+                       rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid);
+               io_flush(FULL_FLUSH);
+               wait_process(pid, &status);
+       }
+
+       return MAX(status, status2);
 }
 
+static int copy_argv (char *argv[])
+{
+       int i;
+
+       for (i = 0; argv[i]; i++) {
+               if (!(argv[i] = strdup(argv[i]))) {
+                       rprintf (FERROR, "out of memory at %s(%d)\n",
+                                __FILE__, __LINE__);
+                       return RERR_MALLOC;
+               }
+       }
 
-void do_server_recv(int argc,char *argv[])
+       return 0;
+}
+
+
+/**
+ * Start a client for either type of remote connection.  Work out
+ * whether the arguments request a remote shell or rsyncd connection,
+ * and call the appropriate connection function, then run_client.
+ *
+ * Calls either start_socket_client (for sockets) or do_cmd and
+ * client_run (for ssh).
+ **/
+static int start_client(int argc, char *argv[])
 {
-  int status;
-  char *dir = NULL;
-  struct file_list *flist;
-  char *local_name=NULL;
-  
-  if (verbose > 2)
-    fprintf(FERROR,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
-
-  if (argc > 0) {
-    dir = argv[0];
-    argc--;
-    argv++;
-    if (chdir(dir) != 0) {
-      fprintf(FERROR,"chdir %s : %s\n",dir,strerror(errno));
-      exit_cleanup(1);
-    }    
-  }
-
-  if (delete_mode)
-    recv_exclude_list(STDIN_FILENO);
-
-  flist = recv_file_list(STDIN_FILENO);
-  if (!flist || flist->count == 0) {
-    fprintf(FERROR,"nothing to do\n");
-    exit_cleanup(1);
-  }
-
-  if (argc > 0) {    
-    if (strcmp(dir,".")) {
-      argv[0] += strlen(dir);
-      if (argv[0][0] == '/') argv[0]++;
-    }
-    local_name = get_local_name(flist,argv[0]);
-  }
-
-  status = do_recv(STDIN_FILENO,STDOUT_FILENO,flist,local_name);
-  exit_cleanup(status);
+       char *p;
+       char *shell_machine = NULL;
+       char *shell_path = NULL;
+       char *shell_user = NULL;
+       int ret;
+       pid_t pid;
+       int f_in,f_out;
+       int rc;
+
+       /* Don't clobber argv[] so that ps(1) can still show the right
+        * command line. */
+       if ((rc = copy_argv(argv)))
+               return rc;
+
+       /* rsync:// always uses rsync server over direct socket connection */
+       if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0
+           && !read_batch) {
+               char *host, *path;
+
+               host = argv[0] + strlen(URL_PREFIX);
+               p = strchr(host,'/');
+               if (p) {
+                       *p = 0;
+                       path = p+1;
+               } else {
+                       path = "";
+               }
+               p = strchr(host,':');
+               if (p) {
+                       rsync_port = atoi(p+1);
+                       *p = 0;
+               }
+               return start_socket_client(host, path, argc-1, argv+1);
+       }
+
+       if (!read_batch) { /* for read_batch, NO source is specified */
+               p = find_colon(argv[0]);
+               if (p) { /* source is remote */
+                       if (remote_filesfrom_file
+                        && remote_filesfrom_file != files_from + 1
+                        && strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
+                               rprintf(FERROR,
+                                       "--files-from hostname is not transfer hostname\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       if (p[1] == ':') { /* double colon */
+                               *p = 0;
+                               if (!shell_cmd) {
+                                       return start_socket_client(argv[0], p+2,
+                                                                  argc-1, argv+1);
+                               }
+                               p++;
+                               daemon_over_rsh = 1;
+                       }
+
+                       if (argc < 1) { /* destination required */
+                               usage(FERROR);
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+
+                       am_sender = 0;
+                       *p = 0;
+                       shell_machine = argv[0];
+                       shell_path = p+1;
+                       argv++;
+               } else { /* source is local */
+                       am_sender = 1;
+
+                       /* rsync:// destination uses rsync server over direct socket */
+                       if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) {
+                               char *host, *path;
+
+                               host = argv[argc-1] + strlen(URL_PREFIX);
+                               p = strchr(host,'/');
+                               if (p) {
+                                       *p = 0;
+                                       path = p+1;
+                               } else {
+                                       path = "";
+                               }
+                               p = strchr(host,':');
+                               if (p) {
+                                       rsync_port = atoi(p+1);
+                                       *p = 0;
+                               }
+                               return start_socket_client(host, path, argc-1, argv);
+                       }
+
+                       p = find_colon(argv[argc-1]); /* look in dest arg */
+                       if (p && remote_filesfrom_file
+                        && remote_filesfrom_file != files_from + 1
+                        && strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
+                               rprintf(FERROR,
+                                       "--files-from hostname is not transfer hostname\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       if (!p) { /* no colon found, so src & dest are local */
+                               local_server = 1;
+                               if (remote_filesfrom_file) {
+                                       rprintf(FERROR,
+                                               "--files-from is remote but transfer is local\n");
+                                       exit_cleanup(RERR_SYNTAX);
+                               }
+                       } else if (p[1] == ':') { /* double colon */
+                               *p = 0;
+                               if (!shell_cmd) {
+                                       return start_socket_client(argv[argc-1], p+2,
+                                                                  argc-1, argv);
+                               }
+                               p++;
+                               daemon_over_rsh = 1;
+                       }
+
+                       if (argc < 2) {
+                               usage(FERROR);
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+
+                       if (local_server) {
+                               shell_machine = NULL;
+                               shell_path = argv[argc-1];
+                       } else {
+                               *p = 0;
+                               shell_machine = argv[argc-1];
+                               shell_path = p+1;
+                       }
+               }
+               argc--;
+       } else {  /* read_batch */
+               local_server = 1;
+               shell_path = argv[argc-1];
+               if (find_colon(shell_path)) {
+                       rprintf(FERROR, "remote destination is not allowed with --read-batch\n");
+                       exit_cleanup(RERR_SYNTAX);
+               }
+       }
+
+       if (shell_machine) {
+               p = strrchr(shell_machine,'@');
+               if (p) {
+                       *p = 0;
+                       shell_user = shell_machine;
+                       shell_machine = p+1;
+               }
+       }
+
+       if (verbose > 3) {
+               rprintf(FINFO,"cmd=%s machine=%s user=%s path=%s\n",
+                       shell_cmd?shell_cmd:"",
+                       shell_machine?shell_machine:"",
+                       shell_user?shell_user:"",
+                       shell_path?shell_path:"");
+       }
+
+       /* for remote source, only single dest arg can remain ... */
+       if (!am_sender && argc > 1) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       /* ... or no dest at all */
+       if (!am_sender && argc == 0) {
+               list_only = 1;
+       }
+
+       pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,
+                    &f_in,&f_out);
+
+       /* if we're running an rsync server on the remote host over a
+        * remote shell command, we need to do the RSYNCD protocol first */
+       if (daemon_over_rsh) {
+               int tmpret;
+               tmpret = start_inband_exchange(shell_user, shell_path,
+                                              f_in, f_out, argc);
+               if (tmpret < 0)
+                       return tmpret;
+       }
+
+       ret = client_run(f_in, f_out, pid, argc, argv);
+
+       fflush(stdout);
+       fflush(stderr);
+
+       return ret;
 }
 
 
-static void usage(FILE *f)
+static RETSIGTYPE sigusr1_handler(UNUSED(int val))
 {
-  fprintf(f,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
-         VERSION);
-  fprintf(f,"Usage:\t%s [options] src user@host:dest\nOR",RSYNC_NAME);
-  fprintf(f,"\t%s [options] user@host:src dest\n\n",RSYNC_NAME);
-  fprintf(f,"Options:\n");
-  fprintf(f,"-v, --verbose            increase verbosity\n");
-  fprintf(f,"-c, --checksum           always checksum\n");
-  fprintf(f,"-a, --archive            archive mode (same as -rlptDog)\n");
-  fprintf(f,"-r, --recursive          recurse into directories\n");
-  fprintf(f,"-b, --backup             make backups (default ~ extension)\n");
-  fprintf(f,"-u, --update             update only (don't overwrite newer files)\n");
-  fprintf(f,"-l, --links              preserve soft links\n");
-  fprintf(f,"-H, --hard-links         preserve hard links\n");
-  fprintf(f,"-p, --perms              preserve permissions\n");
-  fprintf(f,"-o, --owner              preserve owner (root only)\n");
-  fprintf(f,"-g, --group              preserve group\n");
-  fprintf(f,"-D, --devices            preserve devices (root only)\n");
-  fprintf(f,"-t, --times              preserve times\n");  
-  fprintf(f,"-S, --sparse             handle sparse files efficiently\n");
-  fprintf(f,"-n, --dry-run            show what would have been transferred\n");
-  fprintf(f,"-x, --one-file-system    don't cross filesystem boundaries\n");
-  fprintf(f,"-B, --block-size SIZE    checksum blocking size\n");  
-  fprintf(f,"-e, --rsh COMMAND        specify rsh replacement\n");
-  fprintf(f,"    --rsync-path PATH    specify path to rsync on the remote machine\n");
-  fprintf(f,"-C, --cvs-exclude        auto ignore files in the same way CVS does\n");
-  fprintf(f,"    --delete             delete files that don't exist on the sending side\n");
-  fprintf(f,"-I, --ignore-times       don't exclude files that match length and time\n");
-  fprintf(f,"-z, --compress           compress file data\n");
-  fprintf(f,"    --exclude FILE       exclude file FILE\n");
-  fprintf(f,"    --exclude-from FILE  exclude files listed in FILE\n");
-  fprintf(f,"    --suffix SUFFIX      override backup suffix\n");  
-  fprintf(f,"    --version            print version number\n");  
-
-  fprintf(f,"\n");
-  fprintf(f,"the backup suffix defaults to %s\n",BACKUP_SUFFIX);
-  fprintf(f,"the block size defaults to %d\n",BLOCK_SIZE);  
+       exit_cleanup(RERR_SIGNAL);
 }
 
-enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
-      OPT_EXCLUDE_FROM,OPT_DELETE,OPT_RSYNC_PATH};
-
-static char *short_options = "oblHpguDCtcahvrIxnSe:B:z";
-
-static struct option long_options[] = {
-  {"version",     0,     0,    OPT_VERSION},
-  {"server",      0,     0,    OPT_SERVER},
-  {"sender",      0,     0,    OPT_SENDER},
-  {"delete",      0,     0,    OPT_DELETE},
-  {"exclude",     1,     0,    OPT_EXCLUDE},
-  {"exclude-from",1,     0,    OPT_EXCLUDE_FROM},
-  {"rsync-path",  1,     0,    OPT_RSYNC_PATH},
-  {"one-file-system",0,  0,    'x'},
-  {"ignore-times",0,     0,    'I'},
-  {"help",        0,     0,    'h'},
-  {"dry-run",     0,     0,    'n'},
-  {"sparse",      0,     0,    'S'},
-  {"cvs-exclude", 0,     0,    'C'},
-  {"archive",     0,     0,    'a'},
-  {"checksum",    0,     0,    'c'},
-  {"backup",      0,     0,    'b'},
-  {"update",      0,     0,    'u'},
-  {"verbose",     0,     0,    'v'},
-  {"recursive",   0,     0,    'r'},
-  {"devices",     0,     0,    'D'},
-  {"perms",       0,     0,    'p'},
-  {"links",       0,     0,    'l'},
-  {"hard-links",  0,     0,    'H'},
-  {"owner",       0,     0,    'o'},
-  {"group",       0,     0,    'g'},
-  {"times",       0,     0,    't'},
-  {"rsh",         1,     0,    'e'},
-  {"suffix",      1,     0,    OPT_SUFFIX},
-  {"block-size",  1,     0,    'B'},
-  {"compress",   0,     0,    'z'},
-  {0,0,0,0}};
+static RETSIGTYPE sigusr2_handler(UNUSED(int val))
+{
+       if (log_got_error) _exit(RERR_PARTIAL);
+       _exit(0);
+}
 
-int main(int argc,char *argv[])
+static RETSIGTYPE sigchld_handler(UNUSED(int val))
 {
-    int pid, status, status2;
-    int opt;
-    int option_index;
-    char *shell_cmd = NULL;
-    char *shell_machine = NULL;
-    char *shell_path = NULL;
-    char *shell_user = NULL;
-    char *p;
-    int f_in,f_out;
-    struct file_list *flist;
-    char *local_name = NULL;
-
-    starttime = time(NULL);
-
-    while ((opt = getopt_long(argc, argv, 
-                             short_options, long_options, &option_index)) 
-          != -1) {
-      switch (opt) 
-       {
-       case OPT_VERSION:
-         printf("rsync version %s  protocol version %d\n",
-                VERSION,PROTOCOL_VERSION);
-         exit_cleanup(0);
-
-       case OPT_SUFFIX:
-         backup_suffix = optarg;
-         break;
-
-       case OPT_RSYNC_PATH:
-         rsync_path = optarg;
-         break;
-
-       case 'I':
-         ignore_times = 1;
-         break;
-
-       case 'x':
-         one_file_system=1;
-         break;
-
-       case OPT_DELETE:
-         delete_mode = 1;
-         break;
-
-       case OPT_EXCLUDE:
-         add_exclude(optarg);
-         break;
-
-       case OPT_EXCLUDE_FROM:
-         add_exclude_file(optarg,1);
-         break;
-
-       case 'h':
-         usage(FINFO);
-         exit_cleanup(0);
-
-       case 'b':
-         make_backups=1;
-         break;
-
-       case 'n':
-         dry_run=1;
-         break;
-
-       case 'S':
-         sparse_files=1;
-         break;
-
-       case 'C':
-         cvs_exclude=1;
-         break;
-
-       case 'u':
-         update_only=1;
-         break;
-
-       case 'l':
-#if SUPPORT_LINKS
-         preserve_links=1;
+#ifdef WNOHANG
+       int cnt, status;
+       pid_t pid;
+       /* An empty waitpid() loop was put here by Tridge and we could never
+        * get him to explain why he put it in, so rather than taking it
+        * out we're instead saving the child exit statuses for later use.
+        * The waitpid() loop presumably eliminates all possibility of leaving
+        * zombie children, maybe that's why he did it.
+        */
+       while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
+               /* save the child's exit status */
+               for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
+                       if (pid_stat_table[cnt].pid == 0) {
+                               pid_stat_table[cnt].pid = pid;
+                               pid_stat_table[cnt].status = status;
+                               break;
+                       }
+               }
+       }
 #endif
-         break;
+}
 
-       case 'H':
-#if SUPPORT_HARD_LINKS
-         preserve_hard_links=1;
-#endif
-         break;
-
-       case 'p':
-         preserve_perms=1;
-         break;
-
-       case 'o':
-         if (getuid() == 0) {
-           preserve_uid=1;
-         } else {
-           fprintf(FERROR,"-o only allowed for root\n");
-           exit_cleanup(1);
-         }
-         break;
-
-       case 'g':
-         preserve_gid=1;
-         break;
-
-       case 'D':
-         if (getuid() == 0) {
-           preserve_devices=1;
-         } else {
-           fprintf(FERROR,"-D only allowed for root\n");
-           exit_cleanup(1);
-         }
-         break;
-
-       case 't':
-         preserve_times=1;
-         break;
-
-       case 'c':
-         always_checksum=1;
-         break;
-
-       case 'v':
-         verbose++;
-         break;
-
-       case 'a':
-         recurse=1;
-#if SUPPORT_LINKS
-         preserve_links=1;
+
+/**
+ * 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
+const char *get_panic_action(void)
+{
+       const char *cmd_fmt = getenv("RSYNC_PANIC_ACTION");
+
+       if (cmd_fmt)
+               return cmd_fmt;
+       else
+               return "xterm -display :0 -T Panic -n Panic "
+                       "-e gdb /proc/%d/exe %d";
+}
+
+
+/**
+ * Handle a fatal signal by launching a debugger, controlled by $RSYNC_PANIC_ACTION.
+ *
+ * This signal handler is only installed if we were configured with
+ * --enable-maintainer-mode.  Perhaps it should always be on and we
+ * should just look at the environment variable, but I'm a bit leery
+ * of a signal sending us into a busy loop.
+ **/
+static RETSIGTYPE rsync_panic_handler(UNUSED(int whatsig))
+{
+       char cmd_buf[300];
+       int ret;
+
+       sprintf(cmd_buf, get_panic_action(),
+               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
-         preserve_perms=1;
-         preserve_times=1;
-         preserve_gid=1;
-         if (getuid() == 0) {
-           preserve_devices=1;
-           preserve_uid=1;
-         }         
-         break;
-
-       case OPT_SERVER:
-         am_server = 1;
-         break;
-
-       case OPT_SENDER:
-         if (!am_server) {
-           usage(FERROR);
-           exit_cleanup(1);
-         }
-         sender = 1;
-         break;
-
-       case 'r':
-         recurse = 1;
-         break;
-
-       case 'e':
-         shell_cmd = optarg;
-         break;
-
-       case 'B':
-         block_size = atoi(optarg);
-         break;
-
-        case 'z':
-         do_compression = 1;
-         break;
-
-       default:
-         /* fprintf(FERROR,"bad option -%c\n",opt); */
-         exit_cleanup(1);
-       }
-    }
-
-    while (optind--) {
-      argc--;
-      argv++;
-    }
-
-    signal(SIGCHLD,SIG_IGN);
-    signal(SIGINT,SIGNAL_CAST sig_int);
-    signal(SIGPIPE,SIGNAL_CAST sig_int);
-    signal(SIGHUP,SIGNAL_CAST sig_int);
-
-    if (dry_run)
-      verbose = MAX(verbose,1);
-
-    if (am_server) {
-      setup_protocol(STDOUT_FILENO,STDIN_FILENO);
-       
-      if (sender) {
-       recv_exclude_list(STDIN_FILENO);
-       if (cvs_exclude)
-         add_cvs_excludes();
-       do_server_sender(argc,argv);
-      } else {
-       do_server_recv(argc,argv);
-      }
-      exit_cleanup(0);
-    }
-
-    if (argc < 2) {
-      usage(FERROR);
-      exit_cleanup(1);
-    }
-
-    p = strchr(argv[0],':');
-
-    if (p) {
-      sender = 0;
-      *p = 0;
-      shell_machine = argv[0];
-      shell_path = p+1;
-      argc--;
-      argv++;
-    } else {
-      sender = 1;
-
-      p = strchr(argv[argc-1],':');
-      if (!p) {
-       local_server = 1;
-      }
-
-      if (local_server) {
-       shell_machine = NULL;
-       shell_path = argv[argc-1];
-      } else {
-       *p = 0;
-       shell_machine = argv[argc-1];
-       shell_path = p+1;
-      }
-      argc--;
-    }
-
-    if (shell_machine) {
-      p = strchr(shell_machine,'@');
-      if (p) {
-       *p = 0;
-       shell_user = shell_machine;
-       shell_machine = p+1;
-      }
-    }
-
-    if (verbose > 3) {
-      fprintf(FERROR,"cmd=%s machine=%s user=%s path=%s\n",
-             shell_cmd?shell_cmd:"",
-             shell_machine?shell_machine:"",
-             shell_user?shell_user:"",
-             shell_path?shell_path:"");
-    }
-    
-    if (!sender && argc != 1) {
-      usage(FERROR);
-      exit_cleanup(1);
-    }
-
-    pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
-
-    setup_protocol(f_out,f_in);
-
-    if (verbose > 3) 
-      fprintf(FERROR,"parent=%d child=%d sender=%d recurse=%d\n",
-             (int)getpid(),pid,sender,recurse);
-
-    if (sender) {
-      if (cvs_exclude)
-       add_cvs_excludes();
-      if (delete_mode) 
-       send_exclude_list(f_out);
-      flist = send_file_list(f_out,recurse,argc,argv);
-      if (verbose > 3) 
-       fprintf(FERROR,"file list sent\n");
-      send_files(flist,f_out,f_in);
-      if (verbose > 3)
-       fprintf(FERROR,"waiting on %d\n",pid);
-      waitpid(pid, &status, 0);
-      report(-1);
-      exit_cleanup(status);
-    }
-
-    send_exclude_list(f_out);
-
-    flist = recv_file_list(f_in);
-    if (!flist || flist->count == 0) {
-      fprintf(FERROR,"nothing to do\n");
-      exit_cleanup(0);
-    }
-
-    local_name = get_local_name(flist,argv[0]);
-
-    status2 = do_recv(f_in,f_out,flist,local_name);
-
-    report(f_in);
-
-    waitpid(pid, &status, 0);
-
-    return status | status2;
+
+
+int main(int argc,char *argv[])
+{
+       int ret;
+       int orig_argc;
+       char **orig_argv;
+
+       orig_argc = argc;
+       orig_argv = 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 = (MY_UID() == 0);
+
+       memset(&stats, 0, sizeof(stats));
+
+       if (argc < 2) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       /* we set a 0 umask so that correct file permissions can be
+        * carried across */
+       orig_umask = (int)umask(0);
+
+       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();
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       signal(SIGINT,SIGNAL_CAST sig_int);
+       signal(SIGHUP,SIGNAL_CAST sig_int);
+       signal(SIGTERM,SIGNAL_CAST sig_int);
+
+       /* Ignore SIGPIPE; we consistently check error codes and will
+        * see the EPIPE. */
+       signal(SIGPIPE, SIG_IGN);
+
+       /* Initialize push_dir here because on some old systems getcwd
+        * (implemented by forking "pwd" and reading its output) doesn't
+        * work when there are other child processes.  Also, on all systems
+        * that implement getcwd that way "pwd" can't be found after chroot. */
+       push_dir(NULL);
+
+       init_flist();
+
+       if (write_batch || read_batch) {
+               if (write_batch)
+                       write_batch_argvs_file(orig_argc, orig_argv);
+
+               batch_fd = do_open(batch_prefix,
+                                  write_batch ? O_WRONLY | O_CREAT | O_TRUNC
+                                  : O_RDONLY, S_IRUSR | S_IWUSR);
+               if (batch_fd < 0) {
+                       rsyserr(FERROR, errno, "Batch file %s open error",
+                               batch_prefix);
+                       exit_cleanup(RERR_FILEIO);
+               }
+       }
+
+       if (am_daemon && !am_server)
+               return daemon_main();
+
+       if (argc < 1) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       if (dry_run)
+               verbose = MAX(verbose,1);
+
+       if (am_server) {
+               set_nonblocking(STDIN_FILENO);
+               set_nonblocking(STDOUT_FILENO);
+               if (am_daemon)
+                       return start_daemon(STDIN_FILENO, STDOUT_FILENO);
+               start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
+       }
+
+       ret = start_client(argc, argv);
+       if (ret == -1)
+               exit_cleanup(RERR_STARTCLIENT);
+       else
+               exit_cleanup(ret);
+
+       return ret;
 }