X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7b329a2d798d24d5f3928b3a8653cedb16d3425e..b9f592fbf50b0dc9e3d1d33b8deb2bf9abad9ef6:/options.c diff --git a/options.c b/options.c index 22521566..d11e6419 100644 --- a/options.c +++ b/options.c @@ -1,41 +1,45 @@ /* -*- c-file-style: "linux" -*- - - Copyright (C) 1998-2001 by Andrew Tridgell - Copyright (C) 2000, 2001, 2002 by Martin Pool - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ + * + * Copyright (C) 1998-2001 by Andrew Tridgell + * Copyright (C) 2000, 2001, 2002 by Martin Pool + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "rsync.h" #include "popt.h" +extern int sanitize_paths; +extern int select_timeout; +extern char curr_dir[MAXPATHLEN]; +extern struct exclude_list_struct exclude_list; + int make_backups = 0; /** - * Should we send the whole file as literal data rather than trying to - * create an incremental diff? This is on by default when both source - * and destination are local and we're not doing a batch delta, - * because there it's no cheaper to read the whole basis file than to - * just rewrite it. + * If 1, send the whole file as literal data rather than trying to + * create an incremental diff. + * + * If -1, then look at whether we're local or remote and go by that. * - * If both are 0, then look at whether we're local or remote and go by - * that. + * @sa disable_deltas_p() **/ -int whole_file = 0; -int no_whole_file = 0; +int whole_file = -1; +int archive_mode = 0; +int keep_dirlinks = 0; int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; @@ -46,47 +50,52 @@ int preserve_gid = 0; int preserve_times = 0; int update_only = 0; int cvs_exclude = 0; -int dry_run=0; -int local_server=0; -int ignore_times=0; -int delete_mode=0; -int delete_excluded=0; -int one_file_system=0; -int remote_version=0; -int sparse_files=0; -int do_compression=0; -int am_root=0; -int orig_umask=0; -int relative_paths=0; +int dry_run = 0; +int local_server = 0; +int ignore_times = 0; +int delete_mode = 0; +int delete_excluded = 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 relative_paths = -1; +int implied_dirs = 1; int numeric_ids = 0; int force_delete = 0; int io_timeout = 0; -int io_error = 0; int read_only = 0; int module_id = -1; int am_server = 0; int am_sender = 0; +int am_generator = 0; +char *files_from = NULL; +int filesfrom_fd = -1; +char *remote_filesfrom_file = NULL; +int eol_nulls = 0; int recurse = 0; -int am_daemon=0; -int do_stats=0; -int do_progress=0; -int keep_partial=0; -int safe_symlinks=0; -int copy_unsafe_links=0; -int block_size=BLOCK_SIZE; -int size_only=0; -int bwlimit=0; -int delete_after=0; -int only_existing=0; -int opt_ignore_existing=0; -int max_delete=0; -int ignore_errors=0; -#ifdef _WIN32 -int modify_window=2; -#else -int modify_window=0; -#endif -int blocking_io=-1; +int am_daemon = 0; +int daemon_over_rsh = 0; +int do_stats = 0; +int do_progress = 0; +int keep_partial = 0; +int safe_symlinks = 0; +int copy_unsafe_links = 0; +int size_only = 0; +int bwlimit = 0; +size_t bwlimit_writemax = 0; +int delete_after = 0; +int only_existing = 0; +int opt_ignore_existing = 0; +int max_delete = 0; +int ignore_errors = 0; +int modify_window = 0; +int blocking_io = -1; +int checksum_seed = 0; +unsigned int block_size = 0; + /** Network address family. **/ #ifdef INET6 @@ -102,76 +111,88 @@ int no_detach = 0; int write_batch = 0; int read_batch = 0; +int backup_dir_len = 0; +int backup_suffix_len; +unsigned int backup_dir_remainder; -char *backup_suffix = BACKUP_SUFFIX; +char *backup_suffix = NULL; char *tmpdir = NULL; char *compare_dest = NULL; -char *config_file = RSYNCD_CONF; +char *config_file = NULL; char *shell_cmd = NULL; char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; +char backup_dir_buf[MAXPATHLEN]; int rsync_port = RSYNC_PORT; +int link_dest = 0; int verbose = 0; int quiet = 0; int always_checksum = 0; int list_only = 0; +#define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_prefix = NULL; +static int daemon_opt; /* sets am_daemon after option error-reporting */ static int modify_window_set; /** Local address to bind. As a character string because it's - * interpreted by the IPv6 layer: should be a numeric IP4 or ip6 + * interpreted by the IPv6 layer: should be a numeric IP4 or IP6 * address, or a hostname. **/ char *bind_address; static void print_rsync_version(enum logcode f) { - char const *got_socketpair = "no "; - char const *hardlinks = "no "; - char const *links = "no "; + char const *got_socketpair = "no "; + char const *hardlinks = "no "; + char const *links = "no "; char const *ipv6 = "no "; STRUCT_STAT *dumstat; #ifdef HAVE_SOCKETPAIR - got_socketpair = ""; + got_socketpair = ""; #endif #if SUPPORT_HARD_LINKS - hardlinks = ""; + hardlinks = ""; #endif #if SUPPORT_LINKS - links = ""; + links = ""; #endif #if INET6 ipv6 = ""; -#endif +#endif - rprintf(f, "%s version %s protocol version %d\n", - RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); - rprintf(f, - "Copyright (C) 1996-2002 by Andrew Tridgell and others\n"); + rprintf(f, "%s version %s protocol version %d\n", + RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); + rprintf(f, + "Copyright (C) 1996-2004 by Andrew Tridgell and others\n"); rprintf(f, "\n"); - rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " - "%shard links, %ssymlinks, batchfiles, %sIPv6,\n", - (int) (sizeof(OFF_T) * 8), - got_socketpair, hardlinks, links, ipv6); + 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, " %d-bit system inums, %d-bit internal inums\n", - (int) (sizeof(dumstat->st_ino) * 8), - (int) (sizeof(INO64_T) * 8)); + rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n", + ipv6, + (int) (sizeof dumstat->st_ino * 8), + (int) (sizeof (uint64) * 8)); +#ifdef MAINTAINER_MODE + rprintf(f, " panic action: \"%s\"\n", + get_panic_action()); +#endif #ifdef NO_INT64 - rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); + rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); #endif rprintf(f, @@ -187,7 +208,7 @@ void usage(enum logcode F) { print_rsync_version(F); - rprintf(F,"rsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n"); + rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n"); rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n"); rprintf(F," or rsync [OPTION]... [USER@]HOST:SRC DEST\n"); @@ -195,6 +216,7 @@ void usage(enum logcode F) rprintf(F," or rsync [OPTION]... [USER@]HOST::SRC [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"); @@ -202,74 +224,81 @@ void usage(enum logcode F) rprintf(F," -v, --verbose increase verbosity\n"); rprintf(F," -q, --quiet decrease verbosity\n"); rprintf(F," -c, --checksum always checksum\n"); - rprintf(F," -a, --archive archive mode\n"); + rprintf(F," -a, --archive archive mode, equivalent to -rlptgoD\n"); rprintf(F," -r, --recursive recurse into directories\n"); rprintf(F," -R, --relative use relative path names\n"); - rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX); + rprintf(F," --no-relative turn off --relative\n"); + rprintf(F," --no-implied-dirs don't send implied dirs with -R\n"); + rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); rprintf(F," --backup-dir make backups into this directory\n"); - rprintf(F," --suffix=SUFFIX override backup suffix\n"); + rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); rprintf(F," -u, --update update only (don't overwrite newer files)\n"); + rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -l, --links copy symlinks as symlinks\n"); - rprintf(F," -L, --copy-links copy the referent of symlinks\n"); - rprintf(F," --copy-unsafe-links copy links outside the source tree\n"); - rprintf(F," --safe-links ignore links outside the destination tree\n"); + rprintf(F," -L, --copy-links copy the referent of all symlinks\n"); + rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n"); + rprintf(F," --safe-links ignore \"unsafe\" symlinks\n"); rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); rprintf(F," -o, --owner preserve owner (root only)\n"); rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); - rprintf(F," -t, --times preserve times\n"); + rprintf(F," -t, --times preserve times\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); rprintf(F," --no-whole-file turn off --whole-file\n"); rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n"); - rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE); - rprintf(F," -e, --rsh=COMMAND specify rsh replacement\n"); + rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE); + rprintf(F," -e, --rsh=COMMAND specify the remote shell\n"); rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n"); - rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); rprintf(F," --existing only update files that already exist\n"); - rprintf(F," --ignore-existing ignore files that already exist on the receiving side\n"); + rprintf(F," --ignore-existing ignore files that already exist on receiving side\n"); rprintf(F," --delete delete files that don't exist on the sending side\n"); rprintf(F," --delete-excluded also delete excluded files on the receiving side\n"); - rprintf(F," --delete-after delete after transferring, not before\n"); - rprintf(F," --ignore-errors delete even if there are IO errors\n"); + rprintf(F," --delete-after receiver deletes after transferring, not before\n"); + rprintf(F," --ignore-errors delete even if there are I/O errors\n"); rprintf(F," --max-delete=NUM don't delete more than NUM files\n"); rprintf(F," --partial keep partially transferred files\n"); rprintf(F," --force force deletion of directories even if not empty\n"); rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n"); - rprintf(F," --timeout=TIME set IO timeout in seconds\n"); - rprintf(F," -I, --ignore-times don't exclude files that match length and time\n"); - rprintf(F," --size-only only use file size when determining if a file should be transferred\n"); - rprintf(F," --modify-window=NUM Timestamp window (seconds) for file match (default=%d)\n",modify_window); + rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); + rprintf(F," -I, --ignore-times turn off mod time & file size quick check\n"); + rprintf(F," --size-only ignore mod time for quick check (use size)\n"); + rprintf(F," --modify-window=NUM compare mod times with reduced accuracy\n"); rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); + rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\n"); rprintf(F," -P equivalent to --partial --progress\n"); rprintf(F," -z, --compress compress file data\n"); + rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n"); rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n"); rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n"); rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n"); - rprintf(F," --version print version number\n"); - rprintf(F," --daemon run as a rsync daemon\n"); - rprintf(F," --no-detach do not detach from the parent\n"); - rprintf(F," --address=ADDRESS bind to the specified address\n"); - rprintf(F," --config=FILE specify alternate rsyncd.conf file\n"); + rprintf(F," --files-from=FILE read FILE for list of source-file names\n"); + rprintf(F," -0 --from0 all *-from file lists are delimited by nulls\n"); + rprintf(F," --version print version number\n"); + rprintf(F," --daemon run as an rsync daemon\n"); + rprintf(F," --no-detach do not detach from the parent\n"); + rprintf(F," --address=ADDRESS bind to the specified address\n"); + rprintf(F," --config=FILE specify alternate rsyncd.conf file\n"); rprintf(F," --port=PORT specify alternate rsyncd port number\n"); - rprintf(F," --blocking-io use blocking IO for the remote shell\n"); - rprintf(F," --no-blocking-io turn off --blocking-io\n"); - rprintf(F," --stats give some file transfer stats\n"); - rprintf(F," --progress show progress during transfer\n"); - rprintf(F," --log-format=FORMAT log file transfers using specified format\n"); + rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); + rprintf(F," --no-blocking-io turn off --blocking-io\n"); + rprintf(F," --stats give some file transfer stats\n"); + rprintf(F," --progress show progress during transfer\n"); + rprintf(F," --log-format=FORMAT log file transfers using specified format\n"); rprintf(F," --password-file=FILE get password from FILE\n"); rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); - rprintf(F," -h, --help show this help screen\n"); + rprintf(F," --checksum-seed=NUM set block/file checksum seed\n"); #ifdef INET6 - rprintf(F," -4 prefer IPv4\n"); - rprintf(F," -6 prefer IPv6\n"); + rprintf(F," -4 --ipv4 prefer IPv4\n"); + rprintf(F," -6 --ipv6 prefer IPv6\n"); #endif + rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\n"); @@ -277,256 +306,252 @@ void usage(enum logcode F) rprintf(F,"See http://rsync.samba.org/ for updates, bug reports, and answers\n"); } -enum {OPT_VERSION = 1000, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE, - OPT_EXCLUDE_FROM, OPT_DELETE, OPT_DELETE_EXCLUDED, OPT_NUMERIC_IDS, - OPT_RSYNC_PATH, OPT_FORCE, OPT_TIMEOUT, OPT_DAEMON, OPT_CONFIG, OPT_PORT, - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS, - OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, - OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, - OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, - OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO, - OPT_NO_BLOCKING_IO, OPT_NO_WHOLE_FILE, - OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_IGNORE_EXISTING}; +enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, + OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, + OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, + OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, + OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0}, - {"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 }, - {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times , 0, 0, 0 }, - {"size-only", 0, POPT_ARG_NONE, &size_only , 0, 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 }, + {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, + {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system , 0, 0, 0 }, - {"delete", 0, POPT_ARG_NONE, &delete_mode , 0, 0, 0 }, - {"existing", 0, POPT_ARG_NONE, &only_existing , 0, 0, 0 }, - {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing , 0, 0, 0 }, - {"delete-after", 0, POPT_ARG_NONE, &delete_after , 0, 0, 0 }, + {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, + {"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 }, + {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, + {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 }, + {"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 }, {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 }, - {"force", 0, POPT_ARG_NONE, &force_delete , 0, 0, 0 }, - {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids , 0, 0, 0 }, + {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, + {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 }, {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 }, {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 }, {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 }, {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 }, - {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks , 0, 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 }, - {"links", 'l', POPT_ARG_NONE, &preserve_links , 0, 0, 0 }, - {"copy-links", 'L', POPT_ARG_NONE, ©_links , 0, 0, 0 }, - {"whole-file", 'W', POPT_ARG_NONE, &whole_file , 0, 0, 0 }, - {"no-whole-file", 0, POPT_ARG_NONE, &no_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 }, - {"checksum", 'c', POPT_ARG_NONE, &always_checksum , 0, 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 }, + {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 }, + {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, + {"copy-links", 'L', POPT_ARG_NONE, ©_links, 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 }, + {"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, 0, 'a', 0, 0 }, - {"server", 0, POPT_ARG_NONE, &am_server , 0, 0, 0 }, - {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, - {"recursive", 'r', POPT_ARG_NONE, &recurse , 0, 0, 0 }, - {"relative", 'R', POPT_ARG_NONE, &relative_paths , 0, 0, 0 }, - {"rsh", 'e', POPT_ARG_STRING, &shell_cmd , 0, 0, 0 }, - {"block-size", 'B', POPT_ARG_INT, &block_size , 0, 0, 0 }, - {"max-delete", 0, POPT_ARG_INT, &max_delete , 0, 0, 0 }, - {"timeout", 0, POPT_ARG_INT, &io_timeout , 0, 0, 0 }, - {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir , 0, 0, 0 }, - {"compare-dest", 0, POPT_ARG_STRING, &compare_dest , 0, 0, 0 }, + {"archive", 'a', POPT_ARG_NONE, &archive_mode, 0, 0, 0 }, + {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, + {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, + {"recursive", 'r', POPT_ARG_NONE, &recurse, 0, 0, 0 }, + {"relative", 'R', POPT_ARG_VAL, &relative_paths, 1, 0, 0 }, + {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 }, + {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, + {"block-size", 'B', POPT_ARG_INT, &block_size, 0, 0, 0 }, + {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 }, + {"timeout", 0, POPT_ARG_INT, &io_timeout, OPT_TIMEOUT, 0, 0 }, + {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, + {"compare-dest", 0, POPT_ARG_STRING, &compare_dest, 0, 0, 0 }, + {"link-dest", 0, POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 }, /* TODO: Should this take an optional int giving the compression level? */ - {"compress", 'z', POPT_ARG_NONE, &do_compression , 0, 0, 0 }, - {"daemon", 0, POPT_ARG_NONE, &am_daemon , 0, 0, 0 }, - {"no-detach", 0, POPT_ARG_NONE, &no_detach , 0, 0, 0 }, - {"stats", 0, POPT_ARG_NONE, &do_stats , 0, 0, 0 }, - {"progress", 0, POPT_ARG_NONE, &do_progress , 0, 0, 0 }, - {"partial", 0, POPT_ARG_NONE, &keep_partial , 0, 0, 0 }, - {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors , 0, 0, 0 }, - {"blocking-io", 0, POPT_ARG_NONE, &blocking_io , 0, 0, 0 }, - {"no-blocking-io", 0, POPT_ARG_NONE, 0, OPT_NO_BLOCKING_IO, 0, 0 }, - {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, - {"config", 0, POPT_ARG_STRING, &config_file , 0, 0, 0 }, - {"port", 0, POPT_ARG_INT, &rsync_port , 0, 0, 0 }, - {"log-format", 0, POPT_ARG_STRING, &log_format , 0, 0, 0 }, - {"bwlimit", 0, POPT_ARG_INT, &bwlimit , 0, 0, 0 }, + {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, + {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 }, + {"no-detach", 0, POPT_ARG_NONE, &no_detach, 0, 0, 0 }, + {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, + {"progress", 0, POPT_ARG_NONE, &do_progress, 0, 0, 0 }, + {"partial", 0, POPT_ARG_NONE, &keep_partial, 0, 0, 0 }, + {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 }, + {"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 }, + {"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 }, + {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, + {"config", 0, POPT_ARG_STRING, &config_file, 0, 0, 0 }, + {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 }, + {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 }, + {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 }, - {"backup-dir", 0, POPT_ARG_STRING, &backup_dir , 0, 0, 0 }, - {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links , 0, 0, 0 }, - {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 }, - {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 }, + {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, + {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 0, 0 }, + {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 }, + {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 }, + {"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 - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET , 0, 0 }, - {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6 , 0, 0 }, + {"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 {0,0,0,0, 0, 0, 0} }; -static char err_buf[100]; +static char err_buf[200]; -/* We store the option error message, if any, so that we can log the - connection attempt (which requires parsing the options), and then - show the error later on. */ +/** + * Store the option error message, if any, so that we can log the + * connection attempt (which requires parsing the options), and then + * show the error later on. + **/ void option_error(void) { - if (err_buf[0]) { - rprintf(FLOG, "%s", err_buf); - rprintf(FERROR, "%s: %s", RSYNC_NAME, err_buf); - } else { - rprintf (FERROR, "Error parsing options: " - "option may be supported on client but not on server?\n"); - rprintf (FERROR, RSYNC_NAME ": Error parsing options: " - "option may be supported on client but not on server?\n"); + if (!err_buf[0]) { + strcpy(err_buf, "Error parsing options: " + "option may be supported on client but not on server?\n"); } + + rprintf(FERROR, RSYNC_NAME ": %s", err_buf); } -/* check to see if we should refuse this option */ -static int check_refuse_options(char *ref, int opt) -{ - int i, len; - char *p; - const char *name; - for (i=0; long_options[i].longName; i++) { - if (long_options[i].val == opt) break; - } - - if (!long_options[i].longName) return 0; - - name = long_options[i].longName; - len = strlen(name); - - while ((p = strstr(ref,name))) { - if ((p==ref || p[-1]==' ') && - (p[len] == ' ' || p[len] == 0)) { - snprintf(err_buf,sizeof(err_buf), - "The '%s' option is not supported by this server\n", name); - return 1; +/** + * Tweak the option table to disable all options that the rsyncd.conf + * file has told us to refuse. + **/ +static void set_refuse_options(char *bp) +{ + struct poptOption *op; + char *cp; + + while (1) { + if ((cp = strchr(bp, ' ')) != NULL) + *cp= '\0'; + for (op = long_options; ; op++) { + if (!op->longName) { + rprintf(FLOG, + "Unknown option %s in \"refuse options\" setting\n", + bp); + break; + } + if (strcmp(bp, op->longName) == 0) { + op->val = (op - long_options)+OPT_REFUSED_BASE; + break; + } } - ref += len; + if (!cp) + break; + *cp = ' '; + bp = cp + 1; } - return 0; } static int count_args(char const **argv) { - int i = 0; + int i = 0; + + while (argv[i] != NULL) + i++; - while (argv[i] != NULL) - i++; - - return i; + return i; } -/* Process command line arguments. Called on both local and remote. - * Returns if all options are OK, otherwise fills in err_buf and - * returns 0. */ +/** + * Process command line arguments. Called on both local and remote. + * + * @retval 1 if all options are OK; with globals set to appropriate + * values + * + * @retval 0 on error, with err_buf containing an explanation + **/ int parse_arguments(int *argc, const char ***argv, int frommain) { int opt; char *ref = lp_refuse_options(module_id); - poptContext pc; + const char *arg; + poptContext pc; - /* TODO: Call poptReadDefaultConfig; handle errors. */ + if (ref && *ref) + set_refuse_options(ref); - /* 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); + /* TODO: Call poptReadDefaultConfig; handle errors. */ - while ((opt = poptGetNextOpt(pc)) != -1) { - if (ref) { - if (check_refuse_options(ref, opt)) return 0; - } + /* 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); - /* most options are handled automatically by popt; - * only special cases are returned and listed here. */ + while ((opt = poptGetNextOpt(pc)) != -1) { + /* most options are handled automatically by popt; + * only special cases are returned and listed here. */ switch (opt) { case OPT_VERSION: - print_rsync_version(FINFO); + print_rsync_version(FINFO); exit_cleanup(0); - + case OPT_MODIFY_WINDOW: - /* The value has already been set by popt, but - * we need to remember that we're using a - * non-default setting. */ + /* The value has already been set by popt, but + * we need to remember that we're using a + * non-default setting. */ modify_window_set = 1; break; - + + case OPT_DELETE_AFTER: + delete_after = 1; + delete_mode = 1; + break; + case OPT_DELETE_EXCLUDED: delete_excluded = 1; delete_mode = 1; break; case OPT_EXCLUDE: - add_exclude(poptGetOptArg(pc), 0); + if (am_server || sanitize_paths) + return 0; /* Impossible... */ + add_exclude(&exclude_list, poptGetOptArg(pc), 0); break; case OPT_INCLUDE: - add_exclude(poptGetOptArg(pc), 1); + if (am_server || sanitize_paths) + return 0; /* Impossible... */ + add_exclude(&exclude_list, poptGetOptArg(pc), + XFLG_DEF_INCLUDE); break; case OPT_EXCLUDE_FROM: - add_exclude_file(poptGetOptArg(pc), 1, 0); + if (am_server || sanitize_paths) + return 0; /* Impossible... */ + arg = poptGetOptArg(pc); + add_exclude_file(&exclude_list, arg, + XFLG_FATAL_ERRORS); break; case OPT_INCLUDE_FROM: - add_exclude_file(poptGetOptArg(pc), 1, 1); - break; - - case OPT_NO_BLOCKING_IO: - blocking_io = 0; + if (am_server || sanitize_paths) + return 0; /* Impossible... */ + arg = poptGetOptArg(pc); + add_exclude_file(&exclude_list, arg, + XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE); break; case 'h': usage(FINFO); exit_cleanup(0); - case 'H': -#if SUPPORT_HARD_LINKS - preserve_hard_links=1; -#else - /* FIXME: Don't say "server" if this is - * happening on the client. */ - /* FIXME: Why do we have the duplicated - * rprintf? Everybody who gets this message - * ought to send it to the client and also to - * the logs. */ - snprintf(err_buf,sizeof(err_buf), - "hard links are not supported on this %s\n", - am_server ? "server" : "client"); - rprintf(FERROR,"ERROR: hard links not supported on this platform\n"); - return 0; -#endif /* SUPPORT_HARD_LINKS */ - break; - case 'v': verbose++; break; case 'q': - if (frommain) quiet++; - break; - - case 'a': - recurse=1; -#if SUPPORT_LINKS - preserve_links=1; -#endif - preserve_perms=1; - preserve_times=1; - preserve_gid=1; - preserve_uid=1; - preserve_devices=1; + if (frommain) + quiet++; break; case OPT_SENDER: @@ -552,57 +577,216 @@ int parse_arguments(int *argc, const char ***argv, int frommain) read_batch = 1; break; + case OPT_TIMEOUT: + if (io_timeout && io_timeout < select_timeout) + select_timeout = io_timeout; + break; + + case OPT_LINK_DEST: +#if HAVE_LINK + link_dest = 1; + break; +#else + snprintf(err_buf, sizeof err_buf, + "hard links are not supported on this %s\n", + am_server ? "server" : "client"); + return 0; +#endif + default: - /* FIXME: If --daemon is specified, then errors for later - * parameters seem to disappear. */ - snprintf(err_buf, sizeof(err_buf), - "%s%s: %s\n", - am_server ? "on remote machine: " : "", - poptBadOption(pc, POPT_BADOPTION_NOALIAS), - poptStrerror(opt)); - return 0; + /* A large opt value means that set_refuse_options() + * turned this option off (opt-BASE is its index). */ + if (opt >= OPT_REFUSED_BASE) { + struct poptOption *op = + &long_options[opt-OPT_REFUSED_BASE]; + int n = snprintf(err_buf, sizeof err_buf, + "This server does not support --%s\n", + op->longName) - 1; + if (op->shortName) { + snprintf(err_buf+n, sizeof err_buf-n, + " (-%c)\n", op->shortName); + } + } else { + snprintf(err_buf, sizeof err_buf, + "%s%s: %s\n", + am_server ? "on remote machine: " : "", + poptBadOption(pc, POPT_BADOPTION_NOALIAS), + poptStrerror(opt)); + } + return 0; } } +#if !SUPPORT_LINKS + if (preserve_links && !am_sender) { + snprintf(err_buf, sizeof err_buf, + "symlinks are not supported on this %s\n", + am_server ? "server" : "client"); + return 0; + } +#endif + +#if !SUPPORT_HARD_LINKS + if (preserve_hard_links) { + snprintf(err_buf, sizeof err_buf, + "hard links are not supported on this %s\n", + am_server ? "server" : "client"); + 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"); - rprintf(FERROR,"ERROR: write-batch and read-batch" - " can not be used together\n"); - return 0; + rprintf(FERROR, + "write-batch and read-batch can not be used together\n"); + exit_cleanup(RERR_SYNTAX); + } + if ((write_batch || read_batch) && am_server) { + rprintf(FERROR, + "batch-mode is incompatible with server mode\n"); + /* We don't actually exit_cleanup(), so that we can still service + * older version clients that still send batch args to server. */ + read_batch = write_batch = 0; + batch_prefix = NULL; + } + if (batch_prefix && strlen(batch_prefix) > MAX_BATCH_PREFIX_LEN) { + rprintf(FERROR, + "the batch-file prefix must be %d characters or less.\n", + MAX_BATCH_PREFIX_LEN); + exit_cleanup(RERR_SYNTAX); + } + + if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) { + rprintf(FERROR, "the --temp-dir path is WAY too long.\n"); + exit_cleanup(RERR_SYNTAX); + } + + if (archive_mode) { + if (!files_from) + recurse = 1; +#if SUPPORT_LINKS + preserve_links = 1; +#endif + preserve_perms = 1; + preserve_times = 1; + preserve_gid = 1; + preserve_uid = 1; + preserve_devices = 1; + } + + if (relative_paths < 0) + relative_paths = files_from? 1 : 0; + + *argv = poptGetArgs(pc); + if (*argv) + *argc = count_args(*argv); + else + *argc = 0; + + if (sanitize_paths) { + int i; + for (i = *argc; i-- > 0; ) + (*argv)[i] = alloc_sanitize_path((*argv)[i], NULL); + if (tmpdir) + tmpdir = alloc_sanitize_path(tmpdir, curr_dir); + if (compare_dest) + compare_dest = alloc_sanitize_path(compare_dest, curr_dir); + if (backup_dir) + backup_dir = alloc_sanitize_path(backup_dir, curr_dir); + if (files_from) + files_from = alloc_sanitize_path(files_from, curr_dir); + } + + if (daemon_opt) { + daemon_opt = 0; + am_daemon = 1; + return 1; } - if (do_compression && (write_batch || read_batch)) { - snprintf(err_buf,sizeof(err_buf), - "compress can not be used with write-batch or read-batch\n"); - rprintf(FERROR,"ERROR: compress can not be used with" - " write-batch or read-batch\n"); - return 0; + if (!backup_suffix) + backup_suffix = backup_dir ? "" : BACKUP_SUFFIX; + backup_suffix_len = strlen(backup_suffix); + if (strchr(backup_suffix, '/') != NULL) { + rprintf(FERROR, "--suffix cannot contain slashes: %s\n", + backup_suffix); + exit_cleanup(RERR_SYNTAX); } + if (backup_dir) { + backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf); + backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len; + if (backup_dir_remainder < 32) { + rprintf(FERROR, "the --backup-dir path is WAY too long.\n"); + exit_cleanup(RERR_SYNTAX); + } + if (backup_dir_buf[backup_dir_len - 1] != '/') { + backup_dir_buf[backup_dir_len++] = '/'; + backup_dir_buf[backup_dir_len] = '\0'; + } + if (verbose > 1 && !am_sender) + rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf); + } else if (!backup_suffix_len && (!am_server || !am_sender)) { + rprintf(FERROR, + "--suffix cannot be a null string without --backup-dir\n"); + exit_cleanup(RERR_SYNTAX); + } + + if (do_progress && !verbose) + verbose = 1; - *argv = poptGetArgs(pc); - if (*argv) - *argc = count_args(*argv); - else - *argc = 0; + if (bwlimit) { + bwlimit_writemax = (size_t)bwlimit * 128; + if (bwlimit_writemax < 512) + bwlimit_writemax = 512; + } + + if (files_from) { + char *colon; + if (*argc != 2 && !(am_server && am_sender && *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) { + if (am_server) { + usage(FERROR); + exit_cleanup(RERR_SYNTAX); + } + remote_filesfrom_file = colon+1 + (colon[1] == ':'); + if (strcmp(remote_filesfrom_file, "-") == 0) { + rprintf(FERROR, "Invalid --files-from remote filename\n"); + exit_cleanup(RERR_SYNTAX); + } + } else { + filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); + if (filesfrom_fd < 0) { + rsyserr(FERROR, errno, + "failed to open files-from file %s", + files_from); + exit_cleanup(RERR_FILEIO); + } + } + } return 1; } -/* Construct a filtered list of options to pass through from the - * client to the server */ +/** + * Construct a filtered list of options to pass through from the + * client to the server. + * + * This involves setting options that will tell the server how to + * behave, and also filtering out options that are processed only + * locally. + **/ void server_options(char **args,int *argc) { int ac = *argc; static char argstr[50]; - static char bsize[30]; - static char iotime[30]; - static char mdelete[30]; - static char mwindow[30]; - static char bw[50]; - /* Leave room for ``--(write|read)-batch='' */ - static char fext[MAXPATHLEN + 15]; + char *arg; int i, x; @@ -611,12 +795,19 @@ void server_options(char **args,int *argc) args[ac++] = "--server"; + if (daemon_over_rsh) { + args[ac++] = "--daemon"; + *argc = ac; + /* if we're passing --daemon, we're done */ + return; + } + if (!am_sender) args[ac++] = "--sender"; x = 1; argstr[0] = '-'; - for (i=0;i 0) argstr[x++] = 'W'; /* We don't need to send --no-whole-file, because it's the * default for remote transfers, and in any case old versions * of rsync will not understand it. */ - + if (preserve_hard_links) argstr[x++] = 'H'; if (preserve_uid) @@ -667,66 +859,73 @@ void server_options(char **args,int *argc) if (do_compression) argstr[x++] = 'z'; - /* this is a complete hack - blame Rusty + /* this is a complete hack - blame Rusty this is a hack to make the list_only (remote file list) more useful */ - if (list_only && !recurse) + if (list_only && !recurse) argstr[x++] = 'r'; argstr[x] = 0; - if (x != 1) args[ac++] = argstr; + if (x != 1) + args[ac++] = argstr; - if (block_size != BLOCK_SIZE) { - snprintf(bsize,sizeof(bsize),"-B%d",block_size); - args[ac++] = bsize; - } + if (block_size) { + if (asprintf(&arg, "-B%u", block_size) < 0) + goto oom; + args[ac++] = arg; + } if (max_delete && am_sender) { - snprintf(mdelete,sizeof(mdelete),"--max-delete=%d",max_delete); - args[ac++] = mdelete; - } - - if (batch_prefix != NULL) { - char *fmt = ""; - if (write_batch) - fmt = "--write-batch=%s"; - else - if (read_batch) - fmt = "--read-batch=%s"; - snprintf(fext,sizeof(fext),fmt,batch_prefix); - args[ac++] = fext; + if (asprintf(&arg, "--max-delete=%d", max_delete) < 0) + goto oom; + args[ac++] = arg; } if (io_timeout) { - snprintf(iotime,sizeof(iotime),"--timeout=%d",io_timeout); - args[ac++] = iotime; - } + if (asprintf(&arg, "--timeout=%d", io_timeout) < 0) + goto oom; + args[ac++] = arg; + } if (bwlimit) { - snprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit); - args[ac++] = bw; + if (asprintf(&arg, "--bwlimit=%d", bwlimit) < 0) + goto oom; + args[ac++] = arg; } - if (strcmp(backup_suffix, BACKUP_SUFFIX)) { - args[ac++] = "--suffix"; - args[ac++] = backup_suffix; + if (backup_dir) { + args[ac++] = "--backup-dir"; + args[ac++] = backup_dir; } - if (delete_mode && !delete_excluded) - args[ac++] = "--delete"; + /* Only send --suffix if it specifies a non-default value. */ + if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { + /* We use the following syntax to avoid weirdness with '~'. */ + if (asprintf(&arg, "--suffix=%s", backup_suffix) < 0) + goto oom; + args[ac++] = arg; + } if (delete_excluded) args[ac++] = "--delete-excluded"; + else if (delete_mode) + args[ac++] = "--delete"; if (size_only) args[ac++] = "--size-only"; if (modify_window_set) { - snprintf(mwindow,sizeof(mwindow),"--modify-window=%d", - modify_window); - args[ac++] = mwindow; + if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) + goto oom; + args[ac++] = arg; + } + + if (checksum_seed) { + if (asprintf(&arg, "--checksum-seed=%d", checksum_seed) < 0) + goto oom; + args[ac++] = arg; } if (keep_partial) @@ -753,7 +952,7 @@ void server_options(char **args,int *argc) if (only_existing && am_sender) args[ac++] = "--existing"; - if (opt_ignore_existing && am_sender) + if (opt_ignore_existing && am_sender) args[ac++] = "--ignore-existing"; if (tmpdir) { @@ -761,23 +960,51 @@ void server_options(char **args,int *argc) args[ac++] = tmpdir; } - if (backup_dir && am_sender) { - /* only the receiver needs this option, if we are the sender - * then we need to send it to the receiver. - */ - args[ac++] = "--backup-dir"; - args[ac++] = backup_dir; - } - if (compare_dest && am_sender) { /* the server only needs this option if it is not the sender, * and it may be an older version that doesn't know this * option, so don't send it if client is the sender. */ - args[ac++] = "--compare-dest"; + args[ac++] = link_dest ? "--link-dest" : "--compare-dest"; args[ac++] = compare_dest; } + if (files_from && (!am_sender || remote_filesfrom_file)) { + if (remote_filesfrom_file) { + args[ac++] = "--files-from"; + args[ac++] = remote_filesfrom_file; + if (eol_nulls) + args[ac++] = "--from0"; + } else { + args[ac++] = "--files-from=-"; + args[ac++] = "--from0"; + } + } + *argc = 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) +{ + char *p, *p2; + + p = strchr(s,':'); + if (!p) + 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; + + return p; +}