- Updated the address for the FSF in the opening comment.
[rsync/rsync.git] / main.c
diff --git a/main.c b/main.c
index 527daeb..1237447 100644 (file)
--- a/main.c
+++ b/main.c
-/* 
-   Copyright (C) Andrew Tridgell 1996
-   Copyright (C) Paul Mackerras 1996
-   
-   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.
-*/
+/*
+ * The startup routines, including main(), for rsync.
+ *
+ * Copyright (C) 1996-2001 Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
 #include "rsync.h"
+#if defined CONFIG_LOCALE && defined HAVE_LOCALE_H
+#include <locale.h>
+#endif
+
+extern int verbose;
+extern int dry_run;
+extern int list_only;
+extern int am_root;
+extern int am_server;
+extern int am_sender;
+extern int am_generator;
+extern int am_daemon;
+extern int blocking_io;
+extern int remove_sent_files;
+extern int daemon_over_rsh;
+extern int need_messages_from_generator;
+extern int kluge_around_eof;
+extern int do_stats;
+extern int log_got_error;
+extern int module_id;
+extern int copy_links;
+extern int copy_dirlinks;
+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 batch_gen_fd;
+extern int filesfrom_fd;
+extern pid_t cleanup_child_pid;
+extern struct stats stats;
+extern char *filesfrom_host;
+extern char *rsync_path;
+extern char *shell_cmd;
+extern char *batch_name;
+
+int local_server = 0;
+mode_t orig_umask = 0;
+struct file_list *the_file_list;
+
+/* There's probably never more than at most 2 outstanding child processes,
+ * but set it higher, just in case. */
+#define MAXCHILDPROCS 7
+
+#ifdef HAVE_SIGACTION
+# ifdef HAVE_SIGPROCMASK
+#  define SIGACTMASK(n,h) SIGACTION(n,h), sigaddset(&sigmask,(n))
+# else
+#  define SIGACTMASK(n,h) SIGACTION(n,h)
+# endif
+static struct sigaction sigact;
+#endif
+
+struct pid_status {
+       pid_t pid;
+       int status;
+} pid_stat_table[MAXCHILDPROCS];
 
-int verbose = 0;
-int always_checksum = 0;
-time_t starttime;
-int64 total_size = 0;
-int block_size=BLOCK_SIZE;
-
-char *backup_suffix = BACKUP_SUFFIX;
-char *tmpdir = NULL;
-
-static char *rsync_path = RSYNC_NAME;
-
-int make_backups = 0;
-int whole_file = 0;
-int copy_links = 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;
-int am_root=0;
-int orig_umask=0;
-int relative_paths=0;
-int numeric_ids = 0;
-int force_delete = 0;
-int io_timeout = 0;
-int io_error = 0;
-static int port = RSYNC_PORT;
-
-static char *shell_cmd;
-
-extern int csum_length;
-
-int am_server = 0;
-int am_sender;
-int recurse = 0;
-int am_daemon;
-
-static void usage(int fd);
-
-static void report(int f)
+static time_t starttime, endtime;
+static int64 total_read, total_written;
+
+static void show_malloc_stats(void);
+
+/* Works like waitpid(), but if we already harvested the child pid in our
+ * remember_children(), we succeed instead of returning an error. */
+pid_t wait_process(pid_t pid, int *status_ptr, int flags)
 {
-  int64 in,out,tsize;
-  time_t t = time(NULL);
-  
-  if (!verbose) return;
-
-  if (am_server && am_sender) {
-    write_longint(f,read_total());
-    write_longint(f,write_total());
-    write_longint(f,total_size);
-    write_flush(f);
-    return;
-  }
-    
-  if (am_sender) {
-    in = read_total();
-    out = write_total();
-    tsize = total_size;
-  } else {
-    in = read_longint(f);
-    out = read_longint(f);
-    tsize = read_longint(f);
-  }
-
-  printf("wrote %.0f bytes  read %.0f bytes  %.2f bytes/sec\n",
-        (double)out,(double)in,(in+out)/(0.5 + (t-starttime)));
-  printf("total size is %.0f  speedup is %.2f\n",
-        (double)tsize,(1.0*tsize)/(in+out));
+       pid_t waited_pid = waitpid(pid, status_ptr, flags);
+
+       if (waited_pid == -1 && errno == ECHILD) {
+               /* Status of requested child no longer available:  check to
+                * see if it was processed by remember_children(). */
+               int cnt;
+               for (cnt = 0; cnt < MAXCHILDPROCS; cnt++) {
+                       if (pid == pid_stat_table[cnt].pid) {
+                               *status_ptr = pid_stat_table[cnt].status;
+                               pid_stat_table[cnt].pid = 0;
+                               return pid;
+                       }
+               }
+       }
+
+       return waited_pid;
 }
 
