- Added the --qsort option.
[rsync.git] / options.c
index 6f26bea8fc17dfa74fae556a4ba9497067990760..b49c1151bf09eb6765b486d8775ae07dc7d75e91 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1,21 +1,22 @@
-/*  -*- c-file-style: "linux" -*-
+/*
+ * Command-line (and received via daemon-socket) option parsing.
  *
- * Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
- * Copyright (C) 2000, 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2002-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "rsync.h"
@@ -45,6 +46,8 @@ int copy_dirlinks = 0;
 int copy_links = 0;
 int preserve_links = 0;
 int preserve_hard_links = 0;
+int preserve_acls = 0;
+int preserve_xattrs = 0;
 int preserve_perms = 0;
 int preserve_executability = 0;
 int preserve_devices = 0;
@@ -63,13 +66,13 @@ int delete_during = 0;
 int delete_before = 0;
 int delete_after = 0;
 int delete_excluded = 0;
-int remove_sent_files = 0;
+int remove_source_files = 0;
 int one_file_system = 0;
 int protocol_version = PROTOCOL_VERSION;
 int sparse_files = 0;
 int do_compression = 0;
 int def_compress_level = Z_DEFAULT_COMPRESSION;
-int am_root = 0;
+int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */
 int am_server = 0;
 int am_sender = 0;
 int am_generator = 0;
@@ -82,12 +85,14 @@ int force_delete = 0;
 int io_timeout = 0;
 int allowed_lull = 0;
 int prune_empty_dirs = 0;
+int use_qsort = 0;
 char *files_from = NULL;
 int filesfrom_fd = -1;
 char *filesfrom_host = NULL;
 int eol_nulls = 0;
 int human_readable = 0;
 int recurse = 0;
+int allow_inc_recurse = 1;
 int xfer_dirs = -1;
 int am_daemon = 0;
 int daemon_over_rsh = 0;
@@ -104,7 +109,7 @@ size_t bwlimit_writemax = 0;
 int ignore_existing = 0;
 int ignore_non_existing = 0;
 int need_messages_from_generator = 0;
-int max_delete = 0;
+int max_delete = -1;
 OFF_T max_size = 0;
 OFF_T min_size = 0;
 int ignore_errors = 0;
@@ -115,7 +120,6 @@ int inplace = 0;
 int delay_updates = 0;
 long block_size = 0; /* "long" because popt can't set an int32. */
 
-
 /** Network address family. **/
 #ifdef INET6
 int default_af_hint = 0;       /* Any protocol */
@@ -145,7 +149,9 @@ char *partial_dir = NULL;
 char *basis_dir[MAX_BASIS_DIRS+1];
 char *config_file = NULL;
 char *shell_cmd = NULL;
-char *log_format = NULL;
+char *logfile_name = NULL;
+char *logfile_format = NULL;
+char *stdout_format = NULL;
 char *password_file = NULL;
 char *rsync_path = RSYNC_PATH;
 char *backup_dir = NULL;
@@ -160,15 +166,23 @@ char *dest_option = NULL;
 
 int verbose = 0;
 int quiet = 0;
+int output_motd = 1;
 int log_before_transfer = 0;
-int log_format_has_i = 0;
-int log_format_has_o_or_i = 0;
+int stdout_format_has_i = 0;
+int stdout_format_has_o_or_i = 0;
+int logfile_format_has_i = 0;
+int logfile_format_has_o_or_i = 0;
 int always_checksum = 0;
 int list_only = 0;
 
 #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
 char *batch_name = NULL;
 
+#ifdef ICONV_OPTION
+int need_unsorted_flist = 0;
+char *iconv_opt = ICONV_OPTION;
+#endif
+
 struct chmod_mode_struct *chmod_modes = NULL;
 
 static int daemon_opt;   /* sets am_daemon after option error-reporting */
@@ -177,6 +191,7 @@ static int modify_window_set;
 static int itemize_changes = 0;
 static int refused_delete, refused_archive_part, refused_compress;
 static int refused_partial, refused_progress, refused_delete_before;
+static int refused_delete_during;
 static int refused_inplace;
 static char *max_size_arg, *min_size_arg;
 static char tmp_partialdir[] = ".~tmp~";
