X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a51b316824e0b955f827026310262c0af4ec32c5..031fa9ad4d17da5759bade845985e24ef2d14c98:/options.c diff --git a/options.c b/options.c index fd7c9783..5ab7b7f5 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; @@ -101,6 +101,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. */ @@ -148,6 +149,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; @@ -190,7 +192,7 @@ static void print_rsync_version(enum logcode f) 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", @@ -209,9 +211,8 @@ 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 rprintf(f, @@ -276,9 +277,10 @@ 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-before receiver deletes before transfer, not during\n"); - rprintf(F," --delete-after receiver deletes after transfer, not during\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"); @@ -286,6 +288,7 @@ 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 update all transferred files into place at 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"); @@ -298,6 +301,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"); @@ -328,7 +334,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}; @@ -345,12 +351,13 @@ 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_during, 0, 0, 0 }, - {"delete-before", 0, POPT_ARG_NONE, &delete_before, 0, 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 }, @@ -401,9 +408,11 @@ static struct poptOption long_options[] = { {"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 }, @@ -572,6 +581,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) { @@ -625,13 +644,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) modify_window_set = 1; break; + 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: @@ -639,15 +663,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': @@ -671,6 +695,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; @@ -860,10 +897,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (relative_paths < 0) relative_paths = files_from? 1 : 0; - if (delete_during || delete_before || delete_after) + 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; - if (delete_excluded && !delete_mode) - delete_mode = delete_during = 1; + else if (delete_mode || delete_excluded) + delete_mode = delete_before = 1; *argv = poptGetArgs(pc); *argc = count_args(*argv); @@ -881,33 +923,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"); @@ -955,11 +997,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain) bwlimit_writemax = 512; } + if (delay_updates && !partial_dir) + partial_dir = ".~tmp~"; + if (inplace) { #if 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; } keep_partial = 0; @@ -976,8 +1022,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; } @@ -1168,14 +1214,12 @@ void server_options(char **args,int *argc) if (am_sender) { if (delete_excluded) args[ac++] = "--delete-excluded"; - else if (delete_before) - args[ac++] = "--delete-before"; - else if (delete_during || delete_after) + 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"; } @@ -1198,6 +1242,8 @@ void server_options(char **args,int *argc) if (partial_dir && am_sender) { args[ac++] = "--partial-dir"; args[ac++] = partial_dir; + if (delay_updates) + args[ac++] = "--delay-updates"; } else if (keep_partial) args[ac++] = "--partial";