- Changed add_filter() to parse_rule() and add_filter_file()
[rsync.git] / options.c
index 5db7d62c69c60180c43be65463ba9bb70a47de56..a00370fcf3f9dca32c010249fa8882187764d92a 100644 (file)
--- a/options.c
+++ b/options.c
 #include "rsync.h"
 #include "popt.h"
 
-extern struct exclude_struct **exclude_list;
+extern int module_id;
+extern int sanitize_paths;
+extern int select_timeout;
+extern struct filter_list_struct filter_list;
+extern struct filter_list_struct server_filter_list;
 
 int make_backups = 0;
 
@@ -36,6 +40,7 @@ int make_backups = 0;
 int whole_file = -1;
 
 int archive_mode = 0;
+int keep_dirlinks = 0;
 int copy_links = 0;
 int preserve_links = 0;
 int preserve_hard_links = 0;
@@ -44,12 +49,15 @@ int preserve_devices = 0;
 int preserve_uid = 0;
 int preserve_gid = 0;
 int preserve_times = 0;
+int omit_dir_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 delete_during = 0;
+int delete_before = 0;
+int delete_after = 0;
 int delete_excluded = 0;
 int one_file_system = 0;
 int protocol_version = PROTOCOL_VERSION;
@@ -62,16 +70,15 @@ int implied_dirs = 1;
 int numeric_ids = 0;
 int force_delete = 0;
 int io_timeout = 0;
-int read_only = 0;
-int module_id = -1;
 int am_server = 0;
-int am_sender = 0;
+int am_sender = -1;
 int am_generator = 0;
 char *files_from = NULL;
 int filesfrom_fd = -1;
 char *remote_filesfrom_file = NULL;
 int eol_nulls = 0;
 int recurse = 0;
+int xfer_dirs = 0;
 int am_daemon = 0;
 int daemon_over_rsh = 0;
 int do_stats = 0;
@@ -80,20 +87,24 @@ int keep_partial = 0;
 int safe_symlinks = 0;
 int copy_unsafe_links = 0;
 int size_only = 0;
+int daemon_bwlimit = 0;
 int bwlimit = 0;
-int delete_after = 0;
+size_t bwlimit_writemax = 0;
 int only_existing = 0;
 int opt_ignore_existing = 0;
 int max_delete = 0;
+OFF_T max_size = 0;
 int ignore_errors = 0;
 int modify_window = 0;
 int blocking_io = -1;
 int checksum_seed = 0;
-unsigned int block_size = 0;
+int inplace = 0;
+int delay_updates = 0;
+long block_size = 0; /* "long" because popt can't set an int32. */
 
 
 /** Network address family. **/
-#ifdef INET6
+#if INET6
 int default_af_hint = 0;       /* Any protocol */
 #else
 int default_af_hint = AF_INET; /* Must use IPv4 */
@@ -108,33 +119,41 @@ int write_batch = 0;
 int read_batch = 0;
 int backup_dir_len = 0;
 int backup_suffix_len;
+unsigned int backup_dir_remainder;
 
 char *backup_suffix = NULL;
 char *tmpdir = NULL;
-char *compare_dest = NULL;
+char *partial_dir = NULL;
+char *basis_dir[MAX_BASIS_DIRS+1];
 char *config_file = NULL;
 char *shell_cmd = NULL;
 char *log_format = NULL;
 char *password_file = NULL;
 char *rsync_path = RSYNC_PATH;
 char *backup_dir = NULL;
-int rsync_port = RSYNC_PORT;
+char backup_dir_buf[MAXPATHLEN];
+int rsync_port = 0;
+int compare_dest = 0;
+int copy_dest = 0;
 int link_dest = 0;
+int basis_dir_cnt = 0;
 
 int verbose = 0;
 int quiet = 0;
 int always_checksum = 0;
 int list_only = 0;
 
-#define FIXED_CHECKSUM_SEED 32761
-#define MAX_BATCH_PREFIX_LEN 256       /* Must be less than MAXPATHLEN-13 */
-char *batch_prefix = NULL;
+#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
+char *batch_name = NULL;
 
 static int daemon_opt;   /* sets am_daemon after option error-reporting */
+static int F_option_cnt = 0;
 static int modify_window_set;
+static char *dest_option = NULL;
+static char *max_size_arg;
 
 /** Local address to bind.  As a character string because it's
- * interpreted by the IPv6 layer: should be a numeric IP4 or ip6
+ * interpreted by the IPv6 layer: should be a numeric IP4 or IP6
  * address, or a hostname. **/
 char *bind_address;
 
