-/* -*- 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
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* 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, visit the http://fsf.org website.
*/
#include "rsync.h"
-#include "popt.h"
+#include "ifuncs.h"
+#include <popt.h>
+#include "zlib/zlib.h"
extern int module_id;
extern int sanitize_paths;
-extern int select_timeout;
+extern int daemon_over_rsh;
extern struct filter_list_struct filter_list;
extern struct filter_list_struct server_filter_list;
**/
int whole_file = -1;
-int archive_mode = 0;
+int append_mode = 0;
int keep_dirlinks = 0;
+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;
+int preserve_specials = 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 do_xfers = 1;
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 remove_source_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
int do_compression = 0;
-int am_root = 0;
-int orig_umask = 0;
+int def_compress_level = Z_DEFAULT_COMPRESSION;
+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;
+int am_starting_up = 1;
int relative_paths = -1;
int implied_dirs = 1;
int numeric_ids = 0;
+int allow_8bit_chars = 0;
int force_delete = 0;
int io_timeout = 0;
-int am_server = 0;
-int am_sender = -1;
-int am_generator = 0;
+int allowed_lull = 0;
+int prune_empty_dirs = 0;
+int use_qsort = 0;
char *files_from = NULL;
int filesfrom_fd = -1;
-char *remote_filesfrom_file = NULL;
+char *filesfrom_host = NULL;
int eol_nulls = 0;
+int protect_args = 0;
+int human_readable = 0;
int recurse = 0;
-int xfer_dirs = 0;
+int allow_inc_recurse = 1;
+int xfer_dirs = -1;
int am_daemon = 0;
-int daemon_over_rsh = 0;
int do_stats = 0;
int do_progress = 0;
int keep_partial = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
size_t bwlimit_writemax = 0;
-int only_existing = 0;
-int opt_ignore_existing = 0;
-int max_delete = 0;
+int ignore_existing = 0;
+int ignore_non_existing = 0;
+int need_messages_from_generator = 0;
+int max_delete = INT_MIN;
OFF_T max_size = 0;
+OFF_T min_size = 0;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int inplace = 0;
int delay_updates = 0;
long block_size = 0; /* "long" because popt can't set an int32. */
-
+char *skip_compress = NULL;
/** Network address family. **/
+int default_af_hint
#ifdef INET6
-int default_af_hint = 0; /* Any protocol */
+ = 0; /* Any protocol */
#else
-int default_af_hint = AF_INET; /* Must use IPv4 */
+ = AF_INET; /* Must use IPv4 */
+# ifdef AF_INET6
+# undef AF_INET6
+# endif
+# define AF_INET6 AF_INET /* make -6 option a no-op */
#endif
/** Do not go into the background when run as --daemon. Good
* for debugging and required for running as a service on W32,
* or under Unix process-monitors. **/
-int no_detach = 0;
+int no_detach
+#if defined _WIN32 || defined __WIN32__
+ = 1;
+#else
+ = 0;
+#endif
int write_batch = 0;
int read_batch = 0;
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;
char backup_dir_buf[MAXPATHLEN];
+char *sockopts = NULL;
int rsync_port = 0;
int compare_dest = 0;
int copy_dest = 0;
int link_dest = 0;
int basis_dir_cnt = 0;
+char *dest_option = NULL;
int verbose = 0;
int quiet = 0;
-int itemize_changes = 0;
+int output_motd = 1;
int log_before_transfer = 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 */
+static int omit_dir_times = 0;
static int F_option_cnt = 0;
static int modify_window_set;
-static int refused_verbose, refused_delete, refused_archive_part;
+static int itemize_changes = 0;
+static int refused_delete, refused_archive_part, refused_compress;
static int refused_partial, refused_progress, refused_delete_before;
-static char *dest_option = NULL;
-static char *max_size_arg;
-static char partialdir_for_delayupdate[] = ".~tmp~";
+static int refused_delete_during;
+static int refused_inplace;
+static char *max_size_arg, *min_size_arg;
+static char tmp_partialdir[] = ".~tmp~";
/** Local address to bind. As a character string because it's
* interpreted by the IPv6 layer: should be a numeric IP4 or IP6
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-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",
- (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());
+ rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
#endif
#if SIZEOF_INT64 < 8
(int) SIZEOF_INT64, (int) sizeof (int64));
}
- rprintf(f,
-"\n"
-"rsync comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
-"are welcome to redistribute it under certain conditions. See the GNU\n"
-"General Public Licence for details.\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");
}
{
print_rsync_version(F);
- rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\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,"Usage: rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
- rprintf(F," or rsync [OPTION]... [USER@]HOST:SRC DEST\n");
- rprintf(F," or rsync [OPTION]... SRC [SRC]... DEST\n");
- rprintf(F," or rsync [OPTION]... [USER@]HOST::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]... rsync://[USER@]HOST[:PORT]/SRC [DEST]\n");
rprintf(F," or rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n");
- rprintf(F,"SRC on single-colon remote HOST will be expanded by remote shell\n");
- rprintf(F,"SRC on server remote HOST may contain shell wildcards or multiple\n");
- rprintf(F," sources separated by space as long as they have same top-level\n");
- rprintf(F,"\nOptions\n");
+ rprintf(F," or rsync [OPTION]... [USER@]HOST:SRC [DEST]\n");
+ rprintf(F," or rsync [OPTION]... [USER@]HOST::SRC [DEST]\n");
+ 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,"\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");
- rprintf(F," --no-relative turn off --relative\n");
- rprintf(F," --no-implied-dirs don't send implied dirs with -R\n");
+ rprintf(F," --no-implied-dirs don't send implied dirs with --relative\n");
rprintf(F," -b, --backup make backups (see --suffix & --backup-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," --append append data onto shorter files\n");
+ rprintf(F," --append-verify like --append, but with old data in file checksum\n");
rprintf(F," -d, --dirs transfer directories without recursing\n");
rprintf(F," -l, --links copy symlinks as 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, --copy-dirlinks transform symlink to a dir into referent dir\n");
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
+ rprintf(F," -H, --hard-links preserve hard links\n");
rprintf(F," -p, --perms preserve permissions\n");
- rprintf(F," -o, --owner preserve owner (root only)\n");
+ rprintf(F," -E, --executability preserve the file's executability\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\n");
+#endif
+ rprintf(F," -o, --owner preserve owner (super-user 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," --devices preserve device files (super-user only)\n");
+ rprintf(F," --specials preserve special files\n");
+ rprintf(F," -D same as --devices --specials\n");
+ rprintf(F," -t, --times preserve modification times\n");
+ rprintf(F," -O, --omit-dir-times omit directories from --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");
- 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 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 on receiver\n");
- rprintf(F," --ignore-existing ignore files that already exist on receiving side\n");
+ rprintf(F," --rsync-path=PROGRAM specify the rsync to run on the remote machine\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");
rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
+ rprintf(F," --min-size=SIZE don't transfer any file smaller 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," --delay-updates put all updated files into place at transfer's end\n");
+ rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\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 don't skip files that match in size and mod-time\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 during the transfer\n");
+ rprintf(F," --compress-level=NUM explicitly set compression level\n");
+ rprintf(F," --skip-compress=LIST skip compressing files with a suffix in LIST\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='dir-merge /.rsync-filter'\n");
rprintf(F," --include=PATTERN don't exclude files matching PATTERN\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," -0, --from0 all *-from/filter files are delimited by 0s\n");
+ rprintf(F," -s, --protect-args no space-splitting; only wildcard special-chars\n");
+ rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
rprintf(F," --port=PORT specify double-colon alternate port number\n");
+ rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
rprintf(F," --blocking-io use blocking I/O for the remote shell\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," -8, --8-bit-output leave high-bit chars unescaped in output\n");
+ rprintf(F," -h, --human-readable output numbers in a human-readable format\n");
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 log file-transfers using 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");
-#ifdef INET6
+ 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
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," --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");
}
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_TIMEOUT, OPT_MAX_SIZE,
- OPT_REFUSED_BASE = 9000};
+ OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
+ OPT_NO_D, OPT_APPEND,
+ OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+ {"help", 0, POPT_ARG_NONE, 0, OPT_HELP, 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 },
+ {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
+ {"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 },
+ {"i-r", 0, POPT_ARG_VAL, &allow_inc_recurse, 1, 0, 0 },
+ {"no-i-r", 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 },
+ {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 },
+ {"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, 2, 0, 0 },
+ {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
+ {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
+ {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
+ {"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 },
+ {"group", 'g', POPT_ARG_VAL, &preserve_gid, 1, 0, 0 },
+ {"no-group", 0, POPT_ARG_VAL, &preserve_gid, 0, 0, 0 },
+ {"no-g", 0, POPT_ARG_VAL, &preserve_gid, 0, 0, 0 },
+ {0, 'D', POPT_ARG_NONE, 0, 'D', 0, 0 },
+ {"no-D", 0, POPT_ARG_NONE, 0, OPT_NO_D, 0, 0 },
+ {"devices", 0, POPT_ARG_VAL, &preserve_devices, 1, 0, 0 },
+ {"no-devices", 0, POPT_ARG_VAL, &preserve_devices, 0, 0, 0 },
+ {"specials", 0, POPT_ARG_VAL, &preserve_specials, 1, 0, 0 },
+ {"no-specials", 0, POPT_ARG_VAL, &preserve_specials, 0, 0, 0 },
+ {"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 },
+ {"no-links", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 },
+ {"no-l", 0, POPT_ARG_VAL, &preserve_links, 0, 0, 0 },
+ {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 },
+ {"copy-unsafe-links",0, POPT_ARG_NONE, ©_unsafe_links, 0, 0, 0 },
+ {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
+ {"copy-dirlinks", 'k', POPT_ARG_NONE, ©_dirlinks, 0, 0, 0 },
+ {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 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 },
+ {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
+ {"no-R", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 },
+ {"implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 1, 0, 0 },
+ {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
+ {"i-d", 0, POPT_ARG_VAL, &implied_dirs, 1, 0, 0 },
+ {"no-i-d", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
+ {"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 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 },
- {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 },
- {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
+ {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
+ {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
+ {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
+ {"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
+ {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 },
+ {"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
+ {"min-size", 0, POPT_ARG_STRING, &min_size_arg, OPT_MIN_SIZE, 0, 0 },
+ {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
+ {"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
+ {"append", 0, POPT_ARG_NONE, 0, OPT_APPEND, 0, 0 },
+ {"append-verify", 0, POPT_ARG_VAL, &append_mode, 2, 0, 0 },
+ {"no-append", 0, POPT_ARG_VAL, &append_mode, 0, 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_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 },
- {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 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 },
+ {0, 'F', POPT_ARG_NONE, 0, 'F', 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 },
- {"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, ©_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, ©_unsafe_links, 0, 0, 0 },
- {"perms", 'p', POPT_ARG_NONE, &preserve_perms, 0, 0, 0 },
- {"owner", 'o', POPT_ARG_NONE, &preserve_uid, 0, 0, 0 },
- {"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_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 },
+ {"no-W", 0, POPT_ARG_VAL, &whole_file, 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 },
- {"max-delete", 0, POPT_ARG_INT, &max_delete, 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, 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 },
- /* TODO: Should this take an optional int giving the compression level? */
- {"compress", 'z', POPT_ARG_NONE, &do_compression, 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, 'F', POPT_ARG_NONE, 0, 'F', 0, 0 },
+ {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
+ {"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 },
+ {"skip-compress", 0, POPT_ARG_STRING, &skip_compress, 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 },
- {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
- {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
- {"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 0, 0, 0 },
+ {"progress", 0, POPT_ARG_VAL, &do_progress, 1, 0, 0 },
+ {"no-progress", 0, POPT_ARG_VAL, &do_progress, 0, 0, 0 },
+ {"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_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-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 },
+ {"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 },
- {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 },
+ {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
+ {"list-only", 0, POPT_ARG_VAL, &list_only, 2, 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 },
+ {"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},
- {"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
+ {"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
+ {"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
+ {"protect-args", 's', POPT_ARG_VAL, &protect_args, 1, 0, 0},
+ {"no-protect-args", 0, POPT_ARG_VAL, &protect_args, 0, 0, 0},
+ {"no-s", 0, POPT_ARG_VAL, &protect_args, 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
{"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 },
+ {"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 },
+ {"password-file", 0, POPT_ARG_STRING, &password_file, 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 },
+ {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
+ {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 },
+ {"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 },
+ {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 },
+ /* All the following options switch us into daemon-mode option-parsing. */
{"config", 0, POPT_ARG_STRING, 0, OPT_DAEMON, 0, 0 },
{"daemon", 0, POPT_ARG_NONE, 0, OPT_DAEMON, 0, 0 },
+ {"detach", 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}
};
{
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
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," --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");
}
{"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
{"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 },
+ {"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 },
{"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 },
+ {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
+ {"no-verbose", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 },
+ {"no-v", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 },
{"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
{0,0,0,0, 0, 0, 0}
};
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);
+ msleep(20);
}
if (!op->longName && !*shortname)
break;
if ((op->longName && wildmatch(bp, op->longName))
- || (*shortname && wildmatch(bp, shortname))
- || op->val == OPT_DAEMON) {
+ || (*shortname && wildmatch(bp, shortname))) {
if (op->argInfo == POPT_ARG_VAL)
op->argInfo = POPT_ARG_NONE;
op->val = (op - long_options) + OPT_REFUSED_BASE;
/* These flags are set to let us easily check
* an implied option later in the code. */
switch (*shortname) {
- case 'v':
- refused_verbose = op->val;
- break;
case 'r': case 'd': case 'l': case 'p':
case 't': case 'g': case 'o': case 'D':
refused_archive_part = op->val;
break;
+ case 'z':
+ refused_compress = op->val;
+ break;
case '\0':
if (wildmatch("delete", op->longName))
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))
refused_progress = op->val;
+ else if (wildmatch("inplace", op->longName))
+ refused_inplace = op->val;
break;
}
if (!is_wild)
}
+static OFF_T parse_size_arg(char **size_arg, char def_suf)
+{
+ int reps, mult, make_compatible = 0;
+ const char *arg;
+ OFF_T size = 1;
+
+ for (arg = *size_arg; isDigit(arg); arg++) {}
+ if (*arg == '.')
+ for (arg++; isDigit(arg); arg++) {}
+ switch (*arg && *arg != '+' && *arg != '-' ? *arg++ : def_suf) {
+ case 'b': case 'B':
+ reps = 0;
+ break;
+ case 'k': case 'K':
+ reps = 1;
+ break;
+ case 'm': case 'M':
+ reps = 2;
+ break;
+ case 'g': case 'G':
+ reps = 3;
+ break;
+ default:
+ return -1;
+ }
+ if (*arg == 'b' || *arg == 'B')
+ mult = 1000, make_compatible = 1, arg++;
+ else if (!*arg || *arg == '+' || *arg == '-')
+ mult = 1024;
+ else if (strncasecmp(arg, "ib", 2) == 0)
+ mult = 1024, arg += 2;
+ else
+ return -1;
+ while (reps--)
+ size *= mult;
+ size *= atof(*size_arg);
+ if ((*arg == '+' || *arg == '-') && arg[1] == '1')
+ size += atoi(arg), make_compatible = 1, arg += 2;
+ if (*arg)
+ return -1;
+ if (size > 0 && make_compatible) {
+ /* We convert this manually because we may need %lld precision,
+ * and that's not a portable sprintf() escape. */
+ char buf[128], *s = buf + sizeof buf - 1;
+ OFF_T num = size;
+ *s = '\0';
+ while (num) {
+ *--s = (char)(num % 10) + '0';
+ num /= 10;
+ }
+ if (!(*size_arg = strdup(s)))
+ out_of_memory("parse_size_arg");
+ }
+ return size;
+}
+
+
static void create_refuse_error(int which)
{
/* The "which" value is the index + OPT_REFUSED_BASE. */
*
* @retval 0 on error, with err_buf containing an explanation
**/
-int parse_arguments(int *argc, const char ***argv, int frommain)
+int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
{
- int opt;
+ static poptContext pc;
char *ref = lp_refuse_options(module_id);
- const char *arg;
- poptContext pc;
+ const char *arg, **argv = *argv_p;
+ int argc = *argc_p;
+ int opt;
if (ref && *ref)
set_refuse_options(ref);
+ if (am_daemon)
+ set_refuse_options("log-file*");
+
+#ifdef ICONV_OPTION
+ if (!am_daemon && !protect_args && (arg = getenv("RSYNC_ICONV")) != NULL && *arg)
+ iconv_opt = strdup(arg);
+#endif
/* 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);
- poptReadDefaultConfig(pc, 0);
+ if (pc)
+ poptFreeContext(pc);
+ pc = poptGetContext(RSYNC_NAME, argc, argv, long_options, 0);
+ if (!am_server)
+ poptReadDefaultConfig(pc, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
/* most options are handled automatically by popt;
print_rsync_version(FINFO);
exit_cleanup(0);
+ case OPT_SERVER:
+ if (!am_server) {
+ /* Disable popt aliases on the server side and
+ * then start parsing the options again. */
+ poptFreeContext(pc);
+ pc = poptGetContext(RSYNC_NAME, argc, argv,
+ long_options, 0);
+ am_server = 1;
+ }
+#ifdef ICONV_OPTION
+ iconv_opt = NULL;
+#endif
+ break;
+
+ case OPT_SENDER:
+ if (!am_server) {
+ usage(FERROR);
+ exit_cleanup(RERR_SYNTAX);
+ }
+ am_sender = 1;
+ break;
+
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,
+ pc = poptGetContext(RSYNC_NAME, argc, argv,
long_daemon_options, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
switch (opt) {
goto daemon_error;
}
}
+
+ if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) {
+ snprintf(err_buf, sizeof err_buf,
+ "the --temp-dir path is WAY too long.\n");
+ return 0;
+ }
+
if (!daemon_opt) {
rprintf(FERROR, "Daemon option(s) used without --daemon.\n");
daemon_error:
"(Type \"rsync --daemon --help\" for assistance with daemon mode.)\n");
exit_cleanup(RERR_SYNTAX);
}
- *argv = poptGetArgs(pc);
- *argc = count_args(*argv);
+
+ *argv_p = argv = poptGetArgs(pc);
+ *argc_p = argc = count_args(argv);
+ am_starting_up = 0;
daemon_opt = 0;
am_daemon = 1;
return 1;
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;
+ int rej;
+ 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)
+ rej = check_filter(&server_filter_list, cp, 0) < 0;
+ free(cp);
+ if (rej)
goto options_rejected;
}
parse_filter_file(&filter_list, arg,
XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES);
break;
+ case 'a':
+ if (refused_archive_part) {
+ create_refuse_error(refused_archive_part);
+ return 0;
+ }
+ if (!recurse) /* preserve recurse == 2 */
+ recurse = 1;
+#ifdef SUPPORT_LINKS
+ preserve_links = 1;
+#endif
+ preserve_perms = 1;
+ preserve_times = 2;
+ preserve_gid = 1;
+ preserve_uid = 1;
+ preserve_devices = 1;
+ preserve_specials = 1;
+ break;
+
+ case 'D':
+ preserve_devices = preserve_specials = 1;
+ break;
+
+ case OPT_NO_D:
+ preserve_devices = preserve_specials = 0;
+ break;
+
case 'h':
- usage(FINFO);
- exit_cleanup(0);
+ human_readable++;
+ break;
+
+ case 'H':
+ preserve_hard_links++;
+ break;
+
+ case 'i':
+ itemize_changes++;
+ break;
case 'v':
verbose++;
quiet++;
break;
- case OPT_SENDER:
- if (!am_server) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
- }
- am_sender = 1;
+ case 'x':
+ one_file_system++;
break;
case 'F':
keep_partial = 1;
break;
+ case 'z':
+ if (def_compress_level < Z_DEFAULT_COMPRESSION
+ || def_compress_level > Z_BEST_COMPRESSION) {
+ snprintf(err_buf, sizeof err_buf,
+ "--compress-level value is invalid: %d\n",
+ def_compress_level);
+ return 0;
+ }
+ do_compression = def_compress_level != Z_NO_COMPRESSION;
+ if (do_compression && refused_compress) {
+ create_refuse_error(refused_compress);
+ return 0;
+ }
+ break;
+
case OPT_WRITE_BATCH:
/* batch_name is already set */
write_batch = 1;
break;
+ case OPT_ONLY_WRITE_BATCH:
+ /* batch_name is already set */
+ write_batch = -1;
+ break;
+
case OPT_READ_BATCH:
/* batch_name is already set */
read_batch = 1;
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) {
+ if ((max_size = parse_size_arg(&max_size_arg, 'b')) <= 0) {
snprintf(err_buf, sizeof err_buf,
"--max-size value is invalid: %s\n",
max_size_arg);
}
break;
- case OPT_TIMEOUT:
- if (io_timeout && io_timeout < select_timeout)
- select_timeout = io_timeout;
+ case OPT_MIN_SIZE:
+ if ((min_size = parse_size_arg(&min_size_arg, 'b')) <= 0) {
+ snprintf(err_buf, sizeof err_buf,
+ "--min-size value is invalid: %s\n",
+ min_size_arg);
+ return 0;
+ }
+ break;
+
+ case OPT_APPEND:
+ if (am_server)
+ append_mode++;
+ else
+ append_mode = 1;
break;
case OPT_LINK_DEST:
-#ifdef HAVE_LINK
+#ifdef SUPPORT_HARD_LINKS
link_dest = 1;
dest_option = "--link-dest";
goto set_dest_dir;
MAX_BASIS_DIRS, dest_option);
return 0;
}
+ /* 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:
arg = poptGetOptArg(pc);
- if (sanitize_paths)
- arg = sanitize_path(NULL, arg, NULL, 0);
- basis_dir[basis_dir_cnt++] = (char *)arg;
+ if (!parse_chmod(arg, &chmod_modes)) {
+ snprintf(err_buf, sizeof err_buf,
+ "Invalid argument passed to --chmod (%s)\n",
+ arg);
+ return 0;
+ }
break;
+ case OPT_HELP:
+ 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++;
+ 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. */
}
}
- if (am_sender < 0)
- am_sender = 0;
+ if (human_readable && argc == 2) {
+ /* Allow the old meaning of 'h' (--help) on its own. */
+ usage(FINFO);
+ exit_cleanup(0);
+ }
+
+#ifdef ICONV_OPTION
+ if (iconv_opt && protect_args != 2) {
+ if (!am_server && strcmp(iconv_opt, "-") == 0)
+ iconv_opt = NULL;
+ else
+ need_unsorted_flist = 1;
+ }
+ setup_iconv();
+#endif
+
+ if (protect_args == 1) {
+ if (!frommain)
+ protect_args = 0;
+ else if (am_server)
+ return 1;
+ }
#ifndef SUPPORT_LINKS
if (preserve_links && !am_sender) {
}
#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");
return 0;
}
- 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 (write_batch > 0 || read_batch) {
if (am_server) {
rprintf(FINFO,
"ignoring --%s-batch option sent to server\n",
* batch args to server. */
read_batch = write_batch = 0;
batch_name = NULL;
- }
+ } else if (dry_run)
+ write_batch = 0;
}
if (read_batch && files_from) {
snprintf(err_buf, sizeof err_buf,
return 0;
}
+ if (max_delete < 0 && max_delete != INT_MIN) {
+ /* Negative numbers are treated as "no deletions". */
+ max_delete = 0;
+ }
+
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 (refused_archive_part) {
- create_refuse_error(refused_archive_part);
- return 0;
- }
- if (!files_from)
- recurse = -1; /* infinite recursion */
-#ifdef SUPPORT_LINKS
- preserve_links = 1;
-#endif
- preserve_perms = 1;
- preserve_times = 1;
- preserve_gid = 1;
- preserve_uid = 1;
- preserve_devices = 1;
+ if (files_from) {
+ if (recurse == 1) /* preserve recurse == 2 */
+ recurse = 0;
+ if (xfer_dirs < 0)
+ xfer_dirs = 1;
}
- if (recurse || list_only || files_from)
- xfer_dirs |= 1;
+ if (xfer_dirs < 1)
+ xfer_dirs = recurse || list_only;
if (relative_paths < 0)
relative_paths = files_from? 1 : 0;
+ 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;
}
- if (!recurse) {
- delete_before = delete_during = delete_after = 0;
- delete_mode = delete_excluded = 0;
- } else if (delete_before || delete_during || delete_after)
+ 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,
+ "--delete does not work without -r or -d.\n");
+ return 0;
}
if (delete_mode && refused_delete) {
return 0;
}
- *argv = poptGetArgs(pc);
- *argc = count_args(*argv);
+ 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) {
+ create_refuse_error(refused_delete);
+ return 0;
+ }
+ need_messages_from_generator = 1;
+ }
+
+ *argv_p = argv = poptGetArgs(pc);
+ *argc_p = argc = count_args(argv);
if (sanitize_paths) {
int i;
- for (i = *argc; i-- > 0; )
- (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0);
+ for (i = argc; 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);
- if (files_from)
- files_from = sanitize_path(NULL, files_from, 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;
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;
goto options_rejected;
}
}
- if (server_filter_list.head && files_from) {
- if (!*files_from)
- goto options_rejected;
- 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_dir_buf[backup_dir_len++] = '/';
backup_dir_buf[backup_dir_len] = '\0';
}
- if (verbose > 1 && !am_sender) {
- rprintf(FINFO, "backup_dir is %s\n",
- safe_fname(backup_dir_buf));
- }
+ 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");
return 0;
+ } 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);
}
- if (log_format) {
- if (strstr(log_format, "%i") != NULL)
- itemize_changes = 1;
- if (strstr(log_format, "%b") == NULL
- && strstr(log_format, "%c") == NULL)
+ if (make_backups && !backup_dir) {
+ omit_dir_times = 0; /* Implied, so avoid -O to sender. */
+ if (preserve_times > 1)
+ preserve_times = 1;
+ } else if (omit_dir_times) {
+ if (preserve_times > 1)
+ preserve_times = 1;
+ }
+
+ 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";
+ stdout_format = "%i %n%L";
+ stdout_format_has_i = itemize_changes;
log_before_transfer = !am_server;
}
- if (do_progress && !verbose && !log_before_transfer) {
- if (refused_verbose) {
- create_refuse_error(refused_verbose);
- return 0;
- }
+
+ if (do_progress && !verbose && !log_before_transfer && !am_server)
verbose = 1;
+
+ if (dry_run)
+ do_xfers = 0;
+
+ set_io_timeout(io_timeout);
+
+ if (verbose && !stdout_format) {
+ stdout_format = "%n%L";
+ log_before_transfer = !am_server;
}
+ 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;
bwlimit_writemax = 512;
}
+ if (sparse_files && inplace) {
+ /* Note: we don't check for this below, because --append is
+ * OK with --sparse (as long as redos are handled right). */
+ snprintf(err_buf, sizeof err_buf,
+ "--sparse cannot be used with --inplace\n");
+ return 0;
+ }
+
+ if (append_mode) {
+ if (whole_file > 0) {
+ snprintf(err_buf, sizeof err_buf,
+ "--append cannot be used with --whole-file\n");
+ return 0;
+ }
+ if (refused_inplace) {
+ create_refuse_error(refused_inplace);
+ return 0;
+ }
+ inplace = 1;
+ }
+
if (delay_updates && !partial_dir)
- partial_dir = partialdir_for_delayupdate;
+ partial_dir = tmp_partialdir;
if (inplace) {
#ifdef HAVE_FTRUNCATE
if (partial_dir) {
snprintf(err_buf, sizeof err_buf,
- "--inplace cannot be used with --%s\n",
+ "--%s cannot be used with --%s\n",
+ append_mode ? "append" : "inplace",
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",
+ "--%s is not supported on this %s\n",
+ append_mode ? "append" : "inplace",
am_server ? "server" : "client");
return 0;
#endif
} else {
- if (keep_partial && !partial_dir) {
+ if (keep_partial && !partial_dir && !am_server) {
if ((arg = getenv("RSYNC_PARTIAL_DIR")) != NULL && *arg)
partial_dir = strdup(arg);
}
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;
}
if (files_from) {
- char *colon;
- if (*argc > 2 || (!am_daemon && *argc == 1)) {
+ char *h, *p;
+ int q;
+ if (argc > 2 || (!am_daemon && argc == 1)) {
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
if (strcmp(files_from, "-") == 0) {
filesfrom_fd = 0;
if (am_server)
- remote_filesfrom_file = "-";
- }
- else if ((colon = find_colon(files_from)) != 0) {
+ filesfrom_host = ""; /* reading from socket */
+ } else if ((p = check_for_hostspec(files_from, &h, &q)) != 0) {
if (am_server) {
- usage(FERROR);
- exit_cleanup(RERR_SYNTAX);
+ snprintf(err_buf, sizeof err_buf,
+ "The --files-from sent to the server cannot specify a host.\n");
+ return 0;
}
- remote_filesfrom_file = colon+1 + (colon[1] == ':');
- if (strcmp(remote_filesfrom_file, "-") == 0) {
+ files_from = p;
+ filesfrom_host = h;
+ if (strcmp(files_from, "-") == 0) {
snprintf(err_buf, sizeof err_buf,
"Invalid --files-from remote filename\n");
return 0;
}
} else {
+ if (sanitize_paths)
+ files_from = sanitize_path(NULL, files_from, NULL, 0, NULL);
+ if (server_filter_list.head) {
+ if (!*files_from)
+ goto options_rejected;
+ clean_fname(files_from, 1);
+ if (check_filter(&server_filter_list, files_from, 0) < 0)
+ goto options_rejected;
+ }
filesfrom_fd = open(files_from, O_RDONLY|O_BINARY);
if (filesfrom_fd < 0) {
snprintf(err_buf, sizeof err_buf,
}
}
+ 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;
}
* behave, and also filtering out options that are processed only
* locally.
**/
-void server_options(char **args,int *argc)
+void server_options(char **args, int *argc_p)
{
- static char argstr[50+MAX_BASIS_DIRS*2];
- int ac = *argc;
+ static char argstr[64];
+ int ac = *argc_p;
char *arg;
int i, x;
if (blocking_io == -1)
blocking_io = 0;
+ /* This should always remain first on the server's command-line. */
args[ac++] = "--server";
- if (daemon_over_rsh) {
+ if (daemon_over_rsh > 0) {
args[ac++] = "--daemon";
- *argc = ac;
+ *argc_p = ac;
/* if we're passing --daemon, we're done */
return;
}
x = 1;
argstr[0] = '-';
+
+ if (protect_args)
+ argstr[x++] = 's';
+
for (i = 0; i < verbose; i++)
argstr[x++] = 'v';
argstr[x++] = 'b';
if (update_only)
argstr[x++] = 'u';
- if (dry_run)
+ if (!do_xfers) /* Note: NOT "dry_run"! */
argstr[x++] = 'n';
if (preserve_links)
argstr[x++] = 'l';
- if (copy_links)
- argstr[x++] = 'L';
- if (xfer_dirs > 1)
+ if ((list_only && !recurse) || xfer_dirs > 1
+ || (xfer_dirs && !recurse && delete_mode && am_sender))
argstr[x++] = 'd';
- if (keep_dirlinks && am_sender)
- argstr[x++] = 'K';
+ if (am_sender) {
+ if (keep_dirlinks)
+ argstr[x++] = 'K';
+ if (prune_empty_dirs)
+ argstr[x++] = 'm';
+ if (omit_dir_times)
+ argstr[x++] = 'O';
+ } else {
+ if (copy_links)
+ argstr[x++] = 'L';
+ if (copy_dirlinks)
+ argstr[x++] = 'k';
+ }
if (whole_file > 0)
argstr[x++] = 'W';
* default for remote transfers, and in any case old versions
* of rsync will not understand it. */
- if (itemize_changes)
- argstr[x++] = 'i';
- 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)
argstr[x++] = 'g';
- if (preserve_devices)
+ if (preserve_devices) /* ignore preserve_specials here */
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 < 0)
+ 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';
+ if (preserve_xattrs > 1)
+ argstr[x++] = 'X';
+ }
+#endif
+ if (recurse)
argstr[x++] = 'r';
if (always_checksum)
argstr[x++] = 'c';
argstr[x++] = 'I';
if (relative_paths)
argstr[x++] = 'R';
- if (one_file_system)
+ if (one_file_system) {
argstr[x++] = 'x';
+ if (one_file_system > 1)
+ argstr[x++] = 'x';
+ }
if (sparse_files)
argstr[x++] = 'S';
if (do_compression)
argstr[x++] = 'z';
- /* 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';
+#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;
+ argstr[x] = '\0';
if (x != 1)
args[ac++] = argstr;
+#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 (protect_args) /* initial args break here */
+ args[ac++] = NULL;
+
if (list_only > 1)
args[ac++] = "--list-only";
- if (block_size) {
- if (asprintf(&arg, "-B%lu", block_size) < 0)
+ /* This makes sure that the remote rsync can handle deleting with -d
+ * sans -r because the --no-r option was added at the same time. */
+ if (xfer_dirs && !recurse && delete_mode && am_sender)
+ args[ac++] = "--no-r";
+
+ if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
+ if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
goto oom;
args[ac++] = arg;
}
- if (max_delete && am_sender) {
- if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
- goto oom;
- args[ac++] = arg;
+ if (preserve_devices) {
+ /* Note: sending "--devices" would not be backward-compatible. */
+ if (!preserve_specials)
+ args[ac++] = "--no-specials"; /* -D is already set. */
+ } else if (preserve_specials)
+ args[ac++] = "--specials";
+
+ /* The server side doesn't use our log-format, but in certain
+ * circumstances they need to know a little about the option. */
+ 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 (stdout_format_has_i)
+ args[ac++] = "--log-format=%i";
+ else if (stdout_format_has_o_or_i)
+ args[ac++] = "--log-format=%o";
+ else if (!verbose)
+ args[ac++] = "--log-format=X";
}
- if (max_size && am_sender) {
- args[ac++] = "--max-size";
- args[ac++] = max_size_arg;
+ if (block_size) {
+ if (asprintf(&arg, "-B%lu", block_size) < 0)
+ goto oom;
+ args[ac++] = arg;
}
if (io_timeout) {
}
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 (max_delete > 0) {
+ if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
+ goto oom;
+ args[ac++] = arg;
+ } else if (max_delete == 0)
+ args[ac++] = "--max-delete=-1";
+ if (min_size) {
+ args[ac++] = "--min-size";
+ args[ac++] = min_size_arg;
+ }
+ if (max_size) {
+ args[ac++] = "--max-size";
+ args[ac++] = max_size_arg;
+ }
+ 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)
+ args[ac++] = "--only-write-batch=X";
+ if (am_root > 1)
+ args[ac++] = "--super";
+ if (size_only)
+ args[ac++] = "--size-only";
+ } else {
+ if (skip_compress) {
+ if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0)
+ goto oom;
+ args[ac++] = arg;
+ }
}
- if (size_only)
- args[ac++] = "--size-only";
-
if (modify_window_set) {
if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
goto oom;
}
if (partial_dir && am_sender) {
- if (partial_dir != partialdir_for_delayupdate) {
+ if (partial_dir != tmp_partialdir) {
args[ac++] = "--partial-dir";
args[ac++] = partial_dir;
}
if (delay_updates)
args[ac++] = "--delay-updates";
- } else if (keep_partial)
+ } else if (keep_partial && am_sender)
args[ac++] = "--partial";
if (ignore_errors)
if (numeric_ids)
args[ac++] = "--numeric-ids";
- if (only_existing && am_sender)
- args[ac++] = "--existing";
+ if (!allow_inc_recurse)
+ args[ac++] = "--no-i-r";
- if (opt_ignore_existing && am_sender)
- args[ac++] = "--ignore-existing";
+ if (am_sender) {
+ if (ignore_existing)
+ args[ac++] = "--ignore-existing";
- if (inplace)
- args[ac++] = "--inplace";
+ /* Backward compatibility: send --existing, not --ignore-non-existing. */
+ if (ignore_non_existing)
+ args[ac++] = "--existing";
- if (tmpdir) {
- args[ac++] = "--temp-dir";
- args[ac++] = tmpdir;
- }
+ if (tmpdir) {
+ 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 (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 (files_from && (!am_sender || remote_filesfrom_file)) {
- if (remote_filesfrom_file) {
+ if (append_mode) {
+ if (append_mode > 1)
+ args[ac++] = "--append";
+ args[ac++] = "--append";
+ } else if (inplace)
+ args[ac++] = "--inplace";
+
+ if (files_from && (!am_sender || filesfrom_host)) {
+ if (filesfrom_host) {
args[ac++] = "--files-from";
- args[ac++] = remote_filesfrom_file;
+ args[ac++] = files_from;
if (eol_nulls)
args[ac++] = "--from0";
} else {
if (!relative_paths)
args[ac++] = "--no-relative";
}
- if (!implied_dirs && !am_sender)
+ /* It's OK that this checks the upper-bound of the protocol_version. */
+ if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
args[ac++] = "--no-implied-dirs";
if (fuzzy_basis && am_sender)
args[ac++] = "--fuzzy";
- *argc = ac;
+ if (remove_source_files == 1)
+ args[ac++] = "--remove-source-files";
+ else if (remove_source_files)
+ args[ac++] = "--remove-sent-files";
+
+ *argc_p = ac;
return;
oom:
out_of_memory("server_options");
}
-/**
- * Return the position of a ':' IF it is not part of a filename (i.e. as
- * long as it doesn't occur after a slash.
- */
-char *find_colon(char *s)
+/* Look for a HOST specfication of the form "HOST:PATH", "HOST::PATH", or
+ * "rsync://HOST:PORT/PATH". If found, *host_ptr will be set to some allocated
+ * memory with the HOST. If a daemon-accessing spec was specified, the value
+ * of *port_ptr will contain a non-0 port number, otherwise it will be set to
+ * 0. The return value is a pointer to the PATH. Note that the HOST spec can
+ * be an IPv6 literal address enclosed in '[' and ']' (such as "[::1]" or
+ * "[::ffff:127.0.0.1]") which is returned without the '[' and ']'. */
+char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
{
- char *p, *p2;
+ char *p;
+ int not_host;
+ int hostlen;
+
+ if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) {
+ char *path;
+ s += strlen(URL_PREFIX);
+ if ((p = strchr(s, '/')) != NULL) {
+ hostlen = p - s;
+ path = p + 1;
+ } else {
+ hostlen = strlen(s);
+ path = "";
+ }
+ if (*s == '[' && (p = strchr(s, ']')) != NULL) {
+ s++;
+ hostlen = p - s;
+ if (p[1] == ':')
+ *port_ptr = atoi(p+2);
+ } else {
+ if ((p = strchr(s, ':')) != NULL && p < s + hostlen) {
+ hostlen = p - s;
+ *port_ptr = atoi(p+1);
+ }
+ }
+ if (!*port_ptr)
+ *port_ptr = RSYNC_PORT;
+ *host_ptr = new_array(char, hostlen + 1);
+ strlcpy(*host_ptr, s, hostlen + 1);
+ return path;
+ }
- p = strchr(s,':');
- if (!p)
- return NULL;
+ if (*s == '[' && (p = strchr(s, ']')) != NULL && p[1] == ':') {
+ s++;
+ hostlen = p - s;
+ *p = '\0';
+ not_host = strchr(s, '/') || !strchr(s, ':');
+ *p = ']';
+ if (not_host)
+ return NULL;
+ p++;
+ } else {
+ if (!(p = strchr(s, ':')))
+ return NULL;
+ hostlen = p - s;
+ *p = '\0';
+ not_host = strchr(s, '/') != NULL;
+ *p = ':';
+ if (not_host)
+ return NULL;
+ }
- /* now check to see if there is a / in the string before the : - if there is then
- discard the colon on the assumption that the : is part of a filename */
- p2 = strchr(s,'/');
- if (p2 && p2 < p)
- return NULL;
+ *host_ptr = new_array(char, hostlen + 1);
+ strlcpy(*host_ptr, s, hostlen + 1);
+
+ if (p[1] == ':') {
+ if (port_ptr && !*port_ptr)
+ *port_ptr = RSYNC_PORT;
+ return p + 2;
+ }
+ if (port_ptr)
+ *port_ptr = 0;
- return p;
+ return p + 1;
}