X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/aa4d3b4cc0b0a6f917cfa13db5943c9ac7abd309..7842418b7b87c4c78ad8ad06fec44150c8aa0956:/options.c diff --git a/options.c b/options.c index c9a4608f..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; @@ -277,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"); @@ -349,8 +350,8 @@ 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 }, @@ -578,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) { @@ -632,17 +643,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_FILTER: - add_exclude(&exclude_list, poptGetOptArg(pc), 0); + add_filter(&filter_list, poptGetOptArg(pc), 0); break; case OPT_EXCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), - XFLG_DEF_EXCLUDE); + 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: @@ -650,13 +661,13 @@ 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 + add_filter_file(&filter_list, arg, XFLG_FATAL_ERRORS | (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE : XFLG_DEF_EXCLUDE)); break; @@ -685,11 +696,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain) case 'F': switch (++F_option_cnt) { case 1: - add_exclude(&exclude_list, + add_filter(&filter_list, ": /.rsync-filter", 0); break; case 2: - add_exclude(&exclude_list, + add_filter(&filter_list, "- .rsync-filter", 0); break; } @@ -884,10 +895,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); @@ -905,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"); @@ -1000,7 +1016,7 @@ 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, + add_filter(&filter_list, partial_dir, XFLG_DIRECTORY | XFLG_DEF_EXCLUDE); } keep_partial = 1; @@ -1192,14 +1208,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"; }