X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/78fc60cd29eac3007f5fb02f4e963d3729879a5f..e76518843d2c0ca595333de6a689afcea7448d94:/options.c diff --git a/options.c b/options.c index 944bb249..9b260d4e 100644 --- a/options.c +++ b/options.c @@ -53,7 +53,6 @@ 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; @@ -72,7 +71,7 @@ int numeric_ids = 0; int force_delete = 0; int io_timeout = 0; int am_server = 0; -int am_sender = 0; +int am_sender = -1; int am_generator = 0; char *files_from = NULL; int filesfrom_fd = -1; @@ -90,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; @@ -105,7 +105,7 @@ long block_size = 0; /* "long" because popt can't set an int32. */ /** Network address family. **/ -#if INET6 +#ifdef INET6 int default_af_hint = 0; /* Any protocol */ #else int default_af_hint = AF_INET; /* Must use IPv4 */ @@ -141,6 +141,8 @@ int basis_dir_cnt = 0; int verbose = 0; int quiet = 0; +int itemize_changes = 0; +int log_before_transfer = 0; int always_checksum = 0; int list_only = 0; @@ -150,8 +152,11 @@ 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 @@ -168,23 +173,23 @@ static void print_rsync_version(enum logcode f) char const *ipv6 = "no "; STRUCT_STAT *dumstat; -#if HAVE_SOCKETPAIR +#ifdef HAVE_SOCKETPAIR 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 @@ -273,7 +278,7 @@ void usage(enum logcode F) 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 files whole\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"); @@ -300,13 +305,14 @@ void usage(enum logcode F) 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," -z, --compress compress file data\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=': /.rsync-filter'\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 read exclude patterns from FILE\n"); @@ -321,13 +327,14 @@ void usage(enum logcode F) rprintf(F," --stats give some file-transfer stats\n"); rprintf(F," --progress show progress during transfer\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 batched update to FILE\n"); rprintf(F," --read-batch=FILE read a batched update from FILE\n"); -#if INET6 +#ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -356,6 +363,7 @@ 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 }, + {"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 }, @@ -382,7 +390,7 @@ 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 }, @@ -408,6 +416,7 @@ 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 }, @@ -422,6 +431,7 @@ static struct poptOption long_options[] = { {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 }, @@ -432,7 +442,7 @@ static struct poptOption long_options[] = { {"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 }, -#if INET6 +#ifdef INET6 {"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 @@ -455,7 +465,7 @@ static void daemon_usage(enum logcode F) rprintf(F," --no-detach do not detach from the parent\n"); rprintf(F," --port=PORT listen on alternate port number\n"); rprintf(F," -v, --verbose increase verbosity\n"); -#if INET6 +#ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif @@ -471,7 +481,7 @@ static struct poptOption long_daemon_options[] = { {"bwlimit", 0, POPT_ARG_INT, &daemon_bwlimit, 0, 0, 0 }, {"config", 0, POPT_ARG_STRING, &config_file, 0, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 }, -#if INET6 +#ifdef INET6 {"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 @@ -522,9 +532,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++) { @@ -532,11 +539,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; } @@ -566,6 +595,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. * @@ -589,16 +632,6 @@ 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) { @@ -657,17 +690,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_FILTER: - add_filter(&filter_list, poptGetOptArg(pc), 0); + parse_rule(&filter_list, poptGetOptArg(pc), 0, 0); break; case OPT_EXCLUDE: - add_filter(&filter_list, poptGetOptArg(pc), - XFLG_DEF_EXCLUDE); + parse_rule(&filter_list, poptGetOptArg(pc), + 0, XFLG_OLD_PREFIXES); break; case OPT_INCLUDE: - add_filter(&filter_list, poptGetOptArg(pc), - XFLG_DEF_INCLUDE); + parse_rule(&filter_list, poptGetOptArg(pc), + MATCHFLG_INCLUDE, XFLG_OLD_PREFIXES); break; case OPT_EXCLUDE_FROM: @@ -677,13 +710,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain) arg = sanitize_path(NULL, arg, NULL, 0); if (server_filter_list.head) { char *cp = (char *)arg; + if (!*cp) + goto options_rejected; clean_fname(cp, 1); if (check_filter(&server_filter_list, cp, 0) < 0) goto options_rejected; } - add_filter_file(&filter_list, arg, XFLG_FATAL_ERRORS - | (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE - : XFLG_DEF_EXCLUDE)); + parse_filter_file(&filter_list, arg, + opt == OPT_INCLUDE_FROM ? MATCHFLG_INCLUDE : 0, + XFLG_FATAL_ERRORS | XFLG_OLD_PREFIXES); break; case 'h': @@ -710,17 +745,20 @@ int parse_arguments(int *argc, const char ***argv, int frommain) case 'F': switch (++F_option_cnt) { case 1: - add_filter(&filter_list, - ": /.rsync-filter", 0); + parse_rule(&filter_list,": /.rsync-filter",0,0); break; case 2: - add_filter(&filter_list, - "- .rsync-filter", 0); + 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; @@ -770,7 +808,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; @@ -804,28 +842,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", @@ -834,7 +867,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", @@ -891,9 +924,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; @@ -919,8 +956,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) delete_mode = delete_excluded = 0; } else if (delete_before || delete_during || delete_after) delete_mode = 1; - else if (delete_mode || delete_excluded) + 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); @@ -942,27 +989,35 @@ int parse_arguments(int *argc, const char ***argv, int frommain) struct filter_list_struct *elp = &server_filter_list; int i; if (tmpdir) { + if (!*tmpdir) + goto options_rejected; clean_fname(tmpdir, 1); 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_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_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_filter(elp, backup_dir, 1) < 0) goto options_rejected; } } if (server_filter_list.head && files_from) { + if (!*files_from) + goto options_rejected; clean_fname(files_from, 1); if (check_filter(&server_filter_list, files_from, 0) < 0) { options_rejected: @@ -993,16 +1048,33 @@ 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 (log_format) { + if (strstr(log_format, "%i") != NULL) + itemize_changes = 1; + if (strstr(log_format, "%b") == NULL + && strstr(log_format, "%c") == NULL) + log_before_transfer = !am_server; + } else if (itemize_changes) { + log_format = "%i %n%L"; + log_before_transfer = !am_server; + } + if (do_progress && !verbose && !log_before_transfer) { + if (refused_verbose) { + create_refuse_error(refused_verbose); + return 0; + } verbose = 1; + } if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit)) bwlimit = daemon_bwlimit; @@ -1013,16 +1085,22 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } if (delay_updates && !partial_dir) - partial_dir = ".~tmp~"; + 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 --%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; #else snprintf(err_buf, sizeof err_buf, @@ -1031,14 +1109,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_filter(&filter_list, partial_dir, - XFLG_DIRECTORY | XFLG_DEF_EXCLUDE); + 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; } @@ -1139,6 +1225,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) + argstr[x++] = 'i'; if (preserve_hard_links) argstr[x++] = 'H'; if (preserve_uid) @@ -1257,8 +1345,10 @@ 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) @@ -1318,6 +1408,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;