@@ -142,15 +161,20 @@ char *bind_address;
 static void print_rsync_version(enum logcode f)
 {
        char const *got_socketpair = "no ";
+       char const *have_inplace = "no ";
        char const *hardlinks = "no ";
        char const *links = "no ";
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;
 
-#ifdef HAVE_SOCKETPAIR
+#if HAVE_SOCKETPAIR
        got_socketpair = "";
 #endif
 
+#if HAVE_FTRUNCATE
+       have_inplace = "";
+#endif
+
 #if SUPPORT_HARD_LINKS
        hardlinks = "";
 #endif
@@ -166,7 +190,7 @@ static void print_rsync_version(enum logcode f)
        rprintf(f, "%s  version %s  protocol version %d\n",
                RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
        rprintf(f,
-               "Copyright (C) 1996-2004 by Andrew Tridgell and others\n");
+               "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
                "%shard links, %ssymlinks, batchfiles, \n",
@@ -176,18 +200,23 @@ static void print_rsync_version(enum logcode f)
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
         * macros. */
-       rprintf(f, "              %sIPv6, %d-bit system inums, %d-bit internal inums\n",
-               ipv6,
+       rprintf(f, "              %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n",
+               have_inplace, ipv6,
                (int) (sizeof dumstat->st_ino * 8),
-               (int) (sizeof (INO64_T) * 8));
+               (int) (sizeof (int64) * 8));
 #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());
 #endif
 
-#ifdef NO_INT64
+#if SIZEOF_INT64 < 8
        rprintf(f, "WARNING: no 64-bit integers on this platform!\n");
 #endif
+       if (sizeof (int64) != SIZEOF_INT64) {
+               rprintf(f,
+                       "WARNING: size mismatch in SIZEOF_INT64 define (%d != %d)\n",
+                       (int) SIZEOF_INT64, (int) sizeof (int64));
+       }
 
        rprintf(f,
 "\n"
@@ -216,123 +245,140 @@ void usage(enum logcode F)
   rprintf(F,"  sources separated by space as long as they have same top-level\n");
   rprintf(F,"\nOptions\n");
   rprintf(F," -v, --verbose               increase verbosity\n");
-  rprintf(F," -q, --quiet                 decrease verbosity\n");
-  rprintf(F," -c, --checksum              always checksum\n");
-  rprintf(F," -a, --archive               archive mode, equivalent to -rlptgoD\n");
+  rprintf(F," -q, --quiet                 suppress non-error messages\n");
+  rprintf(F," -c, --checksum              skip based on checksum, not mod-time & size\n");
+  rprintf(F," -a, --archive               archive mode; same as -rlptgoD (no -H)\n");
   rprintf(F," -r, --recursive             recurse into directories\n");
   rprintf(F," -R, --relative              use relative path names\n");
   rprintf(F,"     --no-relative           turn off --relative\n");
   rprintf(F,"     --no-implied-dirs       don't send implied dirs with -R\n");
   rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
-  rprintf(F,"     --backup-dir            make backups into this directory\n");
-  rprintf(F,"     --suffix=SUFFIX         backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
-  rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
+  rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
+  rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
+  rprintf(F," -u, --update                skip files that are newer on the receiver\n");
+  rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
+  rprintf(F," -d, --dirs                  transfer directories without recursing\n");
   rprintf(F," -l, --links                 copy symlinks as symlinks\n");
-  rprintf(F," -L, --copy-links            copy the referent of all symlinks\n");
-  rprintf(F,"     --copy-unsafe-links     copy the referent of \"unsafe\" symlinks\n");
-  rprintf(F,"     --safe-links            ignore \"unsafe\" symlinks\n");
+  rprintf(F," -L, --copy-links            transform symlink into referent file/dir\n");
+  rprintf(F,"     --copy-unsafe-links     only \"unsafe\" symlinks are transformed\n");
+  rprintf(F,"     --safe-links            ignore symlinks that point outside the source tree\n");
   rprintf(F," -H, --hard-links            preserve hard links\n");
+  rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\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," -O, --omit-dir-times        omit directories when preserving 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,"     --no-whole-file         turn off --whole-file\n");
+  rprintf(F," -W, --whole-file            copy files whole\n");
+  rprintf(F,"     --no-whole-file         always use incremental rsync algorithm\n");
   rprintf(F," -x, --one-file-system       don't cross filesystem boundaries\n");
-  rprintf(F," -B, --block-size=SIZE       checksum blocking size (default %d)\n",BLOCK_SIZE);
-  rprintf(F," -e, --rsh=COMMAND           specify the remote shell\n");
+  rprintf(F," -B, --block-size=SIZE       force a fixed checksum block-size\n");
+  rprintf(F," -e, --rsh=COMMAND           specify the remote shell to use\n");
   rprintf(F,"     --rsync-path=PATH       specify path to rsync on the remote machine\n");
-  rprintf(F,"     --existing              only update files that already exist\n");
+  rprintf(F,"     --existing              only update files that already exist on receiver\n");
   rprintf(F,"     --ignore-existing       ignore files that already exist on receiving side\n");
+  rprintf(F,"     --del                   an alias for --delete-during\n");
   rprintf(F,"     --delete                delete files that don't exist on the sending side\n");
+  rprintf(F,"     --delete-before         receiver deletes before transfer (default)\n");
+  rprintf(F,"     --delete-during         receiver deletes during transfer, not before\n");
+  rprintf(F,"     --delete-after          receiver deletes after transfer, not before\n");
   rprintf(F,"     --delete-excluded       also delete excluded files on the receiving side\n");
-  rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
   rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
+  rprintf(F,"     --force                 force deletion of directories even if not empty\n");
   rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
+  rprintf(F,"     --max-size=SIZE         don't transfer any file larger than SIZE\n");
   rprintf(F,"     --partial               keep partially transferred files\n");
-  rprintf(F,"     --force                 force deletion of directories even if not empty\n");
+  rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
+  rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");
   rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
   rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
-  rprintf(F," -I, --ignore-times          turn off mod time & file size quick check\n");
-  rprintf(F,"     --size-only             ignore mod time for quick check (use size)\n");
-  rprintf(F,"     --modify-window=NUM     compare mod times with reduced accuracy\n");
-  rprintf(F," -T  --temp-dir=DIR          create temporary files in directory DIR\n");
+  rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
+  rprintf(F,"     --size-only             skip files that match in size\n");
+  rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
+  rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
   rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
-  rprintf(F,"     --link-dest=DIR         create hardlinks to DIR for unchanged files\n");
-  rprintf(F," -P                          equivalent to --partial --progress\n");
+  rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
+  rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
   rprintf(F," -z, --compress              compress file data\n");
-  rprintf(F," -C, --cvs-exclude           auto ignore files in the same way CVS does\n");
+  rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
+  rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
+  rprintf(F," -F                          same as --filter=': /.rsync-filter'\n");
+  rprintf(F,"                             repeated: --filter='- .rsync-filter'\n");
   rprintf(F,"     --exclude=PATTERN       exclude files matching PATTERN\n");
-  rprintf(F,"     --exclude-from=FILE     exclude patterns listed in FILE\n");
+  rprintf(F,"     --exclude-from=FILE     read exclude patterns from FILE\n");
   rprintf(F,"     --include=PATTERN       don't exclude files matching PATTERN\n");
-  rprintf(F,"     --include-from=FILE     don't exclude patterns listed in FILE\n");
-  rprintf(F,"     --files-from=FILE       read FILE for list of source-file names\n");
-  rprintf(F," -0  --from0                 all *-from file lists are delimited by nulls\n");
+  rprintf(F,"     --include-from=FILE     read include patterns from FILE\n");
+  rprintf(F,"     --files-from=FILE       read list of source-file names from FILE\n");
+  rprintf(F," -0, --from0                 all *-from file lists are delimited by nulls\n");
   rprintf(F,"     --version               print version number\n");
-  rprintf(F,"     --daemon                run as an rsync daemon\n");
-  rprintf(F,"     --no-detach             do not detach from the parent\n");
-  rprintf(F,"     --address=ADDRESS       bind to the specified address\n");
-  rprintf(F,"     --config=FILE           specify alternate rsyncd.conf file\n");
-  rprintf(F,"     --port=PORT             specify alternate rsyncd port number\n");
+  rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
   rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
-  rprintf(F,"     --no-blocking-io        turn off --blocking-io\n");
-  rprintf(F,"     --stats                 give some file transfer stats\n");
+  rprintf(F,"     --no-blocking-io        turn off blocking I/O when it is the default\n");
+  rprintf(F,"     --stats                 give some file-transfer stats\n");
   rprintf(F,"     --progress              show progress during transfer\n");
-  rprintf(F,"     --log-format=FORMAT     log file transfers using specified format\n");
-  rprintf(F,"     --password-file=FILE    get password from FILE\n");
-  rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
-  rprintf(F,"     --write-batch=PREFIX    write batch fileset starting with PREFIX\n");
-  rprintf(F,"     --read-batch=PREFIX     read batch fileset starting with PREFIX\n");
-  rprintf(F," -h, --help                  show this help screen\n");
-#ifdef INET6
-  rprintf(F," -4                          prefer IPv4\n");
-  rprintf(F," -6                          prefer IPv6\n");
+  rprintf(F," -P                          same as --partial --progress\n");
+  rprintf(F,"     --log-format=FORMAT     log file-transfers using specified format\n");
+  rprintf(F,"     --password-file=FILE    read password from FILE\n");
+  rprintf(F,"     --list-only             list the files instead of copying them\n");
+  rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");
+  rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
+  rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
+#if INET6
+  rprintf(F," -4, --ipv4                  prefer IPv4\n");
+  rprintf(F," -6, --ipv6                  prefer IPv6\n");
 #endif
+  rprintf(F," -h, --help                  show this help screen\n");
 
-  rprintf(F,"\n");
-
-  rprintf(F,"\nPlease see the rsync(1) and rsyncd.conf(5) man pages for full documentation\n");
+  rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
+  rprintf(F,"Please see the rsync(1) and rsyncd.conf(5) man pages for full documentation.\n");
   rprintf(F,"See http://rsync.samba.org/ for updates, bug reports, and answers\n");
 }
 
-enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
-      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
+enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+      OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
       OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-      OPT_READ_BATCH, OPT_WRITE_BATCH};
+      OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
+      OPT_REFUSED_BASE = 9000};
 
 static struct poptOption long_options[] = {
   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-  {"version",          0,  POPT_ARG_NONE,   0,              OPT_VERSION, 0, 0},
+  {"version",          0,  POPT_ARG_NONE,   0, OPT_VERSION, 0, 0},
   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-  {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path,       0, 0, 0 },
-  {"password-file",    0,  POPT_ARG_STRING, &password_file,    0, 0, 0 },
+  {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
+  {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
   {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
   {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
   {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
-  {"delete",           0,  POPT_ARG_NONE,   &delete_mode, 0, 0, 0 },
   {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
   {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
-  {"delete-after",     0,  POPT_ARG_NONE,   0,              OPT_DELETE_AFTER, 0, 0 },
-  {"delete-excluded",  0,  POPT_ARG_NONE,   0,              OPT_DELETE_EXCLUDED, 0, 0 },
+  {"delete",           0,  POPT_ARG_NONE,   &delete_mode, 0, 0, 0 },
+  {"delete-before",    0,  POPT_ARG_VAL,    &delete_before, 2, 0, 0 },
+  {"delete-during",    0,  POPT_ARG_NONE,   &delete_during, 0, 0, 0 },
+  {"delete-after",     0,  POPT_ARG_NONE,   &delete_after, 0, 0, 0 },
+  {"delete-excluded",  0,  POPT_ARG_NONE,   &delete_excluded, 0, 0, 0 },
   {"force",            0,  POPT_ARG_NONE,   &force_delete, 0, 0, 0 },
   {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
-  {"exclude",          0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE, 0, 0 },
-  {"include",          0,  POPT_ARG_STRING, 0,              OPT_INCLUDE, 0, 0 },
-  {"exclude-from",     0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE_FROM, 0, 0 },
-  {"include-from",     0,  POPT_ARG_STRING, 0,              OPT_INCLUDE_FROM, 0, 0 },
+  {"filter",          'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 },
+  {"exclude",          0,  POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
+  {"include",          0,  POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
+  {"exclude-from",     0,  POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
+  {"include-from",     0,  POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },
   {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
-  {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0 },
+  {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
   {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
   {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
   {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
   {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
+  {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
+  {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
   {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
   {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
+  {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
   {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
   {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
   {"copy-unsafe-links", 0, POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
@@ -341,55 +387,104 @@ static struct poptOption long_options[] = {
   {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
   {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
   {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
+  {"omit-dir-times",  'O', POPT_ARG_NONE,   &omit_dir_times, 0, 0, 0 },
   {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
-  {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
-  {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
+  {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
+  {"quiet",           'q', POPT_ARG_NONE,   0, 'q', 0, 0 },
   {"archive",         'a', POPT_ARG_NONE,   &archive_mode, 0, 0, 0 },
   {"server",           0,  POPT_ARG_NONE,   &am_server, 0, 0, 0 },
-  {"sender",           0,  POPT_ARG_NONE,   0,              OPT_SENDER, 0, 0 },
-  {"recursive",       'r', POPT_ARG_NONE,   &recurse, 0, 0, 0 },
+  {"sender",           0,  POPT_ARG_NONE,   0, OPT_SENDER, 0, 0 },
+  {"recursive",       'r', POPT_ARG_VAL,    &recurse, -1, 0, 0 },
+  {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
   {"relative",        'R', POPT_ARG_VAL,    &relative_paths, 1, 0, 0 },
   {"no-relative",      0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },
   {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-  {"block-size",      'B', POPT_ARG_INT,    &block_size, 0, 0, 0 },
+  {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
   {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
-  {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
+  {"max-size",         0,  POPT_ARG_STRING, &max_size_arg,  OPT_MAX_SIZE, 0, 0 },
+  {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-  {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
-  {"link-dest",        0,  POPT_ARG_STRING, 0,              OPT_LINK_DEST, 0, 0 },
+  {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
+  {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
+  {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
   /* TODO: Should this take an optional int giving the compression level? */
   {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-  {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
-  {"no-detach",        0,  POPT_ARG_NONE,   &no_detach, 0, 0, 0 },
   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
   {"progress",         0,  POPT_ARG_NONE,   &do_progress, 0, 0, 0 },
   {"partial",          0,  POPT_ARG_NONE,   &keep_partial, 0, 0, 0 },
+  {"partial-dir",      0,  POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
+  {"delay-updates",    0,  POPT_ARG_NONE,   &delay_updates, 0, 0, 0 },
   {"ignore-errors",    0,  POPT_ARG_NONE,   &ignore_errors, 0, 0, 0 },
   {"blocking-io",      0,  POPT_ARG_VAL,    &blocking_io, 1, 0, 0 },
   {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
-  {0,                 'P', POPT_ARG_NONE,   0,              'P', 0, 0 },
-  {"config",           0,  POPT_ARG_STRING, &config_file, 0, 0, 0 },
+  {0,                 'F', POPT_ARG_NONE,   0, 'F', 0, 0 },
+  {0,                 'P', POPT_ARG_NONE,   0, 'P', 0, 0 },
   {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
   {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
-  {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
   {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
   {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
-  {"read-batch",       0,  POPT_ARG_STRING, &batch_prefix,  OPT_READ_BATCH, 0, 0 },
-  {"write-batch",      0,  POPT_ARG_STRING, &batch_prefix,  OPT_WRITE_BATCH, 0, 0 },
+  {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
+  {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
   {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
   {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
-#ifdef INET6
-  {0,                '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
-  {0,                '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
+  {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
+#if INET6
+  {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+  {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
+#endif
+  /* All these options switch us into daemon-mode option-parsing. */
+  {"address",          0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
+  {"config",           0,  POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
+  {"daemon",           0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
+  {"no-detach",        0,  POPT_ARG_NONE,   0, OPT_DAEMON, 0, 0 },
+  {0,0,0,0, 0, 0, 0}
+};
+
+static void daemon_usage(enum logcode F)
+{
+  print_rsync_version(F);
+
+  rprintf(F,"\nUsage: rsync --daemon [OPTION]...\n");
+  rprintf(F,"     --address=ADDRESS       bind to the specified address\n");
+  rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");
+  rprintf(F,"     --config=FILE           specify alternate rsyncd.conf file\n");
+  rprintf(F,"     --no-detach             do not detach from the parent\n");
+  rprintf(F,"     --port=PORT             listen on alternate port number\n");
+  rprintf(F," -v, --verbose               increase verbosity\n");
+#if INET6
+  rprintf(F," -4, --ipv4                  prefer IPv4\n");
+  rprintf(F," -6, --ipv6                  prefer IPv6\n");
+#endif
+  rprintf(F," -h, --help                  show this help screen\n");
+
+  rprintf(F,"\nIf you were not trying to invoke rsync as a daemon, avoid using any of the\n");
+  rprintf(F,"daemon-specific rsync options.  See also the rsyncd.conf(5) man page.\n");
+}
+
+static struct poptOption long_daemon_options[] = {
+  /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+  {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
+  {"bwlimit",          0,  POPT_ARG_INT,    &daemon_bwlimit, 0, 0, 0 },
+  {"config",           0,  POPT_ARG_STRING, &config_file, 0, 0, 0 },
+  {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
+#if INET6
+  {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
+  {"ipv6",            '6', POPT_ARG_VAL,    &default_af_hint, AF_INET6, 0, 0 },
 #endif
+  {"no-detach",        0,  POPT_ARG_NONE,   &no_detach, 0, 0, 0 },
+  {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
+  {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
+  {"server",           0,  POPT_ARG_NONE,   &am_server, 0, 0, 0 },
+  {"verbose",         'v', POPT_ARG_NONE,   0, 'v', 0, 0 },
+  {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
   {0,0,0,0, 0, 0, 0}
 };
 
 
-static char err_buf[100];
+static char err_buf[200];
 
 
 /**
@@ -399,57 +494,72 @@ static char err_buf[100];
  **/
 void option_error(void)
 {
-       if (err_buf[0]) {
-               rprintf(FLOG, "%s", err_buf);
-               rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
-       } else {
-               rprintf (FERROR, "Error parsing options: "
-                        "option may be supported on client but not on server?\n");
-               rprintf (FERROR, RSYNC_NAME ": Error parsing options: "
-                        "option may be supported on client but not on server?\n");
+       if (!err_buf[0]) {
+               strcpy(err_buf, "Error parsing options: "
+                   "option may be supported on client but not on server?\n");
        }
+
+       rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
 }
 
 
 /**
- * Check to see if we should refuse this option
+ * Tweak the option table to disable all options that the rsyncd.conf
+ * file has told us to refuse.
  **/
-static int check_refuse_options(char *ref, int opt)
+static void set_refuse_options(char *bp)
 {
-       int i, len;
-       char *p;
-       const char *name;
+       struct poptOption *op;
+       char *cp, shortname[2];
+       int is_wild, found_match;
 
-       for (i = 0; long_options[i].longName; i++) {
-               if (long_options[i].val == opt)
-                       break;
-       }
+       shortname[1] = '\0';
 
-       if (!long_options[i].longName)
-               return 0;
-
-       name = long_options[i].longName;
-       len = strlen(name);
-
-       while ((p = strstr(ref,name))) {
-               if ((p==ref || p[-1]==' ') &&
-                   (p[len] == ' ' || p[len] == 0)) {
-                       snprintf(err_buf, sizeof err_buf,
-                                "The '%s' option is not supported by this server\n", name);
-                       return 1;
+       while (1) {
+               while (*bp == ' ') bp++;
+               if (!*bp)
+                       break;
+               if ((cp = strchr(bp, ' ')) != NULL)
+                       *cp= '\0';
+               /* If they specify "delete", reject all delete options. */
+               if (strcmp(bp, "delete") == 0)
+                       bp = "delete*";
+               is_wild = strpbrk(bp, "*?[") != NULL;
+               found_match = 0;
+               for (op = long_options; ; op++) {
+                       *shortname = op->shortName;
+                       if (!op->longName && !*shortname)
+                               break;
+                       if ((op->longName && wildmatch(bp, op->longName))
+                           || (*shortname && wildmatch(bp, shortname))) {
+                               if (op->argInfo == POPT_ARG_VAL)
+                                       op->argInfo = POPT_ARG_NONE;
+                               op->val = (op - long_options) + OPT_REFUSED_BASE;
+                               found_match = 1;
+                               if (!is_wild)
+                                       break;
+                       }
+               }
+               if (!found_match) {
+                       rprintf(FLOG, "No match for refuse-options string \"%s\"\n",
+                               bp);
                }
-               ref += len;
+               if (!cp)
+                       break;
+               *cp = ' ';
+               bp = cp + 1;
        }
-       return 0;
 }
 
 
-static int count_args(char const **argv)
+static int count_args(const char **argv)
 {
        int i = 0;
 
-       while (argv[i] != NULL)
-               i++;
+       if (argv) {
+               while (argv[i] != NULL)
+                       i++;
+       }
 
        return i;
 }
@@ -467,18 +577,30 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 {
        int opt;
        char *ref = lp_refuse_options(module_id);
+       const char *arg;
        poptContext pc;
 
+       if (ref && *ref)
+               set_refuse_options(ref);
+
        /* TODO: Call poptReadDefaultConfig; handle errors. */
 
        /* The context leaks in case of an error, but if there's a
         * problem we always exit anyhow. */
        pc = poptGetContext(RSYNC_NAME, *argc, *argv, long_options, 0);
+       {
+               struct poptAlias my_alias;
+               char **argv = new_array(char *, 1);
+               argv[0] = strdup("--delete-during");
+               my_alias.longName = "del", my_alias.shortName = '\0';
+               my_alias.argc = 1;
+               my_alias.argv = (const char **)argv;
+               if (argv && argv[0])
+                       poptAddAlias(pc, my_alias, 0);
+       }
+       poptReadDefaultConfig(pc, 0);
 
        while ((opt = poptGetNextOpt(pc)) != -1) {
-               if (ref && check_refuse_options(ref, opt))
-                       return 0;
-
                /* most options are handled automatically by popt;
                 * only special cases are returned and listed here. */
 
@@ -487,6 +609,45 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        print_rsync_version(FINFO);
                        exit_cleanup(0);
 
+               case OPT_DAEMON:
+                       if (am_daemon) {
+                               strcpy(err_buf, "Attempt to hack rsync thwarted!\n");
+                               return 0;
+                       }
+                       poptFreeContext(pc);
+                       pc = poptGetContext(RSYNC_NAME, *argc, *argv,
+                                           long_daemon_options, 0);
+                       while ((opt = poptGetNextOpt(pc)) != -1) {
+                               switch (opt) {
+                               case 'h':
+                                       daemon_usage(FINFO);
+                                       exit_cleanup(0);
+
+                               case 'v':
+                                       verbose++;
+                                       break;
+
+                               default:
+                                       rprintf(FERROR,
+                                           "rsync: %s: %s (in daemon mode)\n",
+                                           poptBadOption(pc, POPT_BADOPTION_NOALIAS),
+                                           poptStrerror(opt));
+                                       goto daemon_error;
+                               }
+                       }
+                       if (!daemon_opt) {
+                               rprintf(FERROR, "Daemon option(s) used without --daemon.\n");
+                           daemon_error:
+                               rprintf(FERROR,
+                                   "(Type \"rsync --daemon --help\" for assistance with daemon mode.)\n");
+                               exit_cleanup(RERR_SYNTAX);
+                       }
+                       *argv = poptGetArgs(pc);
+                       *argc = count_args(*argv);
+                       daemon_opt = 0;
+                       am_daemon = 1;
+                       return 1;
+
                case OPT_MODIFY_WINDOW:
                        /* The value has already been set by popt, but
                         * we need to remember that we're using a
@@ -494,34 +655,34 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        modify_window_set = 1;
                        break;
 
-               case OPT_DELETE_AFTER:
-                       delete_after = 1;
-                       delete_mode = 1;
-                       break;
-
-               case OPT_DELETE_EXCLUDED:
-                       delete_excluded = 1;
-                       delete_mode = 1;
+               case OPT_FILTER:
+                       parse_rule(&filter_list, poptGetOptArg(pc), 0, 0);
                        break;
 
                case OPT_EXCLUDE:
-                       add_exclude(&exclude_list, poptGetOptArg(pc),
-                                   ADD_EXCLUDE);
+                       parse_rule(&filter_list, poptGetOptArg(pc),
+                                  0, XFLG_OLD_PREFIXES);
                        break;
 
                case OPT_INCLUDE:
-                       add_exclude(&exclude_list, poptGetOptArg(pc),
-                                   ADD_INCLUDE);
+                       parse_rule(&filter_list, poptGetOptArg(pc),
+                                  MATCHFLG_INCLUDE, XFLG_OLD_PREFIXES);
                        break;
 
                case OPT_EXCLUDE_FROM:
-                       add_exclude_file(&exclude_list, poptGetOptArg(pc),
-                                        MISSING_FATAL, ADD_EXCLUDE);
-                       break;
-
                case OPT_INCLUDE_FROM:
-                       add_exclude_file(&exclude_list, poptGetOptArg(pc),
-                                        MISSING_FATAL, ADD_INCLUDE);
+                       arg = poptGetOptArg(pc);
+                       if (sanitize_paths)
+                               arg = sanitize_path(NULL, arg, NULL, 0);
+                       if (server_filter_list.head) {
+                               char *cp = (char *)arg;
+                               clean_fname(cp, 1);
+                               if (check_filter(&server_filter_list, cp, 0) < 0)
+                                       goto options_rejected;
+                       }
+                       parse_filter_file(&filter_list, arg,
+                               opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
+                               XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
                        break;
 
                case 'h':
@@ -545,53 +706,130 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        am_sender = 1;
                        break;
 
+               case 'F':
+                       switch (++F_option_cnt) {
+                       case 1:
+                               parse_rule(&filter_list,": /.rsync-filter",0,0);
+                               break;
+                       case 2:
+                               parse_rule(&filter_list,"- .rsync-filter",0,0);
+                               break;
+                       }
+                       break;
+
                case 'P':
                        do_progress = 1;
                        keep_partial = 1;
                        break;
 
                case OPT_WRITE_BATCH:
-                       /* popt stores the filename in batch_prefix for us */
+                       /* batch_name is already set */
                        write_batch = 1;
-                       checksum_seed = FIXED_CHECKSUM_SEED;
                        break;
 
                case OPT_READ_BATCH:
-                       /* popt stores the filename in batch_prefix for us */
+                       /* batch_name is already set */
                        read_batch = 1;
-                       checksum_seed = FIXED_CHECKSUM_SEED;
+                       break;
+
+               case OPT_MAX_SIZE:
+                       for (arg = max_size_arg; isdigit(*(uchar*)arg); arg++) {}
+                       if (*arg == '.')
+                               for (arg++; isdigit(*(uchar*)arg); arg++) {}
+                       switch (*arg) {
+                       case 'k': case 'K':
+                               max_size = atof(max_size_arg) * 1024;
+                               break;
+                       case 'm': case 'M':
+                               max_size = atof(max_size_arg) * 1024*1024;
+                               break;
+                       case 'g': case 'G':
+                               max_size = atof(max_size_arg) * 1024*1024*1024;
+                               break;
+                       case '\0':
+                               max_size = atof(max_size_arg);
+                               break;
+                       default:
+                               max_size = 0;
+                               break;
+                       }
+                       if (max_size <= 0) {
+                               snprintf(err_buf, sizeof err_buf,
+                                       "--max-size value is invalid: %s\n",
+                                       max_size_arg);
+                               return 0;
+                       }
+                       break;
+
+               case OPT_TIMEOUT:
+                       if (io_timeout && io_timeout < select_timeout)
+                               select_timeout = io_timeout;
                        break;
 
                case OPT_LINK_DEST:
 #if HAVE_LINK
-                       compare_dest = (char *)poptGetOptArg(pc);
                        link_dest = 1;
-                       break;
+                       dest_option = "--link-dest";
+                       goto set_dest_dir;
 #else
                        snprintf(err_buf, sizeof err_buf,
                                 "hard links are not supported on this %s\n",
                                 am_server ? "server" : "client");
-                       rprintf(FERROR, "ERROR: %s", err_buf);
                        return 0;
 #endif
 
+               case OPT_COPY_DEST:
+                       copy_dest = 1;
+                       dest_option = "--copy-dest";
+                       goto set_dest_dir;
+
+               case OPT_COMPARE_DEST:
+                       compare_dest = 1;
+                       dest_option = "--compare-dest";
+               set_dest_dir:
+                       if (basis_dir_cnt >= MAX_BASIS_DIRS) {
+                               snprintf(err_buf, sizeof err_buf,
+                                       "ERROR: at most %d %s args may be specified\n",
+                                       MAX_BASIS_DIRS, dest_option);
+                               return 0;
+                       }
+                       arg = poptGetOptArg(pc);
+                       if (sanitize_paths)
+                               arg = sanitize_path(NULL, arg, NULL, 0);
+                       basis_dir[basis_dir_cnt++] = (char *)arg;
+                       break;
 
                default:
-                       snprintf(err_buf, sizeof err_buf,
-                                "%s%s: %s\n",
-                                am_server ? "on remote machine: " : "",
-                                poptBadOption(pc, POPT_BADOPTION_NOALIAS),
-                                poptStrerror(opt));
+                       /* A large opt value means that set_refuse_options()
+                        * turned this option off (opt-BASE is its index). */
+                       if (opt >= OPT_REFUSED_BASE) {
+                               struct poptOption *op =
+                                   &long_options[opt-OPT_REFUSED_BASE];
+                               int n = snprintf(err_buf, sizeof err_buf,
+                                   "The server is configured to refuse --%s\n",
+                                   op->longName) - 1;
+                               if (op->shortName) {
+                                       snprintf(err_buf+n, sizeof err_buf-n,
+                                           " (-%c)\n", op->shortName);
+                               }
+                       } else {
+                               snprintf(err_buf, sizeof err_buf, "%s%s: %s\n",
+                                   am_server ? "on remote machine: " : "",
+                                   poptBadOption(pc, POPT_BADOPTION_NOALIAS),
+                                   poptStrerror(opt));
+                       }
                        return 0;
                }
        }
 
+       if (am_sender < 0)
+               am_sender = 0;
+
 #if !SUPPORT_LINKS
        if (preserve_links && !am_sender) {
                snprintf(err_buf, sizeof err_buf,
                         "symlinks are not supported on this %s\n",
                         am_server ? "server" : "client");
-               rprintf(FERROR, "ERROR: %s", err_buf);
                return 0;
        }
 #endif
@@ -601,37 +839,60 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                snprintf(err_buf, sizeof err_buf,
                         "hard links are not supported on this %s\n",
                         am_server ? "server" : "client");
-               rprintf(FERROR, "ERROR: %s", err_buf);
                return 0;
        }
 #endif
 
        if (write_batch && read_batch) {
-               rprintf(FERROR,
-                       "write-batch and read-batch can not be used together\n");
-               exit_cleanup(RERR_SYNTAX);
+               snprintf(err_buf, sizeof err_buf,
+                       "--write-batch and --read-batch can not be used together\n");
+               return 0;
        }
-       if (batch_prefix && strlen(batch_prefix) > MAX_BATCH_PREFIX_LEN) {
-               rprintf(FERROR,
-                       "the batch-file prefix must be %d characters or less.\n",
-                       MAX_BATCH_PREFIX_LEN);
-               exit_cleanup(RERR_SYNTAX);
+       if (write_batch || read_batch) {
+               if (dry_run) {
+                       snprintf(err_buf, sizeof err_buf,
+                               "--%s-batch cannot be used with --dry_run (-n)\n",
+                               write_batch ? "write" : "read");
+                       return 0;
+               }
+               if (am_server) {
+                       rprintf(FINFO,
+                               "ignoring --%s-batch option sent to server\n",
+                               write_batch ? "write" : "read");
+                       /* We don't actually exit_cleanup(), so that we can
+                        * still service older version clients that still send
+                        * batch args to server. */
+                       read_batch = write_batch = 0;
+                       batch_name = NULL;
+               }
+       }
+       if (read_batch && files_from) {
+               snprintf(err_buf, sizeof err_buf,
+                       "--read-batch cannot be used with --files-from\n");
+               return 0;
+       }
+       if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) {
+               snprintf(err_buf, sizeof err_buf,
+                       "the batch-file name must be %d characters or less.\n",
+                       MAX_BATCH_NAME_LEN);
+               return 0;
        }
 
        if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) {
-               rprintf(FERROR, "the --temp-dir path is WAY too long.\n");
-               exit_cleanup(RERR_SYNTAX);
+               snprintf(err_buf, sizeof err_buf,
+                        "the --temp-dir path is WAY too long.\n");
+               return 0;
        }
 
-       if (do_compression && (write_batch || read_batch)) {
-               rprintf(FERROR,
-                       "compress can not be used with write-batch or read-batch\n");
-               exit_cleanup(RERR_SYNTAX);
+       if (compare_dest + copy_dest + link_dest > 1) {
+               snprintf(err_buf, sizeof err_buf,
+                       "You may not mix --compare-dest, --copy-dest, and --link-dest.\n");
+               return 0;
        }
 
        if (archive_mode) {
                if (!files_from)
-                       recurse = 1;
+                       recurse = -1; /* infinite recursion */
 #if SUPPORT_LINKS
                preserve_links = 1;
 #endif
@@ -642,37 +903,150 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                preserve_devices = 1;
        }
 
+       if (recurse || list_only || files_from)
+               xfer_dirs |= 1;
+
        if (relative_paths < 0)
                relative_paths = files_from? 1 : 0;
 
+       if (!!delete_before + delete_during + delete_after > 1) {
+               snprintf(err_buf, sizeof err_buf,
+                       "You may not combine multiple --delete-WHEN options.\n");
+               return 0;
+       }
+       if (!recurse) {
+               delete_before = delete_during = delete_after = 0;
+               delete_mode = delete_excluded = 0;
+       } else if (delete_before || delete_during || delete_after)
+               delete_mode = 1;
+       else if (delete_mode || delete_excluded)
+               delete_mode = delete_before = 1;
+
+       *argv = poptGetArgs(pc);
+       *argc = count_args(*argv);
+
+       if (sanitize_paths) {
+               int i;
+               for (i = *argc; i-- > 0; )
+                       (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0);
+               if (tmpdir)
+                       tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
+               if (partial_dir)
+                       partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+               if (backup_dir)
+                       backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
+               if (files_from)
+                       files_from = sanitize_path(NULL, files_from, NULL, 0);
+       }
+       if (server_filter_list.head && !am_sender) {
+               struct filter_list_struct *elp = &server_filter_list;
+               int i;
+               if (tmpdir) {
+                       clean_fname(tmpdir, 1);
+                       if (check_filter(elp, tmpdir, 1) < 0)
+                               goto options_rejected;
+               }
+               if (partial_dir) {
+                       clean_fname(partial_dir, 1);
+                       if (check_filter(elp, partial_dir, 1) < 0)
+                               goto options_rejected;
+               }
+               for (i = 0; i < basis_dir_cnt; i++) {
+                       clean_fname(basis_dir[i], 1);
+                       if (check_filter(elp, basis_dir[i], 1) < 0)
+                               goto options_rejected;
+               }
+               if (backup_dir) {
+                       clean_fname(backup_dir, 1);
+                       if (check_filter(elp, backup_dir, 1) < 0)
+                               goto options_rejected;
+               }
+       }
+       if (server_filter_list.head && files_from) {
+               clean_fname(files_from, 1);
+               if (check_filter(&server_filter_list, files_from, 0) < 0) {
+                   options_rejected:
+                       snprintf(err_buf, sizeof err_buf,
+                           "Your options have been rejected by the server.\n");
+                       return 0;
+               }
+       }
+
        if (!backup_suffix)
-               backup_suffix = backup_dir? "" : BACKUP_SUFFIX;
+               backup_suffix = backup_dir ? "" : BACKUP_SUFFIX;
        backup_suffix_len = strlen(backup_suffix);
        if (strchr(backup_suffix, '/') != NULL) {
-               rprintf(FERROR, "--suffix cannot contain slashes: %s\n",
+               snprintf(err_buf, sizeof err_buf,
+                       "--suffix cannot contain slashes: %s\n",
                        backup_suffix);
-               exit_cleanup(RERR_SYNTAX);
+               return 0;
        }
-       if (backup_dir)
-               backup_dir_len = strlen(backup_dir);
-       else if (!backup_suffix_len) {
-               rprintf(FERROR,
+       if (backup_dir) {
+               backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
+               backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
+               if (backup_dir_remainder < 32) {
+                       snprintf(err_buf, sizeof err_buf,
+                               "the --backup-dir path is WAY too long.\n");
+                       return 0;
+               }
+               if (backup_dir_buf[backup_dir_len - 1] != '/') {
+                       backup_dir_buf[backup_dir_len++] = '/';
+                       backup_dir_buf[backup_dir_len] = '\0';
+               }
+               if (verbose > 1 && !am_sender)
+                       rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf);
+       } else if (!backup_suffix_len && (!am_server || !am_sender)) {
+               snprintf(err_buf, sizeof err_buf,
                        "--suffix cannot be a null string without --backup-dir\n");
-               exit_cleanup(RERR_SYNTAX);
+               return 0;
        }
 
        if (do_progress && !verbose)
                verbose = 1;
 
-       *argv = poptGetArgs(pc);
-       if (*argv)
-               *argc = count_args(*argv);
-       else
-               *argc = 0;
+       if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
+               bwlimit = daemon_bwlimit;
+       if (bwlimit) {
+               bwlimit_writemax = (size_t)bwlimit * 128;
+               if (bwlimit_writemax < 512)
+                       bwlimit_writemax = 512;
+       }
+
+       if (delay_updates && !partial_dir)
+               partial_dir = ".~tmp~";
+
+       if (inplace) {
+#if HAVE_FTRUNCATE
+               if (partial_dir) {
+                       snprintf(err_buf, sizeof err_buf,
+                                "--inplace cannot be used with --%s\n",
+                                delay_updates ? "delay-updates" : "partial-dir");
+                       return 0;
+               }
+               keep_partial = 0;
+#else
+               snprintf(err_buf, sizeof err_buf,
+                        "--inplace is not supported on this %s\n",
+                        am_server ? "server" : "client");
+               return 0;
+#endif
+       } else {
+               if (keep_partial && !partial_dir)
+                       partial_dir = getenv("RSYNC_PARTIAL_DIR");
+               if (partial_dir) {
+                       if (!*partial_dir || strcmp(partial_dir, ".") == 0)
+                               partial_dir = NULL;
+                       else if (*partial_dir != '/') {
+                               parse_rule(&filter_list, partial_dir,
+                                   MATCHFLG_NO_PREFIXES|MATCHFLG_DIRECTORY, 0);
+                       }
+                       keep_partial = 1;
+               }
+       }
 
        if (files_from) {
                char *colon;
-               if (*argc != 2) {
+               if (*argc > 2 || (!am_daemon && *argc == 1)) {
                        usage(FERROR);
                        exit_cleanup(RERR_SYNTAX);
                }
@@ -688,28 +1062,21 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        }
                        remote_filesfrom_file = colon+1 + (colon[1] == ':');
                        if (strcmp(remote_filesfrom_file, "-") == 0) {
-                               rprintf(FERROR, "Invalid --files-from remote filename\n");
-                               exit_cleanup(RERR_SYNTAX);
+                               snprintf(err_buf, sizeof err_buf,
+                                       "Invalid --files-from remote filename\n");
+                               return 0;
                        }
                } else {
-                       extern int sanitize_paths;
-                       if (sanitize_paths) {
-                               files_from = strdup(files_from);
-                               sanitize_path(files_from, NULL);
-                       }
                        filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);
                        if (filesfrom_fd < 0) {
-                               rsyserr(FERROR, errno,
-                                       "failed to open files-from file %s",
-                                       files_from);
-                               exit_cleanup(RERR_FILEIO);
+                               snprintf(err_buf, sizeof err_buf,
+                                       "failed to open files-from file %s: %s\n",
+                                       files_from, strerror(errno));
+                               return 0;
                        }
                }
        }
 
-       if (daemon_opt)
-               am_daemon = 1;
-
        return 1;
 }
 
@@ -724,8 +1091,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
  **/
 void server_options(char **args,int *argc)
 {
+       static char argstr[50+MAX_BASIS_DIRS*2];
        int ac = *argc;
-       static char argstr[50];
        char *arg;
 
        int i, x;
@@ -761,6 +1128,10 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'l';
        if (copy_links)
                argstr[x++] = 'L';
+       if (xfer_dirs > 1)
+               argstr[x++] = 'd';
+       if (keep_dirlinks && am_sender)
+               argstr[x++] = 'K';
 
        if (whole_file > 0)
                argstr[x++] = 'W';
@@ -778,9 +1149,11 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
+       if (omit_dir_times && am_sender)
+               argstr[x++] = 'O';
        if (preserve_perms)
                argstr[x++] = 'p';
-       if (recurse)
+       if (recurse < 0)
                argstr[x++] = 'r';
        if (always_checksum)
                argstr[x++] = 'c';
@@ -797,11 +1170,10 @@ void server_options(char **args,int *argc)
        if (do_compression)
                argstr[x++] = 'z';
 
-       /* this is a complete hack - blame Rusty
-
-          this is a hack to make the list_only (remote file list)
-          more useful */
-       if (list_only && !recurse)
+       /* This is a complete hack - blame Rusty.  FIXME!
+        * This hack is only needed for older rsync versions that
+        * don't understand the --list-only option. */
+       if (list_only == 1 && recurse >= 0)
                argstr[x++] = 'r';
 
        argstr[x] = 0;
@@ -809,8 +1181,11 @@ void server_options(char **args,int *argc)
        if (x != 1)
                args[ac++] = argstr;
 
+       if (list_only > 1)
+               args[ac++] = "--list-only";
+
        if (block_size) {
-               if (asprintf(&arg, "-B%u", block_size) < 0)
+               if (asprintf(&arg, "-B%lu", block_size) < 0)
                        goto oom;
                args[ac++] = arg;
        }
@@ -821,11 +1196,9 @@ void server_options(char **args,int *argc)
                args[ac++] = arg;
        }
 
-       if (batch_prefix) {
-               char *r_or_w = write_batch ? "write" : "read";
-               if (asprintf(&arg, "--%s-batch=%s", r_or_w, batch_prefix) < 0)
-                       goto oom;
-               args[ac++] = arg;
+       if (max_size && am_sender) {
+               args[ac++] = "--max-size";
+               args[ac++] = max_size_arg;
        }
 
        if (io_timeout) {
@@ -853,10 +1226,20 @@ void server_options(char **args,int *argc)
                args[ac++] = arg;
        }
 
-       if (delete_excluded)
-               args[ac++] = "--delete-excluded";
-       else if (delete_mode)
-               args[ac++] = "--delete";
+       if (am_sender) {
+               if (delete_excluded)
+                       args[ac++] = "--delete-excluded";
+               else if (delete_before == 1 || delete_after)
+                       args[ac++] = "--delete";
+               if (delete_before > 1)
+                       args[ac++] = "--delete-before";
+               if (delete_during)
+                       args[ac++] = "--delete-during";
+               if (delete_after)
+                       args[ac++] = "--delete-after";
+               if (force_delete)
+                       args[ac++] = "--force";
+       }
 
        if (size_only)
                args[ac++] = "--size-only";
@@ -867,14 +1250,19 @@ void server_options(char **args,int *argc)
                args[ac++] = arg;
        }
 
-       if (keep_partial)
-               args[ac++] = "--partial";
-
-       if (force_delete)
-               args[ac++] = "--force";
+       if (checksum_seed) {
+               if (asprintf(&arg, "--checksum-seed=%d", checksum_seed) < 0)
+                       goto oom;
+               args[ac++] = arg;
+       }
 
-       if (delete_after)
-               args[ac++] = "--delete-after";
+       if (partial_dir && am_sender) {
+               args[ac++] = "--partial-dir";
+               args[ac++] = partial_dir;
+               if (delay_updates)
+                       args[ac++] = "--delay-updates";
+       } else if (keep_partial)
+               args[ac++] = "--partial";
 
        if (ignore_errors)
                args[ac++] = "--ignore-errors";
@@ -894,18 +1282,24 @@ void server_options(char **args,int *argc)
        if (opt_ignore_existing && am_sender)
                args[ac++] = "--ignore-existing";
 
+       if (inplace)
+               args[ac++] = "--inplace";
+
        if (tmpdir) {
                args[ac++] = "--temp-dir";
                args[ac++] = tmpdir;
        }
 
-       if (compare_dest && am_sender) {
+       if (basis_dir[0] && am_sender) {
                /* the server only needs this option if it is not the sender,
                 *   and it may be an older version that doesn't know this
                 *   option, so don't send it if client is the sender.
                 */
-               args[ac++] = link_dest ? "--link-dest" : "--compare-dest";
-               args[ac++] = compare_dest;
+               int i;
+               for (i = 0; i < basis_dir_cnt; i++) {
+                       args[ac++] = dest_option;
+                       args[ac++] = basis_dir[i];
+               }
        }
 
        if (files_from && (!am_sender || remote_filesfrom_file)) {
@@ -918,7 +1312,11 @@ void server_options(char **args,int *argc)
                        args[ac++] = "--files-from=-";
                        args[ac++] = "--from0";
                }
+               if (!relative_paths)
+                       args[ac++] = "--no-relative";
        }
+       if (!implied_dirs && !am_sender)
+               args[ac++] = "--no-implied-dirs";
 
        *argc = ac;
        return;