@@ -189,50 +204,60 @@ char *bind_address;
 
 static void print_rsync_version(enum logcode f)
 {
+       char *subprotocol = "";
        char const *got_socketpair = "no ";
        char const *have_inplace = "no ";
        char const *hardlinks = "no ";
+       char const *acls = "no ";
+       char const *xattrs = "no ";
        char const *links = "no ";
+       char const *iconv = "no ";
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;
 
+#if SUBPROTOCOL_VERSION != 0
+       asprintf(&subprotocol, ".PR%d", SUBPROTOCOL_VERSION);
+#endif
 #ifdef HAVE_SOCKETPAIR
        got_socketpair = "";
 #endif
-
 #ifdef HAVE_FTRUNCATE
        have_inplace = "";
 #endif
-
 #ifdef SUPPORT_HARD_LINKS
        hardlinks = "";
 #endif
-
+#ifdef SUPPORT_ACLS
+       acls = "";
+#endif
+#ifdef SUPPORT_XATTRS
+       xattrs = "";
+#endif
 #ifdef SUPPORT_LINKS
        links = "";
 #endif
-
 #ifdef INET6
        ipv6 = "";
 #endif
+#ifdef ICONV_OPTION
+       iconv = "";
+#endif
+
+       rprintf(f, "%s  version %s  protocol version %d%s\n",
+               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
+       rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
+       rprintf(f, "Web site: http://rsync.samba.org/\n");
+       rprintf(f, "Capabilities:\n");
+       rprintf(f, "    %d-bit files, %d-bit inums, %d-bit timestamps, %d-bit long ints,\n",
+               (int)(sizeof (OFF_T) * 8),
+               (int)(sizeof dumstat->st_ino * 8), /* Don't check ino_t! */
+               (int)(sizeof (time_t) * 8),
+               (int)(sizeof (int64) * 8));
+       rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
+               got_socketpair, hardlinks, links, ipv6, have_inplace);
+       rprintf(f, "    %sappend, %sACLs, %sxattrs, %siconv\n",
+               have_inplace, acls, xattrs, iconv);
 
-       rprintf(f, "%s  version %s  protocol version %d\n",
-               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
-       rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-       rprintf(f, "<http://rsync.samba.org/>\n");
-       rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
-               "%shard links, %ssymlinks, batchfiles,\n",
-               (int) (sizeof (OFF_T) * 8),
-               got_socketpair, hardlinks, links);
-
-       /* Note that this field may not have type ino_t.  It depends
-        * on the complicated interaction between largefile feature
-        * macros. */
-       rprintf(f, "              %sinplace, %sIPv6, "
-               "%d-bit system inums, %d-bit internal inums\n",
-               have_inplace, ipv6,
-               (int) (sizeof dumstat->st_ino * 8),
-               (int) (sizeof (int64) * 8));
 #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
 #endif
@@ -246,7 +271,8 @@ static void print_rsync_version(enum logcode f)
                        (int) SIZEOF_INT64, (int) sizeof (int64));
        }
 
-       rprintf(f,"\nrsync comes with ABSOLUTELY NO WARRANTY.  This is free software, and you\n");
+       rprintf(f,"\n");
+       rprintf(f,"rsync comes with ABSOLUTELY NO WARRANTY.  This is free software, and you\n");
        rprintf(f,"are welcome to redistribute it under certain conditions.  See the GNU\n");
        rprintf(f,"General Public Licence for details.\n");
 }
