X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/65e4cda05976751030ccf280c96edb627584a496..ef74f5d626ef0220233e02fba1e3cc24a4902818:/options.c diff --git a/options.c b/options.c index bf148bf2..44619b6f 100644 --- a/options.c +++ b/options.c @@ -21,10 +21,11 @@ #include "rsync.h" #include "popt.h" +extern int module_id; extern int sanitize_paths; extern int select_timeout; -extern struct exclude_list_struct exclude_list; -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct filter_list; +extern struct filter_list_struct server_filter_list; int make_backups = 0; @@ -48,12 +49,13 @@ int preserve_devices = 0; int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; +int omit_dir_times = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -int local_server = 0; int ignore_times = 0; int delete_mode = 0; +int delete_during = 0; int delete_before = 0; int delete_after = 0; int delete_excluded = 0; @@ -68,10 +70,8 @@ int implied_dirs = 1; int numeric_ids = 0; int force_delete = 0; int io_timeout = 0; -int read_only = 0; -int module_id = -1; int am_server = 0; -int am_sender = 0; +int am_sender = -1; int am_generator = 0; char *files_from = NULL; int filesfrom_fd = -1; @@ -89,6 +89,7 @@ int copy_unsafe_links = 0; int size_only = 0; int daemon_bwlimit = 0; int bwlimit = 0; +int fuzzy_basis = 0; size_t bwlimit_writemax = 0; int only_existing = 0; int opt_ignore_existing = 0; @@ -99,6 +100,7 @@ int modify_window = 0; int blocking_io = -1; int checksum_seed = 0; int inplace = 0; +int delay_updates = 0; long block_size = 0; /* "long" because popt can't set an int32. */ @@ -139,6 +141,7 @@ int basis_dir_cnt = 0; int verbose = 0; int quiet = 0; +int itemize_changes = 0; int always_checksum = 0; int list_only = 0; @@ -146,9 +149,13 @@ int list_only = 0; char *batch_name = NULL; static int daemon_opt; /* sets am_daemon after option error-reporting */ +static int F_option_cnt = 0; static int modify_window_set; +static int refused_verbose, refused_delete, refused_archive_part; +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~"; /** Local address to bind. As a character string because it's * interpreted by the IPv6 layer: should be a numeric IP4 or IP6 @@ -169,26 +176,26 @@ static void print_rsync_version(enum logcode f) got_socketpair = ""; #endif -#if HAVE_FTRUNCATE +#ifdef HAVE_FTRUNCATE have_inplace = ""; #endif -#if SUPPORT_HARD_LINKS +#ifdef SUPPORT_HARD_LINKS hardlinks = ""; #endif -#if SUPPORT_LINKS +#ifdef SUPPORT_LINKS links = ""; #endif -#if INET6 +#ifdef INET6 ipv6 = ""; #endif rprintf(f, "%s version %s protocol version %d\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, - "Copyright (C) 1996-2004 by Andrew Tridgell and others\n"); + "Copyright (C) 1996-2005 by Andrew Tridgell and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " "%shard links, %ssymlinks, batchfiles, \n", @@ -207,10 +214,14 @@ static void print_rsync_version(enum logcode f) get_panic_action()); #endif -#ifdef INT64_IS_OFF_T - if (sizeof (int64) < 8) - rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); +#if SIZEOF_INT64 < 8 + rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); #endif + if (sizeof (int64) != SIZEOF_INT64) { + rprintf(f, + "WARNING: size mismatch in SIZEOF_INT64 define (%d != %d)\n", + (int) SIZEOF_INT64, (int) sizeof (int64)); + } rprintf(f, "\n" @@ -239,23 +250,23 @@ void usage(enum logcode F) rprintf(F," sources separated by space as long as they have same top-level\n"); rprintf(F,"\nOptions\n"); rprintf(F," -v, --verbose increase verbosity\n"); - rprintf(F," -q, --quiet decrease verbosity\n"); - rprintf(F," -c, --checksum always checksum\n"); - rprintf(F," -a, --archive archive mode, equivalent to -rlptgoD (no -H)\n"); + rprintf(F," -q, --quiet suppress non-error messages\n"); + rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n"); + rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H)\n"); rprintf(F," -r, --recursive recurse into directories\n"); rprintf(F," -R, --relative use relative path names\n"); rprintf(F," --no-relative turn off --relative\n"); rprintf(F," --no-implied-dirs don't send implied dirs with -R\n"); rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); - rprintf(F," --backup-dir make backups into this directory\n"); - rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); - rprintf(F," -u, --update update only (don't overwrite newer files)\n"); + rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n"); + rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); + rprintf(F," -u, --update skip files that are newer on the receiver\n"); rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n"); rprintf(F," -d, --dirs transfer directories without recursing\n"); rprintf(F," -l, --links copy symlinks as symlinks\n"); - rprintf(F," -L, --copy-links copy the referent of all symlinks\n"); - rprintf(F," --copy-unsafe-links copy the referent of \"unsafe\" symlinks\n"); - rprintf(F," --safe-links ignore \"unsafe\" symlinks\n"); + rprintf(F," -L, --copy-links transform symlink into referent file/dir\n"); + rprintf(F," --copy-unsafe-links only \"unsafe\" symlinks are transformed\n"); + rprintf(F," --safe-links ignore symlinks that point outside the source tree\n"); rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -p, --perms preserve permissions\n"); @@ -263,18 +274,22 @@ void usage(enum logcode F) rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); + rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); - rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); - rprintf(F," --no-whole-file turn off --whole-file\n"); + rprintf(F," -W, --whole-file copy files whole (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\n"); + rprintf(F," -e, --rsh=COMMAND specify the remote shell to use\n"); rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n"); - rprintf(F," --existing only update files that already exist\n"); + rprintf(F," --existing only update files that already exist on receiver\n"); rprintf(F," --ignore-existing ignore files that already exist on receiving side\n"); + rprintf(F," --del an alias for --delete-during\n"); rprintf(F," --delete delete files that don't exist on the sending side\n"); - rprintf(F," --delete-after receiver deletes after transferring, not before\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," --ignore-errors delete even if there are I/O errors\n"); rprintf(F," --force force deletion of directories even if not empty\n"); @@ -282,36 +297,42 @@ void usage(enum logcode F) rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n"); rprintf(F," --partial keep partially transferred files\n"); rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n"); + rprintf(F," --delay-updates put all updated files into place at transfer's end\n"); rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n"); rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); - rprintf(F," -I, --ignore-times turn off mod time & file size quick check\n"); - rprintf(F," --size-only ignore mod time for quick check (use size)\n"); - rprintf(F," --modify-window=NUM compare mod times with reduced accuracy\n"); + rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); + rprintf(F," --size-only skip files that match in size\n"); + rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); + rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); - rprintf(F," -P equivalent to --partial --progress\n"); - rprintf(F," -z, --compress compress file data\n"); - rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\n"); + rprintf(F," -z, --compress compress file data during the transfer\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," repeated: --filter='- .rsync-filter'\n"); rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n"); - rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n"); + rprintf(F," --exclude-from=FILE read exclude patterns from FILE\n"); rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n"); - rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n"); - rprintf(F," --files-from=FILE read FILE for list of source-file names\n"); + rprintf(F," --include-from=FILE read include patterns from FILE\n"); + rprintf(F," --files-from=FILE read list of source-file names from FILE\n"); rprintf(F," -0, --from0 all *-from file lists are delimited by nulls\n"); rprintf(F," --version print version number\n"); rprintf(F," --port=PORT specify double-colon alternate port number\n"); rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); - rprintf(F," --no-blocking-io turn off --blocking-io\n"); - rprintf(F," --stats give some file transfer stats\n"); + rprintf(F," --no-blocking-io turn off blocking I/O when it is the default\n"); + rprintf(F," --stats give some file-transfer stats\n"); rprintf(F," --progress show progress during transfer\n"); - rprintf(F," --log-format=FORMAT log file transfers using specified format\n"); - rprintf(F," --password-file=FILE get password from FILE\n"); + rprintf(F," -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," --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 batch to FILE\n"); - rprintf(F," --read-batch=FILE read a batch from FILE\n"); + rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n"); + rprintf(F," --write-batch=FILE write a batched update to FILE\n"); + rprintf(F," --read-batch=FILE read a batched update from FILE\n"); #ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -324,7 +345,7 @@ void usage(enum logcode F) } enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, - OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, + OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, OPT_REFUSED_BASE = 9000}; @@ -341,11 +362,15 @@ static struct poptOption long_options[] = { {"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 }, - {"delete", 0, POPT_ARG_NONE, &delete_before, 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-after", 0, POPT_ARG_NONE, &delete_after, 0, 0, 0 }, {"delete-excluded", 0, POPT_ARG_NONE, &delete_excluded, 0, 0, 0 }, {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 }, + {"filter", 'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 }, {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 }, {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 }, {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 }, @@ -364,12 +389,13 @@ static struct poptOption long_options[] = { {"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 }, + {"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 }, @@ -389,18 +415,22 @@ static struct poptOption long_options[] = { {"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 }, {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 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 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 }, @@ -429,10 +459,11 @@ static void daemon_usage(enum logcode F) rprintf(F,"\nUsage: rsync --daemon [OPTION]...\n"); rprintf(F," --address=ADDRESS bind to the specified address\n"); - rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); + rprintf(F," --bwlimit=KBPS limit I/O bandwidth; KBytes per second\n"); rprintf(F," --config=FILE specify alternate rsyncd.conf file\n"); rprintf(F," --no-detach do not detach from the parent\n"); - rprintf(F," --port=PORT specify alternate rsyncd port number\n"); + rprintf(F," --port=PORT listen on alternate port number\n"); + rprintf(F," -v, --verbose increase verbosity\n"); #ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); @@ -457,6 +488,7 @@ static struct poptOption long_daemon_options[] = { {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, + {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, {0,0,0,0, 0, 0, 0} }; @@ -499,9 +531,6 @@ static void set_refuse_options(char *bp) break; if ((cp = strchr(bp, ' ')) != NULL) *cp= '\0'; - /* If they specify "delete", reject all delete options. */ - if (strcmp(bp, "delete") == 0) - bp = "delete*"; is_wild = strpbrk(bp, "*?[") != NULL; found_match = 0; for (op = long_options; ; op++) { @@ -509,11 +538,33 @@ static void set_refuse_options(char *bp) if (!op->longName && !*shortname) break; if ((op->longName && wildmatch(bp, op->longName)) - || (*shortname && wildmatch(bp, shortname))) { + || (*shortname && wildmatch(bp, shortname)) + || op->val == OPT_DAEMON) { if (op->argInfo == POPT_ARG_VAL) op->argInfo = POPT_ARG_NONE; op->val = (op - long_options) + OPT_REFUSED_BASE; found_match = 1; + /* 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 '\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("partial", op->longName)) + refused_partial = op->val; + else if (wildmatch("progress", op->longName)) + refused_progress = op->val; + break; + } if (!is_wild) break; } @@ -543,6 +594,20 @@ static int count_args(const char **argv) } +static void create_refuse_error(int which) +{ + /* The "which" value is the index + OPT_REFUSED_BASE. */ + struct poptOption *op = &long_options[which - OPT_REFUSED_BASE]; + int n = snprintf(err_buf, sizeof err_buf, + "The server is configured to refuse --%s\n", + op->longName) - 1; + if (op->shortName) { + snprintf(err_buf + n, sizeof err_buf - n, + " (-%c)\n", op->shortName); + } +} + + /** * Process command line arguments. Called on both local and remote. * @@ -591,6 +656,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain) daemon_usage(FINFO); exit_cleanup(0); + case 'v': + verbose++; + break; + default: rprintf(FERROR, "rsync: %s: %s (in daemon mode)\n", @@ -619,13 +688,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) modify_window_set = 1; break; + case OPT_FILTER: + parse_rule(&filter_list, poptGetOptArg(pc), 0, 0); + break; + case OPT_EXCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), 0); + parse_rule(&filter_list, poptGetOptArg(pc), + 0, XFLG_OLD_PREFIXES); break; case OPT_INCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), - XFLG_DEF_INCLUDE); + parse_rule(&filter_list, poptGetOptArg(pc), + MATCHFLG_INCLUDE, XFLG_OLD_PREFIXES); break; case OPT_EXCLUDE_FROM: @@ -633,15 +707,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) arg = poptGetOptArg(pc); if (sanitize_paths) arg = sanitize_path(NULL, arg, NULL, 0); - if (server_exclude_list.head) { + if (server_filter_list.head) { char *cp = (char *)arg; + if (!*cp) + goto options_rejected; clean_fname(cp, 1); - if (check_exclude(&server_exclude_list, cp, 0) < 0) + if (check_filter(&server_filter_list, cp, 0) < 0) goto options_rejected; } - add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS - | (opt == OPT_INCLUDE_FROM - ? XFLG_DEF_INCLUDE : 0)); + parse_filter_file(&filter_list, arg, + opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0, + XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES); break; case 'h': @@ -665,7 +741,23 @@ int parse_arguments(int *argc, const char ***argv, int frommain) am_sender = 1; break; + case 'F': + switch (++F_option_cnt) { + case 1: + parse_rule(&filter_list,": /.rsync-filter",0,0); + break; + case 2: + parse_rule(&filter_list,"- .rsync-filter",0,0); + break; + } + break; + case 'P': + if (refused_partial || refused_progress) { + create_refuse_error(refused_partial + ? refused_partial : refused_progress); + return 0; + } do_progress = 1; keep_partial = 1; break; @@ -681,9 +773,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_MAX_SIZE: - for (arg = max_size_arg; isdigit(*arg); arg++) {} + for (arg = max_size_arg; isdigit(*(uchar*)arg); arg++) {} if (*arg == '.') - for (arg++; isdigit(*arg); arg++) {} + for (arg++; isdigit(*(uchar*)arg); arg++) {} switch (*arg) { case 'k': case 'K': max_size = atof(max_size_arg) * 1024; @@ -715,7 +807,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_LINK_DEST: -#if HAVE_LINK +#ifdef HAVE_LINK link_dest = 1; dest_option = "--link-dest"; goto set_dest_dir; @@ -749,28 +841,23 @@ int parse_arguments(int *argc, const char ***argv, int frommain) default: /* A large opt value means that set_refuse_options() - * turned this option off (opt-BASE is its index). */ + * turned this option off. */ if (opt >= OPT_REFUSED_BASE) { - struct poptOption *op = - &long_options[opt-OPT_REFUSED_BASE]; - int n = snprintf(err_buf, sizeof err_buf, - "The server is configured to refuse --%s\n", - op->longName) - 1; - if (op->shortName) { - snprintf(err_buf+n, sizeof err_buf-n, - " (-%c)\n", op->shortName); - } - } else { - snprintf(err_buf, sizeof err_buf, "%s%s: %s\n", - am_server ? "on remote machine: " : "", - poptBadOption(pc, POPT_BADOPTION_NOALIAS), - poptStrerror(opt)); + create_refuse_error(opt); + return 0; } + 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 (am_sender < 0) + am_sender = 0; + +#ifndef SUPPORT_LINKS if (preserve_links && !am_sender) { snprintf(err_buf, sizeof err_buf, "symlinks are not supported on this %s\n", @@ -779,7 +866,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } #endif -#if !SUPPORT_HARD_LINKS +#ifndef SUPPORT_HARD_LINKS if (preserve_hard_links) { snprintf(err_buf, sizeof err_buf, "hard links are not supported on this %s\n", @@ -836,9 +923,13 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } if (archive_mode) { + if (refused_archive_part) { + create_refuse_error(refused_archive_part); + return 0; + } if (!files_from) recurse = -1; /* infinite recursion */ -#if SUPPORT_LINKS +#ifdef SUPPORT_LINKS preserve_links = 1; #endif preserve_perms = 1; @@ -854,10 +945,28 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (relative_paths < 0) relative_paths = files_from? 1 : 0; - if (delete_before || delete_after) + if (!!delete_before + delete_during + delete_after > 1) { + snprintf(err_buf, sizeof err_buf, + "You may not combine multiple --delete-WHEN options.\n"); + return 0; + } + if (!recurse) { + delete_before = delete_during = delete_after = 0; + delete_mode = delete_excluded = 0; + } else if (delete_before || delete_during || delete_after) delete_mode = 1; - if (delete_excluded && !delete_mode) + else if (delete_mode || delete_excluded) { + if (refused_delete_before) { + create_refuse_error(refused_delete_before); + return 0; + } delete_mode = delete_before = 1; + } + + if (delete_mode && refused_delete) { + create_refuse_error(refused_delete); + return 0; + } *argv = poptGetArgs(pc); *argc = count_args(*argv); @@ -875,33 +984,41 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (files_from) files_from = sanitize_path(NULL, files_from, NULL, 0); } - if (server_exclude_list.head && !am_sender) { - struct exclude_list_struct *elp = &server_exclude_list; + if (server_filter_list.head && !am_sender) { + struct filter_list_struct *elp = &server_filter_list; int i; if (tmpdir) { + if (!*tmpdir) + goto options_rejected; clean_fname(tmpdir, 1); - if (check_exclude(elp, tmpdir, 1) < 0) + if (check_filter(elp, tmpdir, 1) < 0) goto options_rejected; } - if (partial_dir) { + if (partial_dir && *partial_dir) { clean_fname(partial_dir, 1); - if (check_exclude(elp, partial_dir, 1) < 0) + if (check_filter(elp, partial_dir, 1) < 0) goto options_rejected; } for (i = 0; i < basis_dir_cnt; i++) { + if (!*basis_dir[i]) + goto options_rejected; clean_fname(basis_dir[i], 1); - if (check_exclude(elp, basis_dir[i], 1) < 0) + if (check_filter(elp, basis_dir[i], 1) < 0) goto options_rejected; } if (backup_dir) { + if (!*backup_dir) + goto options_rejected; clean_fname(backup_dir, 1); - if (check_exclude(elp, backup_dir, 1) < 0) + if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } } - if (server_exclude_list.head && files_from) { + if (server_filter_list.head && files_from) { + if (!*files_from) + goto options_rejected; clean_fname(files_from, 1); - if (check_exclude(&server_exclude_list, files_from, 0) < 0) { + if (check_filter(&server_filter_list, files_from, 0) < 0) { options_rejected: snprintf(err_buf, sizeof err_buf, "Your options have been rejected by the server.\n"); @@ -930,16 +1047,23 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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); + if (verbose > 1 && !am_sender) { + rprintf(FINFO, "backup_dir is %s\n", + safe_fname(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; } - if (do_progress && !verbose) + if (do_progress && !verbose && !itemize_changes) { + if (refused_verbose) { + create_refuse_error(refused_verbose); + return 0; + } verbose = 1; + } if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit)) bwlimit = daemon_bwlimit; @@ -949,11 +1073,21 @@ int parse_arguments(int *argc, const char ***argv, int frommain) bwlimit_writemax = 512; } + if (delay_updates && !partial_dir) + partial_dir = partialdir_for_delayupdate; + if (inplace) { -#if HAVE_FTRUNCATE +#ifdef HAVE_FTRUNCATE if (partial_dir) { snprintf(err_buf, sizeof err_buf, - "--inplace cannot be used with --partial-dir\n"); + "--inplace cannot be used with --%s\n", + delay_updates ? "delay-updates" : "partial-dir"); + return 0; + } + /* --inplace implies --partial for refusal purposes, but we + * clear the keep_partial flag for internal logic purposes. */ + if (refused_partial) { + create_refuse_error(refused_partial); return 0; } keep_partial = 0; @@ -964,14 +1098,22 @@ int parse_arguments(int *argc, const char ***argv, int frommain) return 0; #endif } else { - if (keep_partial && !partial_dir) - partial_dir = getenv("RSYNC_PARTIAL_DIR"); + if (keep_partial && !partial_dir) { + if ((arg = getenv("RSYNC_PARTIAL_DIR")) != NULL && *arg) + partial_dir = strdup(arg); + } if (partial_dir) { + if (*partial_dir) + clean_fname(partial_dir, 1); if (!*partial_dir || strcmp(partial_dir, ".") == 0) partial_dir = NULL; else if (*partial_dir != '/') { - add_exclude(&exclude_list, partial_dir, - XFLG_DIRECTORY); + parse_rule(&filter_list, partial_dir, + MATCHFLG_NO_PREFIXES|MATCHFLG_DIRECTORY, 0); + } + if (!partial_dir && refused_partial) { + create_refuse_error(refused_partial); + return 0; } keep_partial = 1; } @@ -1062,7 +1204,7 @@ void server_options(char **args,int *argc) if (copy_links) argstr[x++] = 'L'; if (xfer_dirs > 1) - argstr[x++] = 'k'; + argstr[x++] = 'd'; if (keep_dirlinks && am_sender) argstr[x++] = 'K'; @@ -1072,6 +1214,8 @@ void server_options(char **args,int *argc) * default for remote transfers, and in any case old versions * of rsync will not understand it. */ + if (itemize_changes && am_sender) + argstr[x++] = 'i'; if (preserve_hard_links) argstr[x++] = 'H'; if (preserve_uid) @@ -1082,6 +1226,8 @@ void server_options(char **args,int *argc) argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; + if (omit_dir_times && am_sender) + argstr[x++] = 'O'; if (preserve_perms) argstr[x++] = 'p'; if (recurse < 0) @@ -1160,12 +1306,14 @@ void server_options(char **args,int *argc) if (am_sender) { if (delete_excluded) args[ac++] = "--delete-excluded"; - else if (delete_before || delete_after) + else if (delete_before == 1 || delete_after) args[ac++] = "--delete"; - + if (delete_before > 1) + args[ac++] = "--delete-before"; + if (delete_during) + args[ac++] = "--delete-during"; if (delete_after) args[ac++] = "--delete-after"; - if (force_delete) args[ac++] = "--force"; } @@ -1186,8 +1334,12 @@ void server_options(char **args,int *argc) } if (partial_dir && am_sender) { - args[ac++] = "--partial-dir"; - args[ac++] = partial_dir; + if (partial_dir != partialdir_for_delayupdate) { + args[ac++] = "--partial-dir"; + args[ac++] = partial_dir; + } + if (delay_updates) + args[ac++] = "--delay-updates"; } else if (keep_partial) args[ac++] = "--partial"; @@ -1245,6 +1397,9 @@ void server_options(char **args,int *argc) if (!implied_dirs && !am_sender) args[ac++] = "--no-implied-dirs"; + if (fuzzy_basis && am_sender) + args[ac++] = "--fuzzy"; + *argc = ac; return;