+/* Wait for a process to exit, calling io_flush while waiting. */
+static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+{
+       pid_t waited_pid;
+       int status;
+
+       while ((waited_pid = wait_process(pid, &status, WNOHANG)) == 0) {
+               msleep(20);
+               io_flush(FULL_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 they know something went wrong. */
+       if (waited_pid < 0) {
+               rsyserr(FERROR, errno, "waitpid");
+               *exit_code_ptr = RERR_WAITCHILD;
+       } else if (!WIFEXITED(status)) {
+#ifdef WCOREDUMP
+               if (WCOREDUMP(status))
+                       *exit_code_ptr = RERR_CRASHED;
+               else
+#endif
+               if (WIFSIGNALED(status))
+                       *exit_code_ptr = RERR_TERMINATED;
+               else
+                       *exit_code_ptr = RERR_WAITCHILD;
+       } else
+               *exit_code_ptr = WEXITSTATUS(status);
+}
 
-static void server_options(char **args,int *argc)
+/* 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 handle_stats(int f)
 {
-  int ac = *argc;
-  static char argstr[50];
-  static char bsize[30];
-  static char iotime[30];
-  int i, x;
-
-  args[ac++] = "--server";
-
-  if (!am_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 (copy_links)
-    argstr[x++] = 'L';
-  if (whole_file)
-    argstr[x++] = 'W';
-  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 (relative_paths)
-    argstr[x++] = 'R';
-  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 (io_timeout) {
-    sprintf(iotime,"--timeout=%d",io_timeout);
-    args[ac++] = iotime;
-  }    
-
-  if (strcmp(backup_suffix, BACKUP_SUFFIX)) {
-         args[ac++] = "--suffix";
-         args[ac++] = backup_suffix;
-  }
-
-  if (delete_mode)
-    args[ac++] = "--delete";
-
-  if (force_delete)
-    args[ac++] = "--force";
-
-  if (numeric_ids)
-    args[ac++] = "--numeric-ids";
-
-  if (tmpdir) {
-         args[ac++] = "--temp-dir";
-         args[ac++] = tmpdir;
-  }
-
-  *argc = ac;
+       endtime = time(NULL);
+
+       /* Cache two stats because the read/write code can change it. */
+       total_read = stats.total_read;
+       total_written = stats.total_written;
+
+       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);
+                       if (protocol_version >= 29) {
+                               write_longint(f, stats.flist_buildtime);
+                               write_longint(f, stats.flist_xfertime);
+                       }
+               }
+               return;
+       }
+
+       /* this is the client */
+
+       if (f < 0 && !am_sender) /* e.g. when we got an empty file list. */
+               ;
+       else if (!am_sender) {
+               /* Read the first two in opposite order because the meaning of
+                * read/write swaps when switching from sender to receiver. */
+               total_written = read_longint(f);
+               total_read = read_longint(f);
+               stats.total_size = read_longint(f);
+               if (protocol_version >= 29) {
+                       stats.flist_buildtime = read_longint(f);
+                       stats.flist_xfertime = 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 (protocol_version >= 29) {
+                       write_longint(batch_fd, stats.flist_buildtime);
+                       write_longint(batch_fd, stats.flist_xfertime);
+               }
+       }
 }
 
+static void output_summary(void)
+{
+       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: %s bytes\n",
+                       human_num(stats.total_size));
+               rprintf(FINFO,"Total transferred file size: %s bytes\n",
+                       human_num(stats.total_transferred_size));
+               rprintf(FINFO,"Literal data: %s bytes\n",
+                       human_num(stats.literal_data));
+               rprintf(FINFO,"Matched data: %s bytes\n",
+                       human_num(stats.matched_data));
+               rprintf(FINFO,"File list size: %d\n", stats.flist_size);
+               if (stats.flist_buildtime) {
+                       rprintf(FINFO,
+                               "File list generation time: %.3f seconds\n",
+                               (double)stats.flist_buildtime / 1000);
+                       rprintf(FINFO,
+                               "File list transfer time: %.3f seconds\n",
+                               (double)stats.flist_xfertime / 1000);
+               }
+               rprintf(FINFO,"Total bytes sent: %s\n",
+                       human_num(total_written));
+               rprintf(FINFO,"Total bytes received: %s\n",
+                       human_num(total_read));
+       }
 
+       if (verbose || do_stats) {
+               rprintf(FINFO,
+                       "\nsent %s bytes  received %s bytes  %s bytes/sec\n",
+                       human_num(total_written), human_num(total_read),
+                       human_dnum((total_written + total_read)/(0.5 + (endtime - starttime)), 2));
+               rprintf(FINFO, "total size is %s  speedup is %.2f\n",
+                       human_num(stats.total_size),
+                       (double)stats.total_size / (total_written+total_read));
+       }
 
-static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f_out)
+       fflush(stdout);
+       fflush(stderr);
+}
+
+
+/**
+ * If our C library can get malloc statistics, then show them to FINFO
+ **/
+static void show_malloc_stats(void)
 {
-       char *args[100];
-       int i,argc=0, ret;
-       char *tok,*dir=NULL;
+#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:     %10ld   (bytes from sbrk)\n",
+               (long)mi.arena);
+       rprintf(FINFO, "  ordblks:   %10ld   (chunks not in use)\n",
+               (long)mi.ordblks);
+       rprintf(FINFO, "  smblks:    %10ld\n",
+               (long)mi.smblks);
+       rprintf(FINFO, "  hblks:     %10ld   (chunks from mmap)\n",
+               (long)mi.hblks);
+       rprintf(FINFO, "  hblkhd:    %10ld   (bytes from mmap)\n",
+               (long)mi.hblkhd);
+       rprintf(FINFO, "  allmem:    %10ld   (bytes from sbrk + mmap)\n",
+               (long)mi.arena + mi.hblkhd);
+       rprintf(FINFO, "  usmblks:   %10ld\n",
+               (long)mi.usmblks);
+       rprintf(FINFO, "  fsmblks:   %10ld\n",
+               (long)mi.fsmblks);
+       rprintf(FINFO, "  uordblks:  %10ld   (bytes used)\n",
+               (long)mi.uordblks);
+       rprintf(FINFO, "  fordblks:  %10ld   (bytes free)\n",
+               (long)mi.fordblks);
+       rprintf(FINFO, "  keepcost:  %10ld   (bytes in releasable chunk)\n",
+               (long)mi.keepcost);
+#endif /* HAVE_MALLINFO */
+}
 
