- Changed add_filter() to parse_rule() and add_filter_file()
[rsync.git] / options.c
index 002aa9a83877b33e7c179dfef0aafdc55f2c1673..a00370fcf3f9dca32c010249fa8882187764d92a 100644 (file)
--- a/options.c
+++ b/options.c
 #include "rsync.h"
 #include "popt.h"
 
+extern int module_id;
 extern int sanitize_paths;
 extern int select_timeout;
-extern struct exclude_list_struct exclude_list;
-extern struct exclude_list_struct server_exclude_list;
+extern struct filter_list_struct filter_list;
+extern struct filter_list_struct server_filter_list;
 
 int make_backups = 0;
 
@@ -48,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;
@@ -66,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;
@@ -87,7 +90,6 @@ int size_only = 0;
 int daemon_bwlimit = 0;
 int bwlimit = 0;
 size_t bwlimit_writemax = 0;
-int delete_after = 0;
 int only_existing = 0;
 int opt_ignore_existing = 0;
 int max_delete = 0;
@@ -97,11 +99,12 @@ int modify_window = 0;
 int blocking_io = -1;
 int checksum_seed = 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 */
@@ -144,6 +147,7 @@ int list_only = 0;
 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;
@@ -163,7 +167,7 @@ static void print_rsync_version(enum logcode f)
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;
 
-#ifdef HAVE_SOCKETPAIR
+#if HAVE_SOCKETPAIR
        got_socketpair = "";
 #endif
 
@@ -186,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",
@@ -199,16 +203,20 @@ static void print_rsync_version(enum logcode f)
        rprintf(f, "              %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n",
                have_inplace, ipv6,
                (int) (sizeof dumstat->st_ino * 8),
-               (int) (sizeof (uint64) * 8));
+               (int) (sizeof (int64) * 8));
 #ifdef MAINTAINER_MODE
        rprintf(f, "              panic action: \"%s\"\n",
                get_panic_action());
 #endif
 
-#ifdef INT64_IS_OFF_T
-       if (sizeof (int64) < 8)
-               rprintf(f, "WARNING: no 64-bit integers on this platform!\n");
+#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"
@@ -237,78 +245,88 @@ 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 (no -H)\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,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
-  rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\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       force a fixed checksum block-size\n");
-  rprintf(F," -e, --rsh=COMMAND           specify the remote shell\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,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
-  rprintf(F,"     --force                 force deletion of directories even if not empty\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," -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,"     --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," -P                          equivalent to --partial --progress\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,"     --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,"     --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=FILE      write a batch to FILE\n");
-  rprintf(F,"     --read-batch=FILE       read a batch from FILE\n");
-#ifdef INET6
+  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
@@ -320,8 +338,7 @@ void usage(enum logcode F)
 }
 
 enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
-      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED,
-      OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
+      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_TIMEOUT, OPT_MAX_SIZE,
       OPT_REFUSED_BASE = 9000};
