X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3a90ea0acdc1414904959e4629c9c255be792e29..7842418b7b87c4c78ad8ad06fec44150c8aa0956:/options.c diff --git a/options.c b/options.c index a05b7587..3082e5c0 100644 --- a/options.c +++ b/options.c @@ -23,8 +23,8 @@ 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 +48,16 @@ int preserve_devices = 0; int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; +int omit_dir_times = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; int local_server = 0; int ignore_times = 0; int delete_mode = 0; +int delete_during = 0; +int delete_before = 0; +int delete_after = 0; int delete_excluded = 0; int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; @@ -76,7 +80,7 @@ int filesfrom_fd = -1; char *remote_filesfrom_file = NULL; int eol_nulls = 0; int recurse = 0; -int keep_dirs = 0; +int xfer_dirs = 0; int am_daemon = 0; int daemon_over_rsh = 0; int do_stats = 0; @@ -88,7 +92,6 @@ int size_only = 0; int daemon_bwlimit = 0; int bwlimit = 0; size_t bwlimit_writemax = 0; -int delete_after = 0; int only_existing = 0; int opt_ignore_existing = 0; int max_delete = 0; @@ -145,6 +148,7 @@ int list_only = 0; char *batch_name = NULL; static int daemon_opt; /* sets am_daemon after option error-reporting */ +static int F_option_cnt = 0; static int modify_window_set; static char *dest_option = NULL; static char *max_size_arg; @@ -200,7 +204,7 @@ static void print_rsync_version(enum logcode f) rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n", have_inplace, ipv6, (int) (sizeof dumstat->st_ino * 8), - (int) (sizeof (uint64) * 8)); + (int) (sizeof (int64) * 8)); #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); @@ -250,17 +254,19 @@ void usage(enum logcode F) rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); rprintf(F," -u, --update update only (don't overwrite newer files)\n"); rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n"); - rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\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," -H, --hard-links preserve hard links\n"); + rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -p, --perms preserve permissions\n"); rprintf(F," -o, --owner preserve owner (root only)\n"); rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); + rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); @@ -271,15 +277,17 @@ void usage(enum logcode F) 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," --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-during receiver deletes during transfer, not before\n"); + rprintf(F," --delete-after receiver deletes after transfer, not before\n"); rprintf(F," --delete-excluded also delete excluded files on the receiving side\n"); - rprintf(F," --delete-after receiver deletes after transferring, not before\n"); rprintf(F," --ignore-errors delete even if there are I/O errors\n"); + rprintf(F," --force force deletion of directories even if not empty\n"); rprintf(F," --max-delete=NUM don't delete more than NUM files\n"); rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n"); rprintf(F," --partial keep partially transferred files\n"); rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n"); - rprintf(F," --force force deletion of directories even if not empty\n"); rprintf(F," --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"); @@ -292,6 +300,9 @@ void usage(enum logcode F) 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," -f, --filter=RULE add a file-filtering RULE\n"); + rprintf(F," -F same as --filter=': /.rsync-filter'\n"); + rprintf(F," repeated: --filter='- .rsync-filter'\n"); rprintf(F," --exclude=PATTERN exclude files matching PATTERN\n"); rprintf(F," --exclude-from=FILE exclude patterns listed in FILE\n"); rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n"); @@ -306,6 +317,7 @@ void usage(enum logcode F) 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," --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"); @@ -321,8 +333,7 @@ void usage(enum logcode F) } enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, - OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, - OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, + OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE, OPT_REFUSED_BASE = 9000}; @@ -337,13 +348,15 @@ static struct poptOption long_options[] = { {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, - {"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 }, - {"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 }, - {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 }, + {"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 }, + {"delete-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 }, @@ -356,9 +369,10 @@ static struct poptOption long_options[] = { {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 }, - {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 }, + {"dirs", 'd', POPT_ARG_VAL, &xfer_dirs, 2, 0, 0 }, {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, ©_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 }, @@ -367,13 +381,15 @@ static struct poptOption long_options[] = { {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 }, {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 }, {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 }, + {"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 }, {"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 }, {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, {"archive", 'a', POPT_ARG_NONE, &archive_mode, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, - {"recursive", 'r', POPT_ARG_NONE, &recurse, 0, 0, 0 }, + {"recursive", 'r', POPT_ARG_VAL, &recurse, -1, 0, 0 }, + {"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 }, {"relative", 'R', POPT_ARG_VAL, &relative_paths, 1, 0, 0 }, {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 }, {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, @@ -394,6 +410,7 @@ static struct poptOption long_options[] = { {"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 }, @@ -506,6 +523,8 @@ static void set_refuse_options(char *bp) break; if ((op->longName && wildmatch(bp, op->longName)) || (*shortname && wildmatch(bp, shortname))) { + if (op->argInfo == POPT_ARG_VAL) + op->argInfo = POPT_ARG_NONE; op->val = (op - long_options) + OPT_REFUSED_BASE; found_match = 1; if (!is_wild) @@ -560,6 +579,16 @@ int parse_arguments(int *argc, const char ***argv, int frommain) /* The context leaks in case of an error, but if there's a * problem we always exit anyhow. */ pc = poptGetContext(RSYNC_NAME, *argc, *argv, long_options, 0); + { + struct poptAlias my_alias; + char **argv = new_array(char *, 1); + argv[0] = strdup("--delete-during"); + my_alias.longName = "del", my_alias.shortName = '\0'; + my_alias.argc = 1; + my_alias.argv = (const char **)argv; + if (argv && argv[0]) + poptAddAlias(pc, my_alias, 0); + } poptReadDefaultConfig(pc, 0); while ((opt = poptGetNextOpt(pc)) != -1) { @@ -613,23 +642,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) modify_window_set = 1; break; - case OPT_DELETE_AFTER: - delete_after = 1; - delete_mode = 1; - break; - - case OPT_DELETE_EXCLUDED: - delete_excluded = 1; - delete_mode = 1; + case OPT_FILTER: + add_filter(&filter_list, poptGetOptArg(pc), 0); break; case OPT_EXCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), 0); + add_filter(&filter_list, poptGetOptArg(pc), + XFLG_DEF_EXCLUDE); break; case OPT_INCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), - XFLG_DEF_INCLUDE); + add_filter(&filter_list, poptGetOptArg(pc), + XFLG_DEF_INCLUDE); break; case OPT_EXCLUDE_FROM: @@ -637,15 +661,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain) arg = poptGetOptArg(pc); if (sanitize_paths) arg = sanitize_path(NULL, arg, NULL, 0); - if (server_exclude_list.head) { + if (server_filter_list.head) { char *cp = (char *)arg; clean_fname(cp, 1); - if (check_exclude(&server_exclude_list, cp, 0) < 0) + if (check_filter(&server_filter_list, cp, 0) < 0) goto options_rejected; } - add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS - | (opt == OPT_INCLUDE_FROM - ? XFLG_DEF_INCLUDE : 0)); + add_filter_file(&filter_list, arg, XFLG_FATAL_ERRORS + | (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE + : XFLG_DEF_EXCLUDE)); break; case 'h': @@ -669,6 +693,19 @@ int parse_arguments(int *argc, const char ***argv, int frommain) am_sender = 1; break; + case 'F': + switch (++F_option_cnt) { + case 1: + add_filter(&filter_list, + ": /.rsync-filter", 0); + break; + case 2: + add_filter(&filter_list, + "- .rsync-filter", 0); + break; + } + break; + case 'P': do_progress = 1; keep_partial = 1; @@ -841,7 +878,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (archive_mode) { if (!files_from) - recurse = 1; + recurse = -1; /* infinite recursion */ #if SUPPORT_LINKS preserve_links = 1; #endif @@ -851,14 +888,22 @@ int parse_arguments(int *argc, const char ***argv, int frommain) preserve_uid = 1; preserve_devices = 1; } - if (recurse) { - keep_dirs = 1; - } + + if (recurse || list_only || files_from) + xfer_dirs |= 1; if (relative_paths < 0) relative_paths = files_from? 1 : 0; - if (!relative_paths) - implied_dirs = 0; + + if (delete_during && delete_after) { + snprintf(err_buf, sizeof err_buf, + "You may not combine --delete-during (--del) and --delete-after.\n"); + return 0; + } + if (delete_during || delete_after) + delete_mode = 1; + else if (delete_mode || delete_excluded) + delete_mode = delete_before = 1; *argv = poptGetArgs(pc); *argc = count_args(*argv); @@ -876,33 +921,33 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (files_from) files_from = sanitize_path(NULL, files_from, NULL, 0); } - if (server_exclude_list.head && !am_sender) { - struct exclude_list_struct *elp = &server_exclude_list; + if (server_filter_list.head && !am_sender) { + struct filter_list_struct *elp = &server_filter_list; int i; if (tmpdir) { clean_fname(tmpdir, 1); - if (check_exclude(elp, tmpdir, 1) < 0) + if (check_filter(elp, tmpdir, 1) < 0) goto options_rejected; } if (partial_dir) { clean_fname(partial_dir, 1); - if (check_exclude(elp, partial_dir, 1) < 0) + if (check_filter(elp, partial_dir, 1) < 0) goto options_rejected; } for (i = 0; i < basis_dir_cnt; i++) { clean_fname(basis_dir[i], 1); - if (check_exclude(elp, basis_dir[i], 1) < 0) + if (check_filter(elp, basis_dir[i], 1) < 0) goto options_rejected; } if (backup_dir) { clean_fname(backup_dir, 1); - if (check_exclude(elp, backup_dir, 1) < 0) + if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } } - if (server_exclude_list.head && files_from) { + if (server_filter_list.head && files_from) { clean_fname(files_from, 1); - if (check_exclude(&server_exclude_list, files_from, 0) < 0) { + if (check_filter(&server_filter_list, files_from, 0) < 0) { options_rejected: snprintf(err_buf, sizeof err_buf, "Your options have been rejected by the server.\n"); @@ -971,8 +1016,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (!*partial_dir || strcmp(partial_dir, ".") == 0) partial_dir = NULL; else if (*partial_dir != '/') { - add_exclude(&exclude_list, partial_dir, - XFLG_DIRECTORY); + add_filter(&filter_list, partial_dir, + XFLG_DIRECTORY | XFLG_DEF_EXCLUDE); } keep_partial = 1; } @@ -1009,7 +1054,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) return 0; } } - keep_dirs = 1; } return 1; @@ -1063,6 +1107,8 @@ void server_options(char **args,int *argc) argstr[x++] = 'l'; if (copy_links) argstr[x++] = 'L'; + if (xfer_dirs > 1) + argstr[x++] = 'k'; if (keep_dirlinks && am_sender) argstr[x++] = 'K'; @@ -1082,9 +1128,11 @@ void server_options(char **args,int *argc) argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; + if (omit_dir_times && am_sender) + argstr[x++] = 'O'; if (preserve_perms) argstr[x++] = 'p'; - if (recurse) + if (recurse < 0) argstr[x++] = 'r'; if (always_checksum) argstr[x++] = 'c'; @@ -1101,11 +1149,10 @@ void server_options(char **args,int *argc) if (do_compression) argstr[x++] = 'z'; - /* this is a complete hack - blame Rusty - - this is a hack to make the list_only (remote file list) - more useful */ - if (list_only && !recurse) + /* This is a complete hack - blame Rusty. FIXME! + * This hack is only needed for older rsync versions that + * don't understand the --list-only option. */ + if (list_only == 1 && recurse >= 0) argstr[x++] = 'r'; argstr[x] = 0; @@ -1113,6 +1160,9 @@ void server_options(char **args,int *argc) if (x != 1) args[ac++] = argstr; + if (list_only > 1) + args[ac++] = "--list-only"; + if (block_size) { if (asprintf(&arg, "-B%lu", block_size) < 0) goto oom; @@ -1158,12 +1208,12 @@ void server_options(char **args,int *argc) if (am_sender) { if (delete_excluded) args[ac++] = "--delete-excluded"; - else if (delete_mode) + else if (delete_before || delete_after) args[ac++] = "--delete"; - + if (delete_during) + args[ac++] = "--delete-during"; if (delete_after) args[ac++] = "--delete-after"; - if (force_delete) args[ac++] = "--force"; } @@ -1240,7 +1290,7 @@ void server_options(char **args,int *argc) if (!relative_paths) args[ac++] = "--no-relative"; } - if (relative_paths && !implied_dirs && !am_sender) + if (!implied_dirs && !am_sender) args[ac++] = "--no-implied-dirs"; *argc = ac;