-       if (!local_server) {
+
+/* 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)
+{
+       int i, argc = 0;
+       char *args[MAX_ARGS];
+       pid_t ret;
+       char *dir = NULL;
+       int dash_l_set = 0;
+
+       if (!read_batch && !local_server) {
+               char *t, *f, in_quote = '\0';
+               char *rsh_env = getenv(RSYNC_RSH_ENV);
                if (!cmd)
-                       cmd = getenv(RSYNC_RSH_ENV);
+                       cmd = rsh_env;
                if (!cmd)
                        cmd = RSYNC_RSH;
                cmd = strdup(cmd);
-               if (!cmd) 
+               if (!cmd)
                        goto oom;
 
-               for (tok=strtok(cmd," ");tok;tok=strtok(NULL," ")) {
-                       args[argc++] = tok;
+               for (t = f = cmd; *f; f++) {
+                       if (*f == ' ')
+                               continue;
+                       /* Comparison leaves rooms for server_options(). */
+                       if (argc >= MAX_ARGS - MAX_SERVER_ARGS) {
+                               rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       args[argc++] = t;
+                       while (*f != ' ' || in_quote) {
+                               if (!*f) {
+                                       if (in_quote) {
+                                               rprintf(FERROR,
+                                                   "Missing trailing-%c in remote-shell command.\n",
+                                                   in_quote);
+                                               exit_cleanup(RERR_SYNTAX);
+                                       }
+                                       f--;
+                                       break;
+                               }
+                               if (*f == '\'' || *f == '"') {
+                                       if (!in_quote) {
+                                               in_quote = *f++;
+                                               continue;
+                                       }
+                                       if (*f == in_quote && *++f != in_quote) {
+                                               in_quote = '\0';
+                                               continue;
+                                       }
+                               }
+                               *t++ = *f++;
+                       }
+                       *t++ = '\0';
                }
 
-#if HAVE_REMSH
+               /* 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;
+               }
+
+#ifdef HAVE_REMSH
                /* remsh (on HPUX) takes the arguments the other way around */
                args[argc++] = machine;
-               if (user) {
+               if (user && !(daemon_over_rsh && dash_l_set)) {
                        args[argc++] = "-l";
                        args[argc++] = user;
                }
 #else
-               if (user) {
+               if (user && !(daemon_over_rsh && dash_l_set)) {
                        args[argc++] = "-l";
                        args[argc++] = user;
                }
@@ -233,328 +378,673 @@ static int do_cmd(char *cmd,char *machine,char *user,char *path,int *f_in,int *f
 
                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 (path && *path) 
+       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");
+               for (i = 0; i < argc; i++)
+                       rprintf(FINFO, "cmd[%d]=%s ", i, args[i]);
+               rprintf(FINFO, "\n");
        }
 
-       if (local_server) {
-               ret = local_child(argc, args, f_in, f_out);
-       } else {
+       if (read_batch) {
+               int from_gen_pipe[2];
+               if (fd_pair(from_gen_pipe) < 0) {
+                       rsyserr(FERROR, errno, "pipe");
+                       exit_cleanup(RERR_IPC);
+               }
+               batch_gen_fd = from_gen_pipe[0];
+               *f_out = from_gen_pipe[1];
+               *f_in = batch_fd;
+               ret = -1; /* no child pid */
+       } else 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 && !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);
+       if (dir)
+               free(dir);
 
        return ret;
 
-oom:
+  oom:
        out_of_memory("do_cmd");
        return 0; /* not reached */
 }
 
+/* The receiving side operates in one of two modes:
+ *
+ * 1. it receives any number of files into a destination directory,
+ * placing them according to their names in the file-list.
+ *
+ * 2. it receives a single file and saves it using the name in the
+ * destination path instead of its file-list name.  This requires a
+ * "local name" for writing out the destination file.
+ *
+ * So, our task is to figure out what mode/local-name we need and return
+ * either a NULL for mode 1, or the local-name for mode 2.  We also
+ * change directory if there are any path components in dest_path. */
+static char *get_local_name(struct file_list *flist, char *dest_path)
+{
+       STRUCT_STAT st;
+       char *cp;
+
+       if (verbose > 2) {
+               rprintf(FINFO, "get_local_name count=%d %s\n",
+                       flist->count, NS(dest_path));
+       }
 
+       if (!dest_path || list_only)
+               return NULL;
+
+       /* If the destination path refers to an existing directory, enter
+        * it and use mode 1.  If there is something other than a directory
+        * at the destination path, we must be transferring one file
+        * (anything at the destination will be overwritten). */
+       if (do_stat(dest_path, &st) == 0) {
+               if (S_ISDIR(st.st_mode)) {
+                       if (!push_dir(dest_path)) {
+                               rsyserr(FERROR, errno, "push_dir#1 %s failed",
+                                       full_fname(dest_path));
+                               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);
+               }
+               /* Caution: flist->count could be 0! */
+               if (flist->count == 1 && S_ISDIR(flist->files[0]->mode)) {
+                       rprintf(FERROR,
+                               "ERROR: cannot overwrite non-directory"
+                               " with a directory\n");
+                       exit_cleanup(RERR_FILESELECT);
+               }
+       } else if (errno != ENOENT) {
+               rsyserr(FERROR, errno, "cannot stat destination %s",
+                       full_fname(dest_path));
+               exit_cleanup(RERR_FILESELECT);
+       }
 
+       cp = strrchr(dest_path, '/');
 
-static char *get_local_name(struct file_list *flist,char *name)
-{
-  STRUCT_STAT st;
-
-  if (do_stat(name,&st) == 0) {
-    if (S_ISDIR(st.st_mode)) {
-      if (chdir(name) != 0) {
-       rprintf(FERROR,"chdir %s : %s (1)\n",name,strerror(errno));
-       exit_cleanup(1);
-      }
-      return NULL;
-    }
-    if (flist->count > 1) {
-      rprintf(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 (do_mkdir(name,0777 & ~orig_umask) != 0) {
-    rprintf(FERROR,"mkdir %s : %s (1)\n",name,strerror(errno));
-    exit_cleanup(1);
-  } else {
-    rprintf(FINFO,"created directory %s\n",name);
-  }
-
-  if (chdir(name) != 0) {
-    rprintf(FERROR,"chdir %s : %s (2)\n",name,strerror(errno));
-    exit_cleanup(1);
-  }
-
-  return NULL;
+       /* If the destination path ends in a slash or we are transferring
+        * multiple files, create a directory at the destination path,
+        * enter the new directory, and use mode 1. */
+       if (flist->count > 1 || (cp && !cp[1])) {
+               /* Lop off the final slash (if any). */
+               if (cp && !cp[1])
+                       *cp = '\0';
+
+               if (mkdir_defmode(dest_path) != 0) {
+                       rsyserr(FERROR, errno, "mkdir %s failed",
+                               full_fname(dest_path));
+                       exit_cleanup(RERR_FILEIO);
+               }
+
+               if (verbose)
+                       rprintf(FINFO, "created directory %s\n", dest_path);
+
+               if (dry_run) {
+                       /* Indicate that the destination directory doesn't
+                        * really exist and return mode 1. */
+                       dry_run++;
+                       return NULL;
+               }
+
+               if (!push_dir(dest_path)) {
+                       rsyserr(FERROR, errno, "push_dir#2 %s failed",
+                               full_fname(dest_path));
+                       exit_cleanup(RERR_FILESELECT);
+               }
+
+               return NULL;
+       }
+
+       /* Otherwise, we are writing a single file, possibly on top of an
+        * existing non-directory.  Change to the item's parent directory
+        * (if it has a path component), return the basename of the
+        * destination file as the local name, and use mode 2. */
+       if (!cp)
+               return dest_path;
+
+       if (cp == dest_path)
+               dest_path = "/";
+
+       *cp = '\0';
+       if (!push_dir(dest_path)) {
+               rsyserr(FERROR, errno, "push_dir#3 %s failed",
+                       full_fname(dest_path));
+               exit_cleanup(RERR_FILESELECT);
+       }
+       *cp = '/';
+
+       return cp + 1;
 }
 
 
+/* This is only called by the sender. */
+static void read_final_goodbye(int f_in, int f_out)
+{
+       int i;
+
+       if (protocol_version < 29)
+               i = read_int(f_in);
+       else {
+               while ((i = read_int(f_in)) == the_file_list->count
+                   && read_shortint(f_in) == ITEM_IS_NEW) {
+                       /* Forward the keep-alive (no-op) to the receiver. */
+                       write_int(f_out, the_file_list->count);
+                       write_shortint(f_out, ITEM_IS_NEW);
+               }
+       }
+
+       if (i != -1) {
+               rprintf(FERROR, "Invalid packet at end of run (%d) [%s]\n",
+                       i, who_am_i());
+               exit_cleanup(RERR_PROTOCOL);
+       }
+}
 
 
-static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
+static void do_server_sender(int f_in, int f_out, int argc, char *argv[])
 {
-  int i;
-  struct file_list *flist;
-  char *dir = argv[0];
-
-  if (verbose > 2)
-    rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid());
-  
-  if (!relative_paths && chdir(dir) != 0) {
-         rprintf(FERROR,"chdir %s: %s (3)\n",dir,strerror(errno));
-         exit_cleanup(1);
-  }
-  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);
-  send_files(flist,f_out,f_in);
-  report(f_out);
-  exit_cleanup(0);
+       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)) {
+               rprintf(FERROR, "ERROR: module is write only\n");
+               exit_cleanup(RERR_SYNTAX);
+               return;
+       }
+       if (am_daemon && lp_read_only(module_id) && remove_sent_files) {
+               rprintf(FERROR,
+                   "ERROR: --remove-sent-files cannot be used with a read-only module\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 (argc == 0 && (recurse || list_only)) {
+               argc = 1;
+               argv--;
+               argv[0] = ".";
+       }
+
+       flist = send_file_list(f_out,argc,argv);
+       if (!flist || flist->count == 0) {
+               exit_cleanup(0);
+       }
+       the_file_list = flist;
+
+       io_start_buffering_in();
+       io_start_buffering_out();
+
+       send_files(flist,f_out,f_in);
+       io_flush(FULL_FLUSH);
+       handle_stats(f_out);
+       if (protocol_version >= 24)
+               read_final_goodbye(f_in, f_out);
+       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 recv_pipe[2];
+       int pid;
+       int exit_code = 0;
+       int error_pipe[2];
+
+       /* The receiving side mustn't obey this, or an existing symlink that
+        * points to an identical file won't be replaced by the referent. */
+       copy_links = copy_dirlinks = 0;
+
+       if (preserve_hard_links)
+               init_hard_links();
+
+       if (fd_pair(error_pipe) < 0) {
+               rsyserr(FERROR, errno, "pipe failed in do_recv");
+               exit_cleanup(RERR_IPC);
+       }
+
+       io_flush(NORMAL_FLUSH);
+
+       if ((pid = do_fork()) == -1) {
+               rsyserr(FERROR, errno, "fork failed in do_recv");
+               exit_cleanup(RERR_IPC);
+       }
+
+       if (pid == 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 */
+               close_multiplexing_out();
+
+               /* set place to send errors */
+               set_msg_fd_out(error_pipe[1]);
 
-  if (preserve_hard_links)
-    init_hard_links(flist);
+               recv_files(f_in, flist, local_name);
+               io_flush(FULL_FLUSH);
+               handle_stats(f_in);
 
-  if (pipe(recv_pipe) < 0) {
-    rprintf(FERROR,"pipe failed in do_recv\n");
-    exit(1);
-  }
-  
+               send_msg(MSG_DONE, "", 0);
+               io_flush(FULL_FLUSH);
 
-  if ((pid=do_fork()) == 0) {
-    recv_files(f_in,flist,local_name,recv_pipe[1]);
-    if (verbose > 2)
-      rprintf(FINFO,"receiver read %ld\n",(long)read_total());
-    exit_cleanup(0);
-  }
+               /* Handle any keep-alive packets from the post-processing work
+                * that the generator does. */
+               if (protocol_version >= 29) {
+                       kluge_around_eof = -1;
 
-  generate_files(f_out,flist,local_name,recv_pipe[0]);
+                       /* This should only get stopped via a USR2 signal. */
+                       while (read_int(f_in) == flist->count
+                           && read_shortint(f_in) == ITEM_IS_NEW) {}
 
-  waitpid(pid, &status, 0);
+                       rprintf(FERROR, "Invalid packet at end of run [%s]\n",
+                               who_am_i());
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+
+               /* 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;
+       close_multiplexing_in();
+       if (write_batch && !am_server)
+               stop_write_batch();
+
+       close(error_pipe[1]);
+       if (f_in != f_out)
+               close(f_in);
+
+       io_start_buffering_out();
+
+       set_msg_fd_in(error_pipe[0]);
 
-  return status;
+       generate_files(f_out, flist, local_name);
+
+       handle_stats(-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_with_flush(pid, &exit_code);
+       return exit_code;
 }
 
 
 static void do_server_recv(int f_in, int f_out, int argc,char *argv[])
 {
-  int status;
-  struct file_list *flist;
-  char *local_name=NULL;
-  char *dir = NULL;
-  
-  if (verbose > 2)
-    rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid());
-
-  if (argc > 0) {
-         dir = argv[0];
-         argc--;
-         argv++;
-         if (chdir(dir) != 0) {
-                 rprintf(FERROR,"chdir %s : %s (4)\n",
-                         dir,strerror(errno));
-                 exit_cleanup(1);
-         }    
-  }
-
-  if (delete_mode)
-    recv_exclude_list(f_in);
-
-  flist = recv_file_list(f_in);
-  if (!flist || flist->count == 0) {
-    rprintf(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(f_in,f_out,flist,local_name);
-  exit_cleanup(status);
+       int exit_code;
+       struct file_list *flist;
+       char *local_name = NULL;
+       char *dir = NULL;
+       int save_verbose = verbose;
+
+       if (filesfrom_fd >= 0) {
+               /* We can't mix messages with files-from data on the socket,
+                * so temporarily turn off verbose messages. */
+               verbose = 0;
+       }
+
+       if (verbose > 2) {
+               rprintf(FINFO, "server_recv(%d) starting pid=%ld\n",
+                       argc, (long)getpid());
+       }
+
+       if (am_daemon && lp_read_only(module_id)) {
+               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();
+       recv_filter_list(f_in);
+
+       if (filesfrom_fd >= 0) {
+               /* We need to send the files-from names to the sender at the
+                * same time that we receive the file-list from them, so we
+                * need the IO routines to automatically write out the names
+                * onto our f_out socket as we read the file-list.  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);
+       verbose = save_verbose;
+       if (!flist) {
+               rprintf(FERROR,"server_recv: recv_file_list error\n");
+               exit_cleanup(RERR_FILESELECT);
+       }
+       the_file_list = flist;
+
+       if (argc > 0)
+               local_name = get_local_name(flist,argv[0]);
+
+       exit_code = do_recv(f_in,f_out,flist,local_name);
+       exit_cleanup(exit_code);
+}
+
+
+int child_main(int argc, char *argv[])
+{
+       start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
+       return 0;
 }
 
 
 void start_server(int f_in, int f_out, int argc, char *argv[])
 {
-      setup_protocol(f_out, f_in);
-       
-      if (am_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);
+       set_nonblocking(f_in);
+       set_nonblocking(f_out);
+
+       io_set_sock_fds(f_in, f_out);
+       setup_protocol(f_out, f_in);
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+       setup_iconv();
+#endif
+
+       if (protocol_version >= 23)
+               io_start_multiplex_out();
+
+       if (am_sender) {
+               keep_dirlinks = 0; /* Must be disabled on the sender. */
+               if (need_messages_from_generator)
+                       io_start_multiplex_in();
+
+               recv_filter_list(f_in);
+               do_server_sender(f_in, f_out, argc, argv);
+       } else {
+               do_server_recv(f_in, f_out, argc, argv);
+       }
+       exit_cleanup(0);
 }
 
-static int client_run(int f_in, int f_out, int pid, 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, pid_t pid, int argc, char *argv[])
 {
-       struct file_list *flist;
-       int status = 0, status2 = 0;
+       struct file_list *flist = NULL;
+       int exit_code = 0, exit_code2 = 0;
        char *local_name = NULL;
 
+       cleanup_child_pid = pid;
+       if (!read_batch) {
+               set_nonblocking(f_in);
+               set_nonblocking(f_out);
+       }
+
+       io_set_sock_fds(f_in, f_out);
        setup_protocol(f_out,f_in);
-       
+#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+       setup_iconv();
+#endif
+
+       if (protocol_version >= 23 && !read_batch)
+               io_start_multiplex_in();
+
+       /* We set our stderr file handle to blocking because ssh might have
+        * set it to non-blocking.  This can be particularly troublesome if
+        * stderr is a clone of stdout, because ssh would have set our stdout
+        * to non-blocking at the same time (which can easily cause us to lose
+        * output from our print statements).  This kluge shouldn't cause ssh
+        * any problems for how we use it.  Note also that we delayed setting
+        * this until after the above protocol setup so that we know for sure
+        * that ssh is done twiddling its file descriptors.  */
+       set_blocking(STDERR_FILENO);
+
        if (am_sender) {
-               if (cvs_exclude)
-                       add_cvs_excludes();
-               if (delete_mode) 
-                       send_exclude_list(f_out);
-               flist = send_file_list(f_out,argc,argv);
-               if (verbose > 3) 
+               keep_dirlinks = 0; /* Must be disabled on the sender. */
+               io_start_buffering_out();
+               if (!filesfrom_host)
+                       set_msg_fd_in(f_in);
+               send_filter_list(f_out);
+               if (filesfrom_host)
+                       filesfrom_fd = f_in;
+
+               if (write_batch && !am_server)
+                       start_write_batch(f_out);
+               flist = send_file_list(f_out, argc, argv);
+               set_msg_fd_in(-1);
+               if (verbose > 3)
                        rprintf(FINFO,"file list sent\n");
+               the_file_list = flist;
+
+               io_flush(NORMAL_FLUSH);
                send_files(flist,f_out,f_in);
+               io_flush(FULL_FLUSH);
+               handle_stats(-1);
+               if (protocol_version >= 24)
+                       read_final_goodbye(f_in, f_out);
                if (pid != -1) {
                        if (verbose > 3)
-                               rprintf(FINFO,"waiting on %d\n",pid);
-                       waitpid(pid, &status, 0);
+                               rprintf(FINFO,"client_run waiting on %d\n", (int) pid);
+                       io_flush(FULL_FLUSH);
+                       wait_process_with_flush(pid, &exit_code);
                }
-               report(-1);
-               exit_cleanup(status);
+               output_summary();
+               io_flush(FULL_FLUSH);
+               exit_cleanup(exit_code);
+       }
+
+       if (need_messages_from_generator && !read_batch)
+               io_start_multiplex_out();
+
+       if (argc == 0)
+               list_only |= 1;
+
+       send_filter_list(read_batch ? -1 : f_out);
+
+       if (filesfrom_fd >= 0) {
+               io_set_filesfrom_fds(filesfrom_fd, f_out);
+               filesfrom_fd = -1;
        }
-       
-       send_exclude_list(f_out);
-       
+
+       if (write_batch && !am_server)
+               start_write_batch(f_in);
        flist = recv_file_list(f_in);
-       if (!flist || flist->count == 0) {
-               rprintf(FINFO,"nothing to do\n");
-               exit_cleanup(0);
+       the_file_list = flist;
+
+       if (flist && flist->count > 0) {
+               local_name = get_local_name(flist, argv[0]);
+
+               exit_code2 = do_recv(f_in, f_out, flist, local_name);
+       } else {
+               handle_stats(-1);
+               output_summary();
        }
-       
-       local_name = get_local_name(flist,argv[0]);
-       
-       status2 = do_recv(f_in,f_out,flist,local_name);
-       
-       report(f_in);
-       
+
        if (pid != -1) {
-               waitpid(pid, &status, 0);
+               if (verbose > 3)
+                       rprintf(FINFO,"client_run2 waiting on %d\n", (int) pid);
+               io_flush(FULL_FLUSH);
+               wait_process_with_flush(pid, &exit_code);
        }
-       
-       return status | status2;
-}
 
+       return MAX(exit_code, exit_code2);
+}
 
-int start_socket_client(char *host, char *path, int argc, char *argv[])
+static int copy_argv (char *argv[])
 {
-       int fd;
-       char *sargs[100];
-       int sargc=0;
-       
-       fd = open_socket_out(host, port);
-       if (fd == -1) {
-               rprintf(FERROR,"failed to connect to %s - %s\n", host, strerror(errno));
-               exit_cleanup(1);
-       }
-       
-       server_options(sargs,&sargc);
-
-       sargs[sargc++] = ".";
+       int i;
 
-       if (path && *path) 
-               sargs[sargc++] = path;
-
-       sargs[sargc] = NULL;
+       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;
+               }
+       }
 
-       return client_run(fd, fd, -1, argc, argv);
+       return 0;
 }
 
-int start_client(int argc, char *argv[])
+
+/**
+ * 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[])
 {
        char *p;
        char *shell_machine = NULL;
        char *shell_path = NULL;
        char *shell_user = NULL;
-       int pid;
+       int ret;
+       pid_t pid;
        int f_in,f_out;
-
-       p = strchr(argv[0],':');
-
-       if (p) {
-               if (p[1] == ':') {
-                       *p = 0;
-                       return start_socket_client(argv[0], p+2, argc-1, argv+1);
-               }
-               am_sender = 0;
-               *p = 0;
-               shell_machine = argv[0];
-               shell_path = p+1;
-               argc--;
-               argv++;
-       } else {
-               am_sender = 1;
-
-               p = strchr(argv[argc-1],':');
-               if (!p) {
-                       local_server = 1;
-               } else if (p[1] == ':') {
-                       *p = 0;
-                       return start_socket_client(argv[argc-1], p+2, argc-1, argv);
+       int rc;
+
+       /* Don't clobber argv[] so that ps(1) can still show the right
+        * command line. */
+       if ((rc = copy_argv(argv)))
+               return rc;
+
+       if (!read_batch) { /* for read_batch, NO source is specified */
+               shell_path = check_for_hostspec(argv[0], &shell_machine, &rsync_port);
+               if (shell_path) { /* source is remote */
+                       char *dummy1;
+                       int dummy2;
+                       if (--argc
+                        && check_for_hostspec(argv[argc], &dummy1, &dummy2)) {
+                               rprintf(FERROR,
+                                       "The source and destination cannot both be remote.\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       argv++;
+                       if (filesfrom_host && *filesfrom_host
+                           && strcmp(filesfrom_host, shell_machine) != 0) {
+                               rprintf(FERROR,
+                                       "--files-from hostname is not the same as the transfer hostname\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       if (rsync_port) {
+                               if (!shell_cmd) {
+                                       return start_socket_client(shell_machine,
+                                                                  shell_path,
+                                                                  argc, argv);
+                               }
+                               daemon_over_rsh = 1;
+                       }
+
+                       am_sender = 0;
+               } else { /* source is local, check dest arg */
+                       am_sender = 1;
+
+                       if (argc > 1)
+                               p = argv[--argc];
+                       else {
+                               p = ".";
+                               list_only = 1;
+                       }
+
+                       shell_path = check_for_hostspec(p, &shell_machine, &rsync_port);
+                       if (shell_path && filesfrom_host && *filesfrom_host
+                           && strcmp(filesfrom_host, shell_machine) != 0) {
+                               rprintf(FERROR,
+                                       "--files-from hostname is not the same as the transfer hostname\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       if (!shell_path) { /* no hostspec found, so src & dest are local */
+                               local_server = 1;
+                               if (filesfrom_host) {
+                                       rprintf(FERROR,
+                                               "--files-from cannot be remote when the transfer is local\n");
+                                       exit_cleanup(RERR_SYNTAX);
+                               }
+                               shell_machine = NULL;
+                               shell_path = p;
+                       } else if (rsync_port) {
+                               if (!shell_cmd) {
+                                       return start_socket_client(shell_machine,
+                                                                  shell_path,
+                                                                  argc, argv);
+                               }
+                               daemon_over_rsh = 1;
+                       }
                }
-               
-               if (local_server) {
-                       shell_machine = NULL;
-                       shell_path = argv[argc-1];
-               } else {
-                       *p = 0;
-                       shell_machine = argv[argc-1];
-                       shell_path = p+1;
+       } else {  /* read_batch */
+               local_server = 1;
+               shell_path = argv[argc-1];
+               if (check_for_hostspec(shell_path, &shell_machine, &rsync_port)) {
+                       rprintf(FERROR, "remote destination is not allowed with --read-batch\n");
+                       exit_cleanup(RERR_SYNTAX);
                }
-               argc--;
        }
-       
+
        if (shell_machine) {
-               p = strchr(shell_machine,'@');
+               p = strrchr(shell_machine,'@');
                if (p) {
                        *p = 0;
                        shell_user = shell_machine;
@@ -564,360 +1054,250 @@ int start_client(int argc, char *argv[])
 
        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:"");
+                       shell_cmd ? shell_cmd : "",
+                       shell_machine ? shell_machine : "",
+                       shell_user ? shell_user : "",
+                       shell_path ? shell_path : "");
        }
-       
-       if (!am_sender && argc != 1) {
+
+       /* for remote source, only single dest arg can remain ... */
+       if (!am_sender && argc > 1) {
                usage(FERROR);
-               exit_cleanup(1);
-       }
-       
-       pid = do_cmd(shell_cmd,shell_machine,shell_user,shell_path,&f_in,&f_out);
-       
-#if HAVE_SETLINEBUF
-       setlinebuf(stdout);
-       setlinebuf(stderr);
-#endif
+               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 client_run(f_in, f_out, pid, argc, argv);
+       return ret;
 }
 
 
-static void usage(int F)
+static RETSIGTYPE sigusr1_handler(UNUSED(int val))
 {
-  rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
-         VERSION);
-  rprintf(F,"Usage:\t%s [options] src user@host:dest\nOR",RSYNC_NAME);
-  rprintf(F,"\t%s [options] user@host:src dest\n\n",RSYNC_NAME);
-  rprintf(F,"Options:\n");
-  rprintf(F,"-v, --verbose            increase verbosity\n");
-  rprintf(F,"-c, --checksum           always checksum\n");
-  rprintf(F,"-a, --archive            archive mode (same as -rlptDog)\n");
-  rprintf(F,"-r, --recursive          recurse into directories\n");
-  rprintf(F,"-R, --relative           use relative path names\n");
-  rprintf(F,"-b, --backup             make backups (default ~ extension)\n");
-  rprintf(F,"-u, --update             update only (don't overwrite newer files)\n");
-  rprintf(F,"-l, --links              preserve soft links\n");
-  rprintf(F,"-L, --copy-links         treat soft links like regular files\n");
-  rprintf(F,"-H, --hard-links         preserve hard links\n");
-  rprintf(F,"-p, --perms              preserve permissions\n");
-  rprintf(F,"-o, --owner              preserve owner (root only)\n");
-  rprintf(F,"-g, --group              preserve group\n");
-  rprintf(F,"-D, --devices            preserve devices (root only)\n");
-  rprintf(F,"-t, --times              preserve times\n");  
-  rprintf(F,"-S, --sparse             handle sparse files efficiently\n");
-  rprintf(F,"-n, --dry-run            show what would have been transferred\n");
-  rprintf(F,"-W, --whole-file         copy whole files, no incremental checks\n");
-  rprintf(F,"-x, --one-file-system    don't cross filesystem boundaries\n");
-  rprintf(F,"-B, --block-size SIZE    checksum blocking size\n");  
-  rprintf(F,"-e, --rsh COMMAND        specify rsh replacement\n");
-  rprintf(F,"    --rsync-path PATH    specify path to rsync on the remote machine\n");
-  rprintf(F,"-C, --cvs-exclude        auto ignore files in the same way CVS does\n");
-  rprintf(F,"    --delete             delete files that don't exist on the sending side\n");
-  rprintf(F,"    --force              force deletion of directories even if not empty\n");
-  rprintf(F,"    --numeric-ids        don't map uid/gid values by user/group name\n");
-  rprintf(F,"    --timeout TIME       set IO timeout in seconds\n");
-  rprintf(F,"-I, --ignore-times       don't exclude files that match length and time\n");
-  rprintf(F,"-T  --temp-dir DIR       create temporary files in directory DIR\n");
-  rprintf(F,"-z, --compress           compress file data\n");
-  rprintf(F,"    --exclude FILE       exclude file FILE\n");
-  rprintf(F,"    --exclude-from FILE  exclude files listed in FILE\n");
-  rprintf(F,"    --suffix SUFFIX      override backup suffix\n");  
-  rprintf(F,"    --version            print version number\n");  
-
-  rprintf(F,"\n");
-  rprintf(F,"the backup suffix defaults to %s\n",BACKUP_SUFFIX);
-  rprintf(F,"the block size defaults to %d\n",BLOCK_SIZE);  
+       exit_cleanup(RERR_SIGNAL1);
 }
 
-enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
-      OPT_EXCLUDE_FROM,OPT_DELETE,OPT_NUMERIC_IDS,OPT_RSYNC_PATH,
-      OPT_FORCE,OPT_TIMEOUT,OPT_DAEMON};
-
-static char *short_options = "oblLWHpguDCtcahvrRIxnSe:B:T: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},
-  {"force",       0,     0,    OPT_FORCE},
-  {"numeric-ids", 0,     0,    OPT_NUMERIC_IDS},
-  {"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'},
-  {"relative",    0,     0,    'R'},
-  {"devices",     0,     0,    'D'},
-  {"perms",       0,     0,    'p'},
-  {"links",       0,     0,    'l'},
-  {"copy-links",  0,     0,    'L'},
-  {"whole-file",  0,     0,    'W'},
-  {"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'},
-  {"timeout",     1,     0,    OPT_TIMEOUT},
-  {"temp-dir",    1,     0,    'T'},
-  {"compress",   0,     0,    'z'},
-  {"daemon",      0,     0,    OPT_DAEMON},
-  {0,0,0,0}};
-
-RETSIGTYPE sigusr1_handler(int val) {
-       exit_cleanup(1);
+static RETSIGTYPE sigusr2_handler(UNUSED(int val))
+{
+       if (!am_server)
+               output_summary();
+       close_all();
+       if (log_got_error)
+               _exit(RERR_PARTIAL);
+       _exit(0);
 }
 
-
-static void parse_arguments(int argc, char *argv[])
+RETSIGTYPE remember_children(UNUSED(int val))
 {
-    int opt;
-    int option_index;
-
-    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_FORCE:
-         force_delete = 1;
-         break;
-
-       case OPT_NUMERIC_IDS:
-         numeric_ids = 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':
-         preserve_links=1;
-         break;
-
-       case 'L':
-         copy_links=1;
-         break;
-
-       case 'W':
-         whole_file=1;
-         break;
-
-       case 'H':
-#if SUPPORT_HARD_LINKS
-         preserve_hard_links=1;
-#else 
-         rprintf(FERROR,"ERROR: hard links not supported on this platform\n");
-         exit_cleanup(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 'p':
-         preserve_perms=1;
-         break;
+#ifndef HAVE_SIGACTION
+       signal(SIGCHLD, remember_children);
+#endif
+}
 
-       case 'o':
-         preserve_uid=1;
-         break;
 
-       case 'g':
-         preserve_gid=1;
-         break;
+/**
+ * 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");
 
-       case 'D':
-         preserve_devices=1;
-         break;
+       if (cmd_fmt)
+               return cmd_fmt;
+       else
+               return "xterm -display :0 -T Panic -n Panic "
+                       "-e gdb /proc/%d/exe %d";
+}
 
-       case 't':
-         preserve_times=1;
-         break;
 
-       case 'c':
-         always_checksum=1;
-         break;
+/**
+ * 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;
 
-       case 'v':
-         verbose++;
-         break;
+       sprintf(cmd_buf, get_panic_action(),
+               getpid(), getpid());
 
-       case 'a':
-         recurse=1;
-#if SUPPORT_LINKS
-         preserve_links=1;
-#endif
-         preserve_perms=1;
-         preserve_times=1;
-         preserve_gid=1;
-         if (am_root) {
-           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);
-         }
-         am_sender = 1;
-         break;
-
-       case 'r':
-         recurse = 1;
-         break;
-
-       case 'R':
-         relative_paths = 1;
-         break;
-
-       case 'e':
-         shell_cmd = optarg;
-         break;
-
-       case 'B':
-         block_size = atoi(optarg);
-         break;
-
-       case OPT_TIMEOUT:
-         io_timeout = atoi(optarg);
-         break;
-
-       case 'T':
-               tmpdir = optarg;
-               break;
-
-        case 'z':
-         do_compression = 1;
-         break;
-
-       case OPT_DAEMON:
-               am_daemon = 1;
-               break;
-
-       default:
-         /* rprintf(FERROR,"bad option -%c\n",opt); */
-         exit_cleanup(1);
-       }
-    }
+       /* 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[])
 {
+       int ret;
+       int orig_argc = argc;
+       char **orig_argv = argv;
+#ifdef HAVE_SIGACTION
+# ifdef HAVE_SIGPROCMASK
+       sigset_t sigmask;
+
+       sigemptyset(&sigmask);
+# endif
+       sigact.sa_flags = SA_NOCLDSTOP;
+#endif
+       SIGACTMASK(SIGUSR1, sigusr1_handler);
+       SIGACTMASK(SIGUSR2, sigusr2_handler);
+       SIGACTMASK(SIGCHLD, remember_children);
+#ifdef MAINTAINER_MODE
+       SIGACTMASK(SIGSEGV, rsync_panic_handler);
+       SIGACTMASK(SIGFPE, rsync_panic_handler);
+       SIGACTMASK(SIGABRT, rsync_panic_handler);
+       SIGACTMASK(SIGBUS, rsync_panic_handler);
+#endif
 
-    signal(SIGUSR1, sigusr1_handler);
+       starttime = time(NULL);
+       am_root = (MY_UID() == 0);
 
-    starttime = time(NULL);
-    am_root = (getuid() == 0);
+       memset(&stats, 0, sizeof(stats));
 
-    /* we set a 0 umask so that correct file permissions can be
-       carried across */
-    orig_umask = (int)umask(0);
+       if (argc < 2) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
 
-    parse_arguments(argc, argv);
+       /* we set a 0 umask so that correct file permissions can be
+        * carried across */
+       orig_umask = umask(0);
 
-    while (optind) {
-      argc--;
-      argv++;
-      optind--;
-    }
+#if defined CONFIG_LOCALE && defined HAVE_SETLOCALE
+       setlocale(LC_CTYPE, "");
+#endif
 
-    signal(SIGCHLD,SIG_IGN);
-    signal(SIGINT,SIGNAL_CAST sig_int);
-    signal(SIGPIPE,SIGNAL_CAST sig_int);
-    signal(SIGHUP,SIGNAL_CAST sig_int);
+       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);
+       }
 
-    if (dry_run)
-      verbose = MAX(verbose,1);
+       SIGACTMASK(SIGINT, sig_int);
+       SIGACTMASK(SIGHUP, sig_int);
+       SIGACTMASK(SIGTERM, sig_int);
+#if defined HAVE_SIGACTION && HAVE_SIGPROCMASK
+       sigprocmask(SIG_UNBLOCK, &sigmask, NULL);
+#endif
 
-#ifndef SUPPORT_LINKS
-    if (!am_server && preserve_links) {
-           rprintf(FERROR,"ERROR: symbolic links not supported\n");
-           exit_cleanup(1);
-    }
+       /* Ignore SIGPIPE; we consistently check error codes and will
+        * see the EPIPE. */
+       SIGACTION(SIGPIPE, SIG_IGN);
+#ifdef SIGXFSZ
+       SIGACTION(SIGXFSZ, SIG_IGN);
 #endif
 
-    if (am_server) {
-           start_server(STDIN_FILENO, STDOUT_FILENO, argc, argv);
-    }
+       /* 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);
 
-    if (argc < 2) {
-      usage(FERROR);
-      exit_cleanup(1);
-    }
+       init_flist();
 
-    return start_client(argc, argv);
-}
+       if ((write_batch || read_batch) && !am_server) {
+               if (write_batch)
+                       write_batch_shell_file(orig_argc, orig_argv, argc);
+
+               if (read_batch && strcmp(batch_name, "-") == 0)
+                       batch_fd = STDIN_FILENO;
+               else {
+                       batch_fd = do_open(batch_name,
+                                  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",
+                               full_fname(batch_name));
+                       exit_cleanup(RERR_FILEIO);
+               }
+               if (read_batch)
+                       read_stream_flags(batch_fd);
+       }
+       if (write_batch < 0)
+               dry_run = 1;
+
+       if (am_daemon && !am_server)
+               return daemon_main();
+
+       if (argc < 1) {
+               usage(FERROR);
+               exit_cleanup(RERR_SYNTAX);
+       }
+
+       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;
+}