X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/28deecca55ff109d6eff7fc09bac7843559b7d5c..13791b1eebe97fb345553c5d4de41778064bcdb4:/options.c diff --git a/options.c b/options.c index 2c3515fb..3cee4ba3 100644 --- a/options.c +++ b/options.c @@ -23,8 +23,8 @@ extern int sanitize_paths; extern int select_timeout; -extern char curr_dir[MAXPATHLEN]; extern struct exclude_list_struct exclude_list; +extern struct exclude_list_struct server_exclude_list; int make_backups = 0; @@ -118,6 +118,7 @@ unsigned int backup_dir_remainder; char *backup_suffix = NULL; char *tmpdir = NULL; +char *partial_dir = NULL; char *compare_dest = NULL; char *config_file = NULL; char *shell_cmd = NULL; @@ -257,7 +258,7 @@ void usage(enum logcode F) rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); rprintf(F," --no-whole-file turn off --whole-file\n"); rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n"); - rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE); + 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," --rsync-path=PATH specify path to rsync on the remote machine\n"); rprintf(F," --existing only update files that already exist\n"); @@ -268,6 +269,7 @@ void usage(enum logcode F) rprintf(F," --ignore-errors delete even if there are I/O errors\n"); rprintf(F," --max-delete=NUM don't delete more than NUM files\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"); @@ -383,6 +385,7 @@ static struct poptOption long_options[] = { {"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 }, {"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 }, @@ -435,23 +438,38 @@ void option_error(void) static void set_refuse_options(char *bp) { struct poptOption *op; - char *cp; + char *cp, shortname[2]; + int is_wild, found_match; + + shortname[1] = '\0'; while (1) { + while (*bp == ' ') bp++; + if (!*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++) { - if (!op->longName) { - rprintf(FLOG, - "Unknown option %s in \"refuse options\" setting\n", - bp); - break; - } - if (strcmp(bp, op->longName) == 0) { - op->val = (op - long_options)+OPT_REFUSED_BASE; + *shortname = op->shortName; + if (!op->longName && !*shortname) break; + if ((op->longName && wildmatch(bp, op->longName)) + || (*shortname && wildmatch(bp, shortname))) { + op->val = (op - long_options) + OPT_REFUSED_BASE; + found_match = 1; + if (!is_wild) + break; } } + if (!found_match) { + rprintf(FLOG, "No match for refuse-options string \"%s\"\n", + bp); + } if (!cp) break; *cp = ' '; @@ -522,32 +540,28 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_EXCLUDE: - if (am_server || sanitize_paths) - return 0; /* Impossible... */ add_exclude(&exclude_list, poptGetOptArg(pc), 0); break; case OPT_INCLUDE: - if (am_server || sanitize_paths) - return 0; /* Impossible... */ add_exclude(&exclude_list, poptGetOptArg(pc), XFLG_DEF_INCLUDE); break; case OPT_EXCLUDE_FROM: - if (am_server || sanitize_paths) - return 0; /* Impossible... */ - arg = poptGetOptArg(pc); - add_exclude_file(&exclude_list, arg, - XFLG_FATAL_ERRORS); - break; - case OPT_INCLUDE_FROM: - if (am_server || sanitize_paths) - return 0; /* Impossible... */ arg = poptGetOptArg(pc); - add_exclude_file(&exclude_list, arg, - XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE); + if (sanitize_paths) + arg = sanitize_path(NULL, arg, NULL, 0); + if (server_exclude_list.head) { + char *cp = (char *)arg; + clean_fname(cp, 1); + if (check_exclude(&server_exclude_list, cp, 0) < 0) + goto options_rejected; + } + add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS + | (opt == OPT_INCLUDE_FROM + ? XFLG_DEF_INCLUDE : 0)); break; case 'h': @@ -644,23 +658,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } #endif - if (block_size > MAX_MAP_SIZE) { - rprintf(FINFO, "limiting block-size to %d bytes\n", - MAX_MAP_SIZE); - block_size = MAX_MAP_SIZE; - } - if (write_batch && read_batch) { - rprintf(FERROR, + snprintf(err_buf, sizeof err_buf, "--write-batch and --read-batch can not be used together\n"); - exit_cleanup(RERR_SYNTAX); + return 0; } if (write_batch || read_batch) { if (dry_run) { - rprintf(FERROR, + snprintf(err_buf, sizeof err_buf, "--%s-batch cannot be used with --dry_run (-n)\n", write_batch ? "write" : "read"); - exit_cleanup(RERR_SYNTAX); + return 0; } if (am_server) { rprintf(FINFO, @@ -674,20 +682,21 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } if (read_batch && files_from) { - rprintf(FERROR, + snprintf(err_buf, sizeof err_buf, "--read-batch cannot be used with --files-from\n"); - exit_cleanup(RERR_SYNTAX); + return 0; } if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) { - rprintf(FERROR, + snprintf(err_buf, sizeof err_buf, "the batch-file name must be %d characters or less.\n", MAX_BATCH_NAME_LEN); - exit_cleanup(RERR_SYNTAX); + return 0; } if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) { - rprintf(FERROR, "the --temp-dir path is WAY too long.\n"); - exit_cleanup(RERR_SYNTAX); + snprintf(err_buf, sizeof err_buf, + "the --temp-dir path is WAY too long.\n"); + return 0; } if (archive_mode) { @@ -715,15 +724,49 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (sanitize_paths) { int i; for (i = *argc; i-- > 0; ) - (*argv)[i] = alloc_sanitize_path((*argv)[i], NULL); + (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0); if (tmpdir) - tmpdir = alloc_sanitize_path(tmpdir, curr_dir); + tmpdir = sanitize_path(NULL, tmpdir, NULL, 0); + if (partial_dir) + partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); if (compare_dest) - compare_dest = alloc_sanitize_path(compare_dest, curr_dir); + compare_dest = sanitize_path(NULL, compare_dest, NULL, 0); if (backup_dir) - backup_dir = alloc_sanitize_path(backup_dir, curr_dir); + backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); if (files_from) - files_from = alloc_sanitize_path(files_from, curr_dir); + 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 (tmpdir) { + clean_fname(tmpdir, 1); + if (check_exclude(elp, tmpdir, 1) < 0) + goto options_rejected; + } + if (partial_dir) { + clean_fname(partial_dir, 1); + if (check_exclude(elp, partial_dir, 1) < 0) + goto options_rejected; + } + if (compare_dest) { + clean_fname(compare_dest, 1); + if (check_exclude(elp, compare_dest, 1) < 0) + goto options_rejected; + } + if (backup_dir) { + clean_fname(backup_dir, 1); + if (check_exclude(elp, backup_dir, 1) < 0) + goto options_rejected; + } + } + if (server_exclude_list.head && files_from) { + clean_fname(files_from, 1); + if (check_exclude(&server_exclude_list, files_from, 0) < 0) { + options_rejected: + snprintf(err_buf, sizeof err_buf, + "Your options have been rejected by the server.\n"); + return 0; + } } if (daemon_opt) { @@ -736,16 +779,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) backup_suffix = backup_dir ? "" : BACKUP_SUFFIX; backup_suffix_len = strlen(backup_suffix); if (strchr(backup_suffix, '/') != NULL) { - rprintf(FERROR, "--suffix cannot contain slashes: %s\n", + snprintf(err_buf, sizeof err_buf, + "--suffix cannot contain slashes: %s\n", backup_suffix); - exit_cleanup(RERR_SYNTAX); + return 0; } if (backup_dir) { backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf); backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len; if (backup_dir_remainder < 32) { - rprintf(FERROR, "the --backup-dir path is WAY too long.\n"); - exit_cleanup(RERR_SYNTAX); + snprintf(err_buf, sizeof err_buf, + "the --backup-dir path is WAY too long.\n"); + return 0; } if (backup_dir_buf[backup_dir_len - 1] != '/') { backup_dir_buf[backup_dir_len++] = '/'; @@ -754,9 +799,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (verbose > 1 && !am_sender) rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf); } else if (!backup_suffix_len && (!am_server || !am_sender)) { - rprintf(FERROR, + snprintf(err_buf, sizeof err_buf, "--suffix cannot be a null string without --backup-dir\n"); - exit_cleanup(RERR_SYNTAX); + return 0; } if (do_progress && !verbose) @@ -770,6 +815,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (inplace) { #if HAVE_FTRUNCATE + if (partial_dir) { + snprintf(err_buf, sizeof err_buf, + "--inplace cannot be used with --partial-dir\n"); + return 0; + } keep_partial = 0; #else snprintf(err_buf, sizeof err_buf, @@ -777,11 +827,29 @@ int parse_arguments(int *argc, const char ***argv, int frommain) am_server ? "server" : "client"); return 0; #endif + if (compare_dest) { + snprintf(err_buf, sizeof err_buf, + "--inplace does not yet work with %s\n", + link_dest ? "--link-dest" : "--compare-dest"); + return 0; + } + } else { + if (keep_partial && !partial_dir) + partial_dir = getenv("RSYNC_PARTIAL_DIR"); + if (partial_dir) { + if (!*partial_dir || strcmp(partial_dir, ".") == 0) + partial_dir = NULL; + else if (*partial_dir != '/') { + add_exclude(&exclude_list, partial_dir, + XFLG_DIRECTORY); + } + keep_partial = 1; + } } if (files_from) { char *colon; - if (*argc != 2 && !(am_server && am_sender && *argc == 1)) { + if (*argc > 2 || (!am_daemon && *argc == 1)) { usage(FERROR); exit_cleanup(RERR_SYNTAX); } @@ -797,16 +865,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } remote_filesfrom_file = colon+1 + (colon[1] == ':'); if (strcmp(remote_filesfrom_file, "-") == 0) { - rprintf(FERROR, "Invalid --files-from remote filename\n"); - exit_cleanup(RERR_SYNTAX); + snprintf(err_buf, sizeof err_buf, + "Invalid --files-from remote filename\n"); + return 0; } } else { filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); if (filesfrom_fd < 0) { - rsyserr(FERROR, errno, - "failed to open files-from file %s", - files_from); - exit_cleanup(RERR_FILEIO); + snprintf(err_buf, sizeof err_buf, + "failed to open files-from file %s: %s\n", + files_from, strerror(errno)); + return 0; } } } @@ -949,10 +1018,18 @@ void server_options(char **args,int *argc) args[ac++] = arg; } - if (delete_excluded) - args[ac++] = "--delete-excluded"; - else if (delete_mode) - args[ac++] = "--delete"; + if (am_sender) { + if (delete_excluded) + args[ac++] = "--delete-excluded"; + else if (delete_mode) + args[ac++] = "--delete"; + + if (delete_after) + args[ac++] = "--delete-after"; + + if (force_delete) + args[ac++] = "--force"; + } if (size_only) args[ac++] = "--size-only"; @@ -969,15 +1046,12 @@ void server_options(char **args,int *argc) args[ac++] = arg; } - if (keep_partial) + if (partial_dir && am_sender) { + args[ac++] = "--partial-dir"; + args[ac++] = partial_dir; + } else if (keep_partial) args[ac++] = "--partial"; - if (force_delete) - args[ac++] = "--force"; - - if (delete_after) - args[ac++] = "--delete-after"; - if (ignore_errors) args[ac++] = "--ignore-errors";