@@ -256,10 +282,12 @@ void usage(enum logcode F)
 {
   print_rsync_version(F);
 
-  rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\n");
+  rprintf(F,"\n");
+  rprintf(F,"rsync is a file transfer program capable of efficient remote update\n");
   rprintf(F,"via a fast differencing algorithm.\n");
 
-  rprintf(F,"\nUsage: rsync [OPTION]... SRC [SRC]... DEST\n");
+  rprintf(F,"\n");
+  rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... DEST\n");
   rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
   rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n");
   rprintf(F,"  or   rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n");
@@ -268,11 +296,13 @@ void usage(enum logcode F)
   rprintf(F,"  or   rsync [OPTION]... rsync://[USER@]HOST[:PORT]/SRC [DEST]\n");
   rprintf(F,"The ':' usages connect via remote shell, while '::' & 'rsync://' usages connect\n");
   rprintf(F,"to an rsync daemon, and require SRC or DEST to start with a module name.\n");
-  rprintf(F,"\nOptions\n");
+  rprintf(F,"\n");
+  rprintf(F,"Options\n");
   rprintf(F," -v, --verbose               increase verbosity\n");
   rprintf(F," -q, --quiet                 suppress non-error messages\n");
+  rprintf(F,"     --no-motd               suppress daemon-mode MOTD (see manpage caveat)\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," -a, --archive               archive mode; equals -rlptgoD (no -H,-A,-X)\n");
   rprintf(F,"     --no-OPTION             turn off an implied OPTION (e.g. --no-D)\n");
   rprintf(F," -r, --recursive             recurse into directories\n");
   rprintf(F," -R, --relative              use relative path names\n");
@@ -293,7 +323,13 @@ void usage(enum logcode F)
   rprintf(F," -H, --hard-links            preserve hard links\n");
   rprintf(F," -p, --perms                 preserve permissions\n");
   rprintf(F," -E, --executability         preserve the file's executability\n");
-  rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
+  rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
+#ifdef SUPPORT_ACLS
+  rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
+#endif
+#ifdef SUPPORT_XATTRS
+  rprintf(F," -X, --xattrs                preserve extended attributes (implies --perms)\n");
+#endif
   rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
   rprintf(F," -g, --group                 preserve group\n");
   rprintf(F,"     --devices               preserve device files (super-user only)\n");
@@ -302,6 +338,9 @@ void usage(enum logcode F)
   rprintf(F," -t, --times                 preserve times\n");
   rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
   rprintf(F,"     --super                 receiver attempts super-user activities\n");
+#ifdef SUPPORT_XATTRS
+  rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
+#endif
   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 files whole (without rsync algorithm)\n");
@@ -309,15 +348,16 @@ void usage(enum logcode F)
   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=PROGRAM    specify the rsync to run on the remote machine\n");
-  rprintf(F,"     --existing              ignore non-existing files on receiving side\n");
-  rprintf(F,"     --ignore-existing       ignore files that already exist on receiving side\n");
-  rprintf(F,"     --remove-sent-files     sent files/symlinks are removed from sending side\n");
+  rprintf(F,"     --existing              skip creating new files on receiver\n");
+  rprintf(F,"     --ignore-existing       skip updating files that already exist on receiver\n");
+  rprintf(F,"     --remove-source-files   sender removes synchronized files (non-dirs)\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                delete extraneous files from destination dirs\n");
+  rprintf(F,"     --delete-before         receiver deletes before transfer, not during\n");
+  rprintf(F,"     --delete-during         receiver deletes during transfer (default)\n");
+  rprintf(F,"     --delete-delay          find deletions during, delete after\n");
+  rprintf(F,"     --delete-after          receiver deletes after transfer, not during\n");
+  rprintf(F,"     --delete-excluded       also delete excluded files from destination dirs\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");
@@ -359,14 +399,19 @@ void usage(enum logcode F)
   rprintf(F,"     --progress              show progress during transfer\n");
   rprintf(F," -P                          same as --partial --progress\n");
   rprintf(F," -i, --itemize-changes       output a change-summary for all updates\n");
-  rprintf(F,"     --log-format=FORMAT     output filenames using the specified format\n");
-  rprintf(F,"     --password-file=FILE    read password from FILE\n");
+  rprintf(F,"     --out-format=FORMAT     output updates using the specified FORMAT\n");
+  rprintf(F,"     --log-file=FILE         log what we're doing to the specified FILE\n");
+  rprintf(F,"     --log-file-format=FMT   log updates using the specified FMT\n");
+  rprintf(F,"     --password-file=FILE    read daemon-access 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,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
   rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
   rprintf(F,"     --protocol=NUM          force an older protocol version to be used\n");
+#ifdef ICONV_OPTION
+  rprintf(F,"     --iconv=CONVERT_SPEC    request charset conversion of filesnames\n");
+#endif
 #ifdef INET6
   rprintf(F," -4, --ipv4                  prefer IPv4\n");
   rprintf(F," -6, --ipv6                  prefer IPv6\n");
@@ -374,7 +419,8 @@ void usage(enum logcode F)
   rprintf(F,"     --version               print version number\n");
   rprintf(F,"(-h) --help                  show this help (-h works with no other options)\n");
 
-  rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n");
+  rprintf(F,"\n");
+  rprintf(F,"Use \"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");
 }
@@ -394,13 +440,21 @@ static struct poptOption long_options[] = {
   {"no-verbose",       0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
   {"no-v",             0,  POPT_ARG_VAL,    &verbose, 0, 0, 0 },
   {"quiet",           'q', POPT_ARG_NONE,   0, 'q', 0, 0 },
+  {"motd",             0,  POPT_ARG_VAL,    &output_motd, 1, 0, 0 },
+  {"no-motd",          0,  POPT_ARG_VAL,    &output_motd, 0, 0, 0 },
   {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
   {"human-readable",  'h', POPT_ARG_NONE,   0, 'h', 0, 0},
+  {"no-human-readable",0,  POPT_ARG_VAL,    &human_readable, 0, 0, 0},
+  {"no-h",             0,  POPT_ARG_VAL,    &human_readable, 0, 0, 0},
   {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
   {"archive",         'a', POPT_ARG_NONE,   0, 'a', 0, 0 },
   {"recursive",       'r', POPT_ARG_VAL,    &recurse, 2, 0, 0 },
   {"no-recursive",     0,  POPT_ARG_VAL,    &recurse, 0, 0, 0 },
   {"no-r",             0,  POPT_ARG_VAL,    &recurse, 0, 0, 0 },
+  {"inc-recursive",    0,  POPT_ARG_VAL,    &allow_inc_recurse, 1, 0, 0 },
+  {"no-inc-recursive", 0,  POPT_ARG_VAL,    &allow_inc_recurse, 0, 0, 0 },
+  {"ir",               0,  POPT_ARG_VAL,    &allow_inc_recurse, 1, 0, 0 },
+  {"no-ir",            0,  POPT_ARG_VAL,    &allow_inc_recurse, 0, 0, 0 },
   {"dirs",            'd', POPT_ARG_VAL,    &xfer_dirs, 2, 0, 0 },
   {"no-dirs",          0,  POPT_ARG_VAL,    &xfer_dirs, 0, 0, 0 },
   {"no-d",             0,  POPT_ARG_VAL,    &xfer_dirs, 0, 0, 0 },
@@ -408,6 +462,12 @@ static struct poptOption long_options[] = {
   {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
   {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
   {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
+  {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
+  {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
+  {"no-A",             0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
+  {"xattrs",          'X', POPT_ARG_NONE,   0, 'X', 0, 0 },
+  {"no-xattrs",        0,  POPT_ARG_VAL,    &preserve_xattrs, 0, 0, 0 },
+  {"no-X",             0,  POPT_ARG_VAL,    &preserve_xattrs, 0, 0, 0 },
   {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
   {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
   {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
@@ -415,6 +475,7 @@ static struct poptOption long_options[] = {
   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
   {"super",            0,  POPT_ARG_VAL,    &am_root, 2, 0, 0 },
   {"no-super",         0,  POPT_ARG_VAL,    &am_root, 0, 0, 0 },
+  {"fake-super",       0,  POPT_ARG_VAL,    &am_root, -1, 0, 0 },
   {"owner",           'o', POPT_ARG_VAL,    &preserve_uid, 1, 0, 0 },
   {"no-owner",         0,  POPT_ARG_VAL,    &preserve_uid, 0, 0, 0 },
   {"no-o",             0,  POPT_ARG_VAL,    &preserve_uid, 0, 0, 0 },
@@ -435,7 +496,7 @@ static struct poptOption long_options[] = {
   {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
   {"copy-dirlinks",   'k', POPT_ARG_NONE,   &copy_dirlinks, 0, 0, 0 },
   {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
-  {"hard-links",      'H', POPT_ARG_VAL,    &preserve_hard_links, 1, 0, 0 },
+  {"hard-links",      'H', POPT_ARG_NONE,   0, 'H', 0, 0 },
   {"no-hard-links",    0,  POPT_ARG_VAL,    &preserve_hard_links, 0, 0, 0 },
   {"no-H",             0,  POPT_ARG_VAL,    &preserve_hard_links, 0, 0, 0 },
   {"relative",        'R', POPT_ARG_VAL,    &relative_paths, 1, 0, 0 },
@@ -458,11 +519,13 @@ static struct poptOption long_options[] = {
   {"append",           0,  POPT_ARG_VAL,    &append_mode, 1, 0, 0 },
   {"del",              0,  POPT_ARG_NONE,   &delete_during, 0, 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-before",    0,  POPT_ARG_NONE,   &delete_before, 0, 0, 0 },
+  {"delete-during",    0,  POPT_ARG_VAL,    &delete_during, 1, 0, 0 },
+  {"delete-delay",     0,  POPT_ARG_VAL,    &delete_during, 2, 0, 0 },
   {"delete-after",     0,  POPT_ARG_NONE,   &delete_after, 0, 0, 0 },
   {"delete-excluded",  0,  POPT_ARG_NONE,   &delete_excluded, 0, 0, 0 },
-  {"remove-sent-files",0,  POPT_ARG_NONE,   &remove_sent_files, 0, 0, 0 },
+  {"remove-sent-files",0,  POPT_ARG_VAL,    &remove_source_files, 2, 0, 0 }, /* deprecated */
+  {"remove-source-files",0,POPT_ARG_VAL,    &remove_source_files, 1, 0, 0 },
   {"force",            0,  POPT_ARG_NONE,   &force_delete, 0, 0, 0 },
   {"ignore-errors",    0,  POPT_ARG_NONE,   &ignore_errors, 0, 0, 0 },
   {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
@@ -476,13 +539,17 @@ static struct poptOption long_options[] = {
   {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
   {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
   {"no-W",             0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
-  {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
+  {"checksum",        'c', POPT_ARG_VAL,    &always_checksum, 1, 0, 0 },
+  {"no-checksum",      0,  POPT_ARG_VAL,    &always_checksum, 0, 0, 0 },
+  {"no-c",             0,  POPT_ARG_VAL,    &always_checksum, 0, 0, 0 },
   {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 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 },
   {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
   {"compress",        'z', POPT_ARG_NONE,   0, 'z', 0, 0 },
+  {"no-compress",      0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
+  {"no-z",             0,  POPT_ARG_VAL,    &do_compression, 0, 0, 0 },
   {"compress-level",   0,  POPT_ARG_INT,    &def_compress_level, 'z', 0, 0 },
   {0,                 'P', POPT_ARG_NONE,   0, 'P', 0, 0 },
   {"progress",         0,  POPT_ARG_VAL,    &do_progress, 1, 0, 0 },
@@ -490,12 +557,20 @@ static struct poptOption long_options[] = {
   {"partial",          0,  POPT_ARG_VAL,    &keep_partial, 1, 0, 0 },
   {"no-partial",       0,  POPT_ARG_VAL,    &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 },
+  {"delay-updates",    0,  POPT_ARG_VAL,    &delay_updates, 1, 0, 0 },
+  {"no-delay-updates", 0,  POPT_ARG_VAL,    &delay_updates, 0, 0, 0 },
   {"prune-empty-dirs",'m', POPT_ARG_NONE,   &prune_empty_dirs, 0, 0, 0 },
-  {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
+  {"log-file",         0,  POPT_ARG_STRING, &logfile_name, 0, 0, 0 },
+  {"log-file-format",  0,  POPT_ARG_STRING, &logfile_format, 0, 0, 0 },
+  {"out-format",       0,  POPT_ARG_STRING, &stdout_format, 0, 0, 0 },
+  {"log-format",       0,  POPT_ARG_STRING, &stdout_format, 0, 0, 0 }, /* DEPRECATED */
   {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
+  {"no-itemize-changes",0, POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
+  {"no-i",             0,  POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
-  {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
+  {"no-bwlimit",       0,  POPT_ARG_VAL,    &bwlimit, 0, 0, 0 },
+  {"backup",          'b', POPT_ARG_VAL,    &make_backups, 1, 0, 0 },
+  {"no-backup",        0,  POPT_ARG_VAL,    &make_backups, 0, 0, 0 },
   {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
   {"list-only",        0,  POPT_ARG_VAL,    &list_only, 2, 0, 0 },
@@ -503,17 +578,24 @@ static struct poptOption long_options[] = {
   {"write-batch",      0,  POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
   {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_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},
-  {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
+  {"from0",           '0', POPT_ARG_VAL,    &eol_nulls, 1, 0, 0},
+  {"no-from0",         0,  POPT_ARG_VAL,    &eol_nulls, 0, 0, 0},
+  {"numeric-ids",      0,  POPT_ARG_VAL,    &numeric_ids, 1, 0, 0 },
+  {"no-numeric-ids",   0,  POPT_ARG_VAL,    &numeric_ids, 0, 0, 0 },
   {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
+  {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
   {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
   {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
+#ifdef ICONV_OPTION
+  {"iconv",            0,  POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
+#endif
 #ifdef 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
   {"8-bit-output",    '8', POPT_ARG_NONE,   &allow_8bit_chars, 0, 0, 0 },
+  {"qsort",            0,  POPT_ARG_NONE,   &use_qsort, 0, 0, 0 },
   {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
   {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
   {"sockopts",         0,  POPT_ARG_STRING, &sockopts, 0, 0, 0 },
@@ -536,12 +618,15 @@ static void daemon_usage(enum logcode F)
 {
   print_rsync_version(F);
 
-  rprintf(F,"\nUsage: rsync --daemon [OPTION]...\n");
+  rprintf(F,"\n");
+  rprintf(F,"Usage: 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,"     --log-file=FILE         override the \"log file\" setting\n");
+  rprintf(F,"     --log-file-format=FMT   override the \"log format\" setting\n");
   rprintf(F,"     --sockopts=OPTIONS      specify custom TCP options\n");
   rprintf(F," -v, --verbose               increase verbosity\n");
 #ifdef INET6
@@ -550,7 +635,8 @@ static void daemon_usage(enum logcode F)
 #endif
   rprintf(F,"     --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,"\n");
+  rprintf(F,"If 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");
 }
 
@@ -566,6 +652,8 @@ static struct poptOption long_daemon_options[] = {
 #endif
   {"detach",           0,  POPT_ARG_VAL,    &no_detach, 0, 0, 0 },
   {"no-detach",        0,  POPT_ARG_VAL,    &no_detach, 1, 0, 0 },
+  {"log-file",         0,  POPT_ARG_STRING, &logfile_name, 0, 0, 0 },
+  {"log-file-format",  0,  POPT_ARG_STRING, &logfile_format, 0, 0, 0 },
   {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
   {"sockopts",         0,  POPT_ARG_STRING, &sockopts, 0, 0, 0 },
   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
@@ -590,8 +678,9 @@ static char err_buf[200];
 void option_error(void)
 {
        if (!err_buf[0]) {
-               strcpy(err_buf, "Error parsing options: "
-                   "option may be supported on client but not on server?\n");
+               strlcpy(err_buf, "Error parsing options: option may "
+                       "be supported on client but not on server?\n",
+                       sizeof err_buf);
        }
 
        rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
@@ -644,6 +733,8 @@ static void set_refuse_options(char *bp)
                                                refused_delete = op->val;
                                        else if (wildmatch("delete-before", op->longName))
                                                refused_delete_before = op->val;
+                                       else if (wildmatch("delete-during", op->longName))
+                                               refused_delete_during = op->val;
                                        else if (wildmatch("partial", op->longName))
                                                refused_partial = op->val;
                                        else if (wildmatch("progress", op->longName))
@@ -665,17 +756,6 @@ static void set_refuse_options(char *bp)
                *cp = ' ';
                bp = cp + 1;
        }
-
-       for (op = long_options; ; op++) {
-               *shortname = op->shortName;
-               if (!op->longName && !*shortname)
-                       break;
-               if (op->val == OPT_DAEMON) {
-                       if (op->argInfo == POPT_ARG_VAL)
-                               op->argInfo = POPT_ARG_NONE;
-                       op->val = (op - long_options) + OPT_REFUSED_BASE;
-               }
-       }
 }
 
 
@@ -698,9 +778,9 @@ static OFF_T parse_size_arg(char **size_arg, char def_suf)
        const char *arg;
        OFF_T size = 1;
 
-       for (arg = *size_arg; isdigit(*(uchar*)arg); arg++) {}
+       for (arg = *size_arg; isDigit(arg); arg++) {}
        if (*arg == '.')
-               for (arg++; isdigit(*(uchar*)arg); arg++) {}
+               for (arg++; isDigit(arg); arg++) {}
        switch (*arg && *arg != '+' && *arg != '-' ? *arg++ : def_suf) {
        case 'b': case 'B':
                reps = 0;
@@ -739,7 +819,7 @@ static OFF_T parse_size_arg(char **size_arg, char def_suf)
                OFF_T num = size;
                *s = '\0';
                while (num) {
-                       *--s = (num % 10) + '0';
+                       *--s = (char)(num % 10) + '0';
                        num /= 10;
                }
                if (!(*size_arg = strdup(s)))
@@ -780,6 +860,13 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
        if (ref && *ref)
                set_refuse_options(ref);
+       if (am_daemon)
+               set_refuse_options("log-file*");
+
+#ifdef ICONV_OPTION
+       if (!am_daemon && (arg = getenv("RSYNC_ICONV")) != NULL && *arg)
+               iconv_opt = strdup(arg);
+#endif
 
        /* TODO: Call poptReadDefaultConfig; handle errors. */
 
@@ -806,6 +893,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                                                    long_options, 0);
                                am_server = 1;
                        }
+#ifdef ICONV_OPTION
+                       iconv_opt = NULL;
+#endif
                        break;
 
                case OPT_SENDER:
@@ -818,9 +908,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
                case OPT_DAEMON:
                        if (am_daemon) {
-                               strcpy(err_buf, "Attempt to hack rsync thwarted!\n");
+                               strlcpy(err_buf,
+                                       "Attempt to hack rsync thwarted!\n",
+                                       sizeof err_buf);
                                return 0;
                        }
+#ifdef ICONV_OPTION
+                       iconv_opt = NULL;
+#endif
                        poptFreeContext(pc);
                        pc = poptGetContext(RSYNC_NAME, *argc, *argv,
                                            long_daemon_options, 0);
@@ -889,14 +984,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                case OPT_INCLUDE_FROM:
                        arg = poptGetOptArg(pc);
                        if (sanitize_paths)
-                               arg = sanitize_path(NULL, arg, NULL, 0);
+                               arg = sanitize_path(NULL, arg, NULL, 0, NULL);
                        if (server_filter_list.head) {
-                               char *cp = (char *)arg;
+                               char *cp = strdup(arg);
+                               if (!cp)
+                                       out_of_memory("parse_arguments");
                                if (!*cp)
                                        goto options_rejected;
                                clean_fname(cp, 1);
                                if (check_filter(&server_filter_list, cp, 0) < 0)
                                        goto options_rejected;
+                               free(cp);
                        }
                        parse_filter_file(&filter_list, arg,
                                opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0,
@@ -933,6 +1031,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        human_readable++;
                        break;
 
+               case 'H':
+                       preserve_hard_links++;
+                       break;
+
                case 'i':
                        itemize_changes++;
                        break;
@@ -1020,7 +1122,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        break;
 
                case OPT_LINK_DEST:
-#ifdef HAVE_LINK
+#ifdef SUPPORT_HARD_LINKS
                        link_dest = 1;
                        dest_option = "--link-dest";
                        goto set_dest_dir;
@@ -1046,10 +1148,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                                        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;
+                       /* We defer sanitizing this arg until we know what
+                        * our destination directory is going to be. */
+                       basis_dir[basis_dir_cnt++] = (char *)poptGetOptArg(pc);
                        break;
 
                case OPT_CHMOD:
@@ -1066,6 +1167,35 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        usage(FINFO);
                        exit_cleanup(0);
 
+               case 'A':
+#ifdef SUPPORT_ACLS
+                       preserve_acls = 1;
+                       preserve_perms = 1;
+                       break;
+#else
+                       /* FIXME: this should probably be ignored with a
+                        * warning and then countermeasures taken to
+                        * restrict group and other access in the presence
+                        * of any more restrictive ACLs, but this is safe
+                        * for now */
+                       snprintf(err_buf,sizeof(err_buf),
+                                 "ACLs are not supported on this %s\n",
+                                am_server ? "server" : "client");
+                       return 0;
+#endif
+
+               case 'X':
+#ifdef SUPPORT_XATTRS
+                       preserve_xattrs = 1;
+                       preserve_perms = 1;
+                       break;
+#else
+                       snprintf(err_buf,sizeof(err_buf),
+                                "extended attributes are not supported on this %s\n",
+                                am_server ? "server" : "client");
+                       return 0;
+#endif
+
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
@@ -1087,6 +1217,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                exit_cleanup(0);
        }
 
+#ifdef ICONV_OPTION
+       if (iconv_opt) {
+               if (!am_server && strcmp(iconv_opt, "-") == 0)
+                       iconv_opt = NULL;
+               else
+                       need_unsorted_flist = 1;
+       }
+#endif
+
 #ifndef SUPPORT_LINKS
        if (preserve_links && !am_sender) {
                snprintf(err_buf, sizeof err_buf,
@@ -1105,6 +1244,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        }
 #endif
 
+#ifndef SUPPORT_XATTRS
+       if (am_root < 0) {
+               snprintf(err_buf, sizeof err_buf,
+                        "--fake-super requires an rsync with extended attributes enabled\n");
+               return 0;
+       }
+#endif
+
        if (write_batch && read_batch) {
                snprintf(err_buf, sizeof err_buf,
                        "--write-batch and --read-batch can not be used together\n");
@@ -1162,7 +1309,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        if (!relative_paths)
                implied_dirs = 0;
 
-       if (!!delete_before + delete_during + delete_after > 1) {
+       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;
@@ -1170,11 +1317,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        if (delete_before || delete_during || delete_after)
                delete_mode = 1;
        else if (delete_mode || delete_excluded) {
+               /* Only choose now between before & during if one is refused. */
                if (refused_delete_before) {
-                       create_refuse_error(refused_delete_before);
-                       return 0;
-               }
-               delete_mode = delete_before = 1;
+                       if (!refused_delete_during)
+                               delete_during = 1;
+                       else {
+                               create_refuse_error(refused_delete_before);
+                               return 0;
+                       }
+               } else if (refused_delete_during)
+                       delete_before = 1;
+               delete_mode = 1;
        }
        if (!xfer_dirs && delete_mode) {
                snprintf(err_buf, sizeof err_buf,
@@ -1187,8 +1340,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                return 0;
        }
 
-       if (remove_sent_files) {
-               /* We only want to infer this refusal of --remove-sent-files
+       if (remove_source_files) {
+               /* We only want to infer this refusal of --remove-source-files
                 * via the refusal of "delete", not any of the "delete-FOO"
                 * options. */
                if (refused_delete && am_sender) {
@@ -1204,17 +1357,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        if (sanitize_paths) {
                int i;
                for (i = *argc; i-- > 0; )
-                       (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0);
+                       (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0, NULL);
                if (tmpdir)
-                       tmpdir = sanitize_path(NULL, tmpdir, NULL, 0);
-               if (partial_dir)
-                       partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
+                       tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
                if (backup_dir)
-                       backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
+                       backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
        }
        if (server_filter_list.head && !am_sender) {
                struct filter_list_struct *elp = &server_filter_list;
-               int i;
                if (tmpdir) {
                        if (!*tmpdir)
                                goto options_rejected;
@@ -1222,28 +1372,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        if (check_filter(elp, tmpdir, 1) < 0)
                                goto options_rejected;
                }
-               if (partial_dir && *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++) {
-                       if (!*basis_dir[i])
-                               goto options_rejected;
-                       clean_fname(basis_dir[i], 1);
-                       if (check_filter(elp, basis_dir[i], 1) < 0)
-                               goto options_rejected;
-               }
                if (backup_dir) {
                        if (!*backup_dir)
                                goto options_rejected;
                        clean_fname(backup_dir, 1);
-                       if (check_filter(elp, backup_dir, 1) < 0) {
-                           options_rejected:
-                               snprintf(err_buf, sizeof err_buf,
-                                   "Your options have been rejected by the server.\n");
-                               return 0;
-                       }
+                       if (check_filter(elp, backup_dir, 1) < 0)
+                               goto options_rejected;
                }
        }
 
@@ -1274,25 +1408,25 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                snprintf(err_buf, sizeof err_buf,
                        "--suffix cannot be a null string without --backup-dir\n");
                return 0;
-       } else if (make_backups && delete_mode && !delete_excluded) {
-               snprintf(backup_dir_buf, sizeof backup_dir_buf,
+       } else if (make_backups && delete_mode && !delete_excluded && !am_server) {
+               snprintf(backup_dir_buf, sizeof backup_dir_buf,
                        "P *%s", backup_suffix);
-               parse_rule(&filter_list, backup_dir_buf, 0, 0);
+               parse_rule(&filter_list, backup_dir_buf, 0, 0);
        }
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
 
-       if (log_format) {
-               if (am_server && log_format_has(log_format, 'I'))
-                       log_format_has_i = 2;
-               else if (log_format_has(log_format, 'i'))
-                       log_format_has_i = itemize_changes | 1;
-               if (!log_format_has(log_format, 'b')
-                && !log_format_has(log_format, 'c'))
+       if (stdout_format) {
+               if (am_server && log_format_has(stdout_format, 'I'))
+                       stdout_format_has_i = 2;
+               else if (log_format_has(stdout_format, 'i'))
+                       stdout_format_has_i = itemize_changes | 1;
+               if (!log_format_has(stdout_format, 'b')
+                && !log_format_has(stdout_format, 'c'))
                        log_before_transfer = !am_server;
        } else if (itemize_changes) {
-               log_format = "%i %n%L";
-               log_format_has_i = itemize_changes;
+               stdout_format = "%i %n%L";
+               stdout_format_has_i = itemize_changes;
                log_before_transfer = !am_server;
        }
 
@@ -1304,12 +1438,26 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 
        set_io_timeout(io_timeout);
 
-       if (verbose && !log_format) {
-               log_format = "%n%L";
+       if (verbose && !stdout_format) {
+               stdout_format = "%n%L";
                log_before_transfer = !am_server;
        }
-       if (log_format_has_i || log_format_has(log_format, 'o'))
-               log_format_has_o_or_i = 1;
+       if (stdout_format_has_i || log_format_has(stdout_format, 'o'))
+               stdout_format_has_o_or_i = 1;
+
+       if (logfile_name && !am_daemon) {
+               if (!logfile_format) {
+                       logfile_format = "%i %n%L";
+                       logfile_format_has_i = logfile_format_has_o_or_i = 1;
+               } else {
+                       if (log_format_has(logfile_format, 'i'))
+                               logfile_format_has_i = 1;
+                       if (logfile_format_has_i || log_format_has(logfile_format, 'o'))
+                               logfile_format_has_o_or_i = 1;
+               }
+               log_init(0);
+       } else if (!am_daemon)
+               logfile_format = NULL;
 
        if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
                bwlimit = daemon_bwlimit;
@@ -1376,10 +1524,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                                clean_fname(partial_dir, 1);
                        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);
-                       }
                        if (!partial_dir && refused_partial) {
                                create_refuse_error(refused_partial);
                                return 0;
@@ -1414,7 +1558,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
                        }
                } else {
                        if (sanitize_paths)
-                               files_from = sanitize_path(NULL, files_from, NULL, 0);
+                               files_from = sanitize_path(NULL, files_from, NULL, 0, NULL);
                        if (server_filter_list.head) {
                                if (!*files_from)
                                        goto options_rejected;
@@ -1435,6 +1579,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
        am_starting_up = 0;
 
        return 1;
+
+  options_rejected:
+       snprintf(err_buf, sizeof err_buf,
+               "Your options have been rejected by the server.\n");
+       return 0;
 }
 
 
@@ -1484,7 +1633,7 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'n';
        if (preserve_links)
                argstr[x++] = 'l';
-       if (xfer_dirs > (recurse || !delete_mode || !am_sender))
+       if (xfer_dirs > (recurse || !delete_mode || !am_sender ? 1 : 0))
                argstr[x++] = 'd';
        if (am_sender) {
                if (keep_dirlinks)
@@ -1506,8 +1655,11 @@ void server_options(char **args,int *argc)
         * default for remote transfers, and in any case old versions
         * of rsync will not understand it. */
 
-       if (preserve_hard_links)
+       if (preserve_hard_links) {
                argstr[x++] = 'H';
+               if (preserve_hard_links > 1)
+                       argstr[x++] = 'H';
+       }
        if (preserve_uid)
                argstr[x++] = 'o';
        if (preserve_gid)
@@ -1520,6 +1672,14 @@ void server_options(char **args,int *argc)
                argstr[x++] = 'p';
        else if (preserve_executability && am_sender)
                argstr[x++] = 'E';
+#ifdef SUPPORT_ACLS
+       if (preserve_acls)
+               argstr[x++] = 'A';
+#endif
+#ifdef SUPPORT_XATTRS
+       if (preserve_xattrs)
+               argstr[x++] = 'X';
+#endif
        if (recurse)
                argstr[x++] = 'r';
        if (always_checksum)
@@ -1546,6 +1706,15 @@ void server_options(char **args,int *argc)
        if (list_only == 1 && !recurse)
                argstr[x++] = 'r';
 
+#if SUBPROTOCOL_VERSION != 0
+       /* If we're speaking a pre-release version of a protocol, we tell
+        * the server about this by (ab)using the -e option. */
+       if (protocol_version == PROTOCOL_VERSION) {
+               x += snprintf(argstr+x, sizeof argstr - x,
+                             "e%d.%d", PROTOCOL_VERSION, SUBPROTOCOL_VERSION);
+       }
+#endif
+
        argstr[x] = '\0';
 
        if (x != 1)
@@ -1574,24 +1743,38 @@ void server_options(char **args,int *argc)
 
        /* The server side doesn't use our log-format, but in certain
         * circumstances they need to know a little about the option. */
-       if (log_format && am_sender) {
-               if (log_format_has_i > 1)
+       if (stdout_format && am_sender) {
+               /* Use --log-format, not --out-format, for compatibility. */
+               if (stdout_format_has_i > 1)
                        args[ac++] = "--log-format=%i%I";
-               else if (log_format_has_i)
+               else if (stdout_format_has_i)
                        args[ac++] = "--log-format=%i";
-               else if (log_format_has_o_or_i)
+               else if (stdout_format_has_o_or_i)
                        args[ac++] = "--log-format=%o";
                else if (!verbose)
                        args[ac++] = "--log-format=X";
        }
 
+#ifdef ICONV_OPTION
+       if (iconv_opt) {
+               char *set = strchr(iconv_opt, ',');
+               if (set)
+                       set++;
+               else
+                       set = iconv_opt;
+               if (asprintf(&arg, "--iconv=%s", set) < 0)
+                       goto oom;
+               args[ac++] = arg;
+       }
+#endif
+
        if (block_size) {
                if (asprintf(&arg, "-B%lu", block_size) < 0)
                        goto oom;
                args[ac++] = arg;
        }
 
-       if (max_delete && am_sender) {
+       if (max_delete >= 0 && am_sender) {
                if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
                        goto oom;
                args[ac++] = arg;
@@ -1633,16 +1816,18 @@ void server_options(char **args,int *argc)
        }
 
        if (am_sender) {
-               if (delete_excluded)
-                       args[ac++] = "--delete-excluded";
-               else if (delete_before == 1 || delete_after)
-                       args[ac++] = "--delete";
-               if (delete_before > 1)
+               if (delete_before)
                        args[ac++] = "--delete-before";
-               if (delete_during)
+               else if (delete_during == 2)
+                       args[ac++] = "--delete-delay";
+               else if (delete_during)
                        args[ac++] = "--delete-during";
-               if (delete_after)
+               else if (delete_after)
                        args[ac++] = "--delete-after";
+               else if (delete_mode && !delete_excluded)
+                       args[ac++] = "--delete";
+               if (delete_excluded)
+                       args[ac++] = "--delete-excluded";
                if (force_delete)
                        args[ac++] = "--force";
                if (write_batch < 0)
@@ -1687,35 +1872,37 @@ void server_options(char **args,int *argc)
        if (numeric_ids)
                args[ac++] = "--numeric-ids";
 
-       if (ignore_existing && am_sender)
-               args[ac++] = "--ignore-existing";
+       if (am_sender) {
+               if (ignore_existing)
+                       args[ac++] = "--ignore-existing";
+
+               /* Backward compatibility: send --existing, not --ignore-non-existing. */
+               if (ignore_non_existing)
+                       args[ac++] = "--existing";
+
+               if (tmpdir) {
+                       args[ac++] = "--temp-dir";
+                       args[ac++] = tmpdir;
+               }
 
-       /* Backward compatibility: send --existing, not --ignore-non-existing. */
-       if (ignore_non_existing && am_sender)
-               args[ac++] = "--existing";
+               if (basis_dir[0]) {
+                       /* 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.
+                        */
+                       int i;
+                       for (i = 0; i < basis_dir_cnt; i++) {
+                               args[ac++] = dest_option;
+                               args[ac++] = basis_dir[i];
+                       }
+               }
+       }
 
        if (append_mode)
                args[ac++] = "--append";
        else if (inplace)
                args[ac++] = "--inplace";
 
-       if (tmpdir && am_sender) {
-               args[ac++] = "--temp-dir";
-               args[ac++] = tmpdir;
-       }
-
-       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.
-                */
-               int i;
-               for (i = 0; i < basis_dir_cnt; i++) {
-                       args[ac++] = dest_option;
-                       args[ac++] = basis_dir[i];
-               }
-       }
-
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
@@ -1735,7 +1922,9 @@ void server_options(char **args,int *argc)
        if (fuzzy_basis && am_sender)
                args[ac++] = "--fuzzy";
 
-       if (remove_sent_files)
+       if (remove_source_files == 1)
+               args[ac++] = "--remove-source-files";
+       else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
 
        *argc = ac;
@@ -1756,10 +1945,10 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
 {
        char *p;
        int not_host;
+       int hostlen;
 
        if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) {
                char *path;
-               int hostlen;
                s += strlen(URL_PREFIX);
                if ((p = strchr(s, '/')) != NULL) {
                        hostlen = p - s;
@@ -1788,6 +1977,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
 
        if (*s == '[' && (p = strchr(s, ']')) != NULL && p[1] == ':') {
                s++;
+               hostlen = p - s;
                *p = '\0';
                not_host = strchr(s, '/') || !strchr(s, ':');
                *p = ']';
@@ -1797,6 +1987,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
        } else {
                if (!(p = strchr(s, ':')))
                        return NULL;
+               hostlen = p - s;
                *p = '\0';
                not_host = strchr(s, '/') != NULL;
                *p = ':';
@@ -1804,8 +1995,8 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
                        return NULL;
        }
 
-       *host_ptr = new_array(char, p - s + 1);
-       strlcpy(*host_ptr, s, p - s + 1);
+       *host_ptr = new_array(char, hostlen + 1);
+       strlcpy(*host_ptr, s, hostlen + 1);
 
        if (p[1] == ':') {
                if (port_ptr && !*port_ptr)