@@ -336,13 +353,16 @@ static struct poptOption long_options[] = {
   {"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 },
+  {"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 },
@@ -355,9 +375,10 @@ static struct poptOption long_options[] = {
   {"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 },
-  {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 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 },
@@ -366,13 +387,15 @@ 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 },
   {"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 },
+  {"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 },
@@ -390,9 +413,11 @@ static struct poptOption long_options[] = {
   {"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,                 '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 },
@@ -406,7 +431,7 @@ static struct poptOption long_options[] = {
   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
   {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
-#ifdef INET6
+#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
@@ -424,11 +449,12 @@ static void daemon_usage(enum logcode 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,"     --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             specify alternate rsyncd port number\n");
-#ifdef INET6
+  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
@@ -444,7 +470,7 @@ static struct poptOption long_daemon_options[] = {
   {"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 },
-#ifdef INET6
+#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
@@ -452,6 +478,7 @@ static struct poptOption long_daemon_options[] = {
   {"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}
 };
@@ -505,6 +532,8 @@ static void set_refuse_options(char *bp)
                                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)
@@ -559,6 +588,16 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        /* 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) {
@@ -584,6 +623,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                                        daemon_usage(FINFO);
                                        exit_cleanup(0);
 
+                               case 'v':
+                                       verbose++;
+                                       break;
+
                                default:
                                        rprintf(FERROR,
                                            "rsync: %s: %s (in daemon mode)\n",
@@ -612,23 +655,18 @@ 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), 0);
+                       parse_rule(&filter_list, poptGetOptArg(pc),
+                                  0, XFLG_OLD_PREFIXES);
                        break;
 
                case OPT_INCLUDE:
-                       add_exclude(&exclude_list, poptGetOptArg(pc),
-                                   XFLG_DEF_INCLUDE);
+                       parse_rule(&filter_list, poptGetOptArg(pc),
+                                  MATCHFLG_INCLUDE, XFLG_OLD_PREFIXES);
                        break;
 
                case OPT_EXCLUDE_FROM:
@@ -636,15 +674,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        arg = poptGetOptArg(pc);
                        if (sanitize_paths)
                                arg = sanitize_path(NULL, arg, NULL, 0);
-                       if (server_exclude_list.head) {
+                       if (server_filter_list.head) {
                                char *cp = (char *)arg;
                                clean_fname(cp, 1);
-                               if (check_exclude(&server_exclude_list, cp, 0) < 0)
+                               if (check_filter(&server_filter_list, cp, 0) < 0)
                                        goto options_rejected;
                        }
-                       add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS
-                                        | (opt == OPT_INCLUDE_FROM
-                                         ? XFLG_DEF_INCLUDE : 0));
+                       parse_filter_file(&filter_list, arg,
+                               opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
+                               XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
                        break;
 
                case 'h':
@@ -668,6 +706,17 @@ 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;
@@ -684,9 +733,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        break;
 
                case OPT_MAX_SIZE:
-                       for (arg = max_size_arg; isdigit(*arg); arg++) {}
+                       for (arg = max_size_arg; isdigit(*(uchar*)arg); arg++) {}
                        if (*arg == '.')
-                               for (arg++; isdigit(*arg); arg++) {}
+                               for (arg++; isdigit(*(uchar*)arg); arg++) {}
                        switch (*arg) {
                        case 'k': case 'K':
                                max_size = atof(max_size_arg) * 1024;
@@ -738,7 +787,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        compare_dest = 1;
                        dest_option = "--compare-dest";
                set_dest_dir:
-                       if (basis_dir_cnt >= MAX_BASIS_DIRS-1) {
+                       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);
@@ -773,6 +822,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                }
        }
 
+       if (am_sender < 0)
+               am_sender = 0;
+
 #if !SUPPORT_LINKS
        if (preserve_links && !am_sender) {
                snprintf(err_buf, sizeof err_buf,
@@ -840,7 +892,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
        if (archive_mode) {
                if (!files_from)
-                       recurse = 1;
+                       recurse = -1; /* infinite recursion */
 #if SUPPORT_LINKS
                preserve_links = 1;
 #endif
@@ -851,9 +903,25 @@ 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);
 
@@ -870,33 +938,33 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                if (files_from)
                        files_from = sanitize_path(NULL, files_from, NULL, 0);
        }
-       if (server_exclude_list.head && !am_sender) {
-               struct exclude_list_struct *elp = &server_exclude_list;
+       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_exclude(elp, tmpdir, 1) < 0)
+                       if (check_filter(elp, tmpdir, 1) < 0)
                                goto options_rejected;
                }
                if (partial_dir) {
                        clean_fname(partial_dir, 1);
-                       if (check_exclude(elp, partial_dir, 1) < 0)
+                       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_exclude(elp, basis_dir[i], 1) < 0)
+                       if (check_filter(elp, basis_dir[i], 1) < 0)
                                goto options_rejected;
                }
                if (backup_dir) {
                        clean_fname(backup_dir, 1);
-                       if (check_exclude(elp, backup_dir, 1) < 0)
+                       if (check_filter(elp, backup_dir, 1) < 0)
                                goto options_rejected;
                }
        }
-       if (server_exclude_list.head && files_from) {
+       if (server_filter_list.head && files_from) {
                clean_fname(files_from, 1);
-               if (check_exclude(&server_exclude_list, files_from, 0) < 0) {
+               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");
@@ -944,20 +1012,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        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 --partial-dir\n");
+                                "--inplace cannot be used with --%s\n",
+                                delay_updates ? "delay-updates" : "partial-dir");
                        return 0;
                }
                keep_partial = 0;
-               if (dest_option) {
-                       snprintf(err_buf, sizeof err_buf,
-                                "--inplace does not yet work with %s\n",
-                                dest_option);
-                       return 0;
-               }
 #else
                snprintf(err_buf, sizeof err_buf,
                         "--inplace is not supported on this %s\n",
@@ -971,8 +1037,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        if (!*partial_dir || strcmp(partial_dir, ".") == 0)
                                partial_dir = NULL;
                        else if (*partial_dir != '/') {
-                               add_exclude(&exclude_list, partial_dir,
-                                           XFLG_DIRECTORY);
+                               parse_rule(&filter_list, partial_dir,
+                                   MATCHFLG_NO_PREFIXES|MATCHFLG_DIRECTORY, 0);
                        }
                        keep_partial = 1;
                }
@@ -1062,6 +1128,8 @@ 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';
 
@@ -1081,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';
@@ -1100,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;
@@ -1112,6 +1181,9 @@ 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%lu", block_size) < 0)
                        goto oom;
@@ -1157,12 +1229,14 @@ void server_options(char **args,int *argc)
        if (am_sender) {
                if (delete_excluded)
                        args[ac++] = "--delete-excluded";
-               else if (delete_mode)
+               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";
        }
@@ -1185,6 +1259,8 @@ void server_options(char **args,int *argc)
        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";
 
@@ -1239,6 +1315,8 @@ void server_options(char **args,int *argc)
                if (!relative_paths)
                        args[ac++] = "--no-relative";
        }
+       if (!implied_dirs && !am_sender)
+               args[ac++] = "--no-implied-dirs";
 
        *argc = ac;
        return;