X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2289bf64cc7461a282e064f1717d4906e28c2903..b9f592fbf50b0dc9e3d1d33b8deb2bf9abad9ef6:/options.c diff --git a/options.c b/options.c index 5db7d62c..d11e6419 100644 --- a/options.c +++ b/options.c @@ -21,7 +21,10 @@ #include "rsync.h" #include "popt.h" -extern struct exclude_struct **exclude_list; +extern int sanitize_paths; +extern int select_timeout; +extern char curr_dir[MAXPATHLEN]; +extern struct exclude_list_struct exclude_list; int make_backups = 0; @@ -36,6 +39,7 @@ int make_backups = 0; int whole_file = -1; int archive_mode = 0; +int keep_dirlinks = 0; int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; @@ -81,6 +85,7 @@ int safe_symlinks = 0; int copy_unsafe_links = 0; int size_only = 0; int bwlimit = 0; +size_t bwlimit_writemax = 0; int delete_after = 0; int only_existing = 0; int opt_ignore_existing = 0; @@ -108,6 +113,7 @@ int write_batch = 0; int read_batch = 0; int backup_dir_len = 0; int backup_suffix_len; +unsigned int backup_dir_remainder; char *backup_suffix = NULL; char *tmpdir = NULL; @@ -118,6 +124,7 @@ char *log_format = NULL; char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; +char backup_dir_buf[MAXPATHLEN]; int rsync_port = RSYNC_PORT; int link_dest = 0; @@ -126,7 +133,6 @@ int quiet = 0; int always_checksum = 0; int list_only = 0; -#define FIXED_CHECKSUM_SEED 32761 #define MAX_BATCH_PREFIX_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_prefix = NULL; @@ -134,7 +140,7 @@ static int daemon_opt; /* sets am_daemon after option error-reporting */ static int modify_window_set; /** Local address to bind. As a character string because it's - * interpreted by the IPv6 layer: should be a numeric IP4 or ip6 + * interpreted by the IPv6 layer: should be a numeric IP4 or IP6 * address, or a hostname. **/ char *bind_address; @@ -179,7 +185,7 @@ static void print_rsync_version(enum logcode f) rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n", ipv6, (int) (sizeof dumstat->st_ino * 8), - (int) (sizeof (INO64_T) * 8)); + (int) (sizeof (uint64) * 8)); #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); @@ -227,6 +233,7 @@ void usage(enum logcode F) rprintf(F," --backup-dir make backups into this directory\n"); 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," -K, --keep-dirlinks treat symlinked dir on receiver as dir\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"); @@ -286,11 +293,12 @@ void usage(enum logcode F) rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n"); - rprintf(F," -h, --help show this help screen\n"); + rprintf(F," --checksum-seed=NUM set block/file checksum seed\n"); #ifdef INET6 - rprintf(F," -4 prefer IPv4\n"); - rprintf(F," -6 prefer IPv6\n"); + rprintf(F," -4 --ipv4 prefer IPv4\n"); + rprintf(F," -6 --ipv6 prefer IPv6\n"); #endif + rprintf(F," -h, --help show this help screen\n"); rprintf(F,"\n"); @@ -301,14 +309,15 @@ void usage(enum logcode F) enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, - OPT_READ_BATCH, OPT_WRITE_BATCH}; + OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, + OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0}, {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, - {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, - {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, + {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, + {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, @@ -331,6 +340,7 @@ static struct poptOption long_options[] = { {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 }, {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, + {"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 }, {"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 }, {"copy-links", 'L', POPT_ARG_NONE, ©_links, 0, 0, 0 }, {"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 }, @@ -353,10 +363,10 @@ static struct poptOption long_options[] = { {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, {"block-size", 'B', POPT_ARG_INT, &block_size, 0, 0, 0 }, {"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 }, - {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 }, + {"timeout", 0, POPT_ARG_INT, &io_timeout, OPT_TIMEOUT, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, {"compare-dest", 0, POPT_ARG_STRING, &compare_dest, 0, 0, 0 }, - {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, + {"link-dest", 0, POPT_ARG_STRING, &compare_dest, OPT_LINK_DEST, 0, 0 }, /* TODO: Should this take an optional int giving the compression level? */ {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 }, @@ -381,15 +391,16 @@ static struct poptOption long_options[] = { {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, {"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 }, #ifdef INET6 - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, - {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, + {"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 {0,0,0,0, 0, 0, 0} }; -static char err_buf[100]; +static char err_buf[200]; /** @@ -399,48 +410,44 @@ static char err_buf[100]; **/ void option_error(void) { - if (err_buf[0]) { - rprintf(FLOG, "%s", err_buf); - rprintf(FERROR, RSYNC_NAME ": %s", err_buf); - } else { - rprintf (FERROR, "Error parsing options: " - "option may be supported on client but not on server?\n"); - rprintf (FERROR, RSYNC_NAME ": Error parsing options: " - "option may be supported on client but not on server?\n"); + if (!err_buf[0]) { + strcpy(err_buf, "Error parsing options: " + "option may be supported on client but not on server?\n"); } + + rprintf(FERROR, RSYNC_NAME ": %s", err_buf); } /** - * Check to see if we should refuse this option + * Tweak the option table to disable all options that the rsyncd.conf + * file has told us to refuse. **/ -static int check_refuse_options(char *ref, int opt) +static void set_refuse_options(char *bp) { - int i, len; - char *p; - const char *name; - - for (i = 0; long_options[i].longName; i++) { - if (long_options[i].val == opt) - break; - } - - if (!long_options[i].longName) - return 0; - - name = long_options[i].longName; - len = strlen(name); - - while ((p = strstr(ref,name))) { - if ((p==ref || p[-1]==' ') && - (p[len] == ' ' || p[len] == 0)) { - snprintf(err_buf, sizeof err_buf, - "The '%s' option is not supported by this server\n", name); - return 1; + struct poptOption *op; + char *cp; + + while (1) { + if ((cp = strchr(bp, ' ')) != NULL) + *cp= '\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; + break; + } } - ref += len; + if (!cp) + break; + *cp = ' '; + bp = cp + 1; } - return 0; } @@ -467,8 +474,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain) { int opt; char *ref = lp_refuse_options(module_id); + const char *arg; poptContext pc; + if (ref && *ref) + set_refuse_options(ref); + /* TODO: Call poptReadDefaultConfig; handle errors. */ /* The context leaks in case of an error, but if there's a @@ -476,9 +487,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) pc = poptGetContext(RSYNC_NAME, *argc, *argv, long_options, 0); while ((opt = poptGetNextOpt(pc)) != -1) { - if (ref && check_refuse_options(ref, opt)) - return 0; - /* most options are handled automatically by popt; * only special cases are returned and listed here. */ @@ -505,23 +513,32 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_EXCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), - ADD_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), - ADD_INCLUDE); + XFLG_DEF_INCLUDE); break; case OPT_EXCLUDE_FROM: - add_exclude_file(&exclude_list, poptGetOptArg(pc), - MISSING_FATAL, ADD_EXCLUDE); + 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: - add_exclude_file(&exclude_list, poptGetOptArg(pc), - MISSING_FATAL, ADD_INCLUDE); + if (am_server || sanitize_paths) + return 0; /* Impossible... */ + arg = poptGetOptArg(pc); + add_exclude_file(&exclude_list, arg, + XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE); break; case 'h': @@ -553,35 +570,49 @@ int parse_arguments(int *argc, const char ***argv, int frommain) case OPT_WRITE_BATCH: /* popt stores the filename in batch_prefix for us */ write_batch = 1; - checksum_seed = FIXED_CHECKSUM_SEED; break; case OPT_READ_BATCH: /* popt stores the filename in batch_prefix for us */ read_batch = 1; - checksum_seed = FIXED_CHECKSUM_SEED; + break; + + case OPT_TIMEOUT: + if (io_timeout && io_timeout < select_timeout) + select_timeout = io_timeout; break; case OPT_LINK_DEST: #if HAVE_LINK - compare_dest = (char *)poptGetOptArg(pc); link_dest = 1; break; #else snprintf(err_buf, sizeof err_buf, "hard links are not supported on this %s\n", am_server ? "server" : "client"); - rprintf(FERROR, "ERROR: %s", err_buf); return 0; #endif - default: - snprintf(err_buf, sizeof err_buf, - "%s%s: %s\n", - am_server ? "on remote machine: " : "", - poptBadOption(pc, POPT_BADOPTION_NOALIAS), - poptStrerror(opt)); + /* A large opt value means that set_refuse_options() + * turned this option off (opt-BASE is its index). */ + if (opt >= OPT_REFUSED_BASE) { + struct poptOption *op = + &long_options[opt-OPT_REFUSED_BASE]; + int n = snprintf(err_buf, sizeof err_buf, + "This server does not support --%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)); + } return 0; } } @@ -591,7 +622,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) snprintf(err_buf, sizeof err_buf, "symlinks are not supported on this %s\n", am_server ? "server" : "client"); - rprintf(FERROR, "ERROR: %s", err_buf); return 0; } #endif @@ -601,7 +631,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) snprintf(err_buf, sizeof err_buf, "hard links are not supported on this %s\n", am_server ? "server" : "client"); - rprintf(FERROR, "ERROR: %s", err_buf); return 0; } #endif @@ -611,6 +640,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain) "write-batch and read-batch can not be used together\n"); exit_cleanup(RERR_SYNTAX); } + if ((write_batch || read_batch) && am_server) { + rprintf(FERROR, + "batch-mode is incompatible with server mode\n"); + /* We don't actually exit_cleanup(), so that we can still service + * older version clients that still send batch args to server. */ + read_batch = write_batch = 0; + batch_prefix = NULL; + } if (batch_prefix && strlen(batch_prefix) > MAX_BATCH_PREFIX_LEN) { rprintf(FERROR, "the batch-file prefix must be %d characters or less.\n", @@ -623,12 +660,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) exit_cleanup(RERR_SYNTAX); } - if (do_compression && (write_batch || read_batch)) { - rprintf(FERROR, - "compress can not be used with write-batch or read-batch\n"); - exit_cleanup(RERR_SYNTAX); - } - if (archive_mode) { if (!files_from) recurse = 1; @@ -645,17 +676,54 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (relative_paths < 0) relative_paths = files_from? 1 : 0; + *argv = poptGetArgs(pc); + if (*argv) + *argc = count_args(*argv); + else + *argc = 0; + + if (sanitize_paths) { + int i; + for (i = *argc; i-- > 0; ) + (*argv)[i] = alloc_sanitize_path((*argv)[i], NULL); + if (tmpdir) + tmpdir = alloc_sanitize_path(tmpdir, curr_dir); + if (compare_dest) + compare_dest = alloc_sanitize_path(compare_dest, curr_dir); + if (backup_dir) + backup_dir = alloc_sanitize_path(backup_dir, curr_dir); + if (files_from) + files_from = alloc_sanitize_path(files_from, curr_dir); + } + + if (daemon_opt) { + daemon_opt = 0; + am_daemon = 1; + return 1; + } + if (!backup_suffix) - backup_suffix = backup_dir? "" : BACKUP_SUFFIX; + 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", backup_suffix); exit_cleanup(RERR_SYNTAX); } - if (backup_dir) - backup_dir_len = strlen(backup_dir); - else if (!backup_suffix_len) { + 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); + } + if (backup_dir_buf[backup_dir_len - 1] != '/') { + 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); + } else if (!backup_suffix_len && (!am_server || !am_sender)) { rprintf(FERROR, "--suffix cannot be a null string without --backup-dir\n"); exit_cleanup(RERR_SYNTAX); @@ -664,15 +732,15 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (do_progress && !verbose) verbose = 1; - *argv = poptGetArgs(pc); - if (*argv) - *argc = count_args(*argv); - else - *argc = 0; + if (bwlimit) { + bwlimit_writemax = (size_t)bwlimit * 128; + if (bwlimit_writemax < 512) + bwlimit_writemax = 512; + } if (files_from) { char *colon; - if (*argc != 2) { + if (*argc != 2 && !(am_server && am_sender && *argc == 1)) { usage(FERROR); exit_cleanup(RERR_SYNTAX); } @@ -692,11 +760,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) exit_cleanup(RERR_SYNTAX); } } else { - extern int sanitize_paths; - if (sanitize_paths) { - files_from = strdup(files_from); - sanitize_path(files_from, NULL); - } filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); if (filesfrom_fd < 0) { rsyserr(FERROR, errno, @@ -707,9 +770,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } - if (daemon_opt) - am_daemon = 1; - return 1; } @@ -761,6 +821,8 @@ void server_options(char **args,int *argc) argstr[x++] = 'l'; if (copy_links) argstr[x++] = 'L'; + if (keep_dirlinks && am_sender) + argstr[x++] = 'K'; if (whole_file > 0) argstr[x++] = 'W'; @@ -821,13 +883,6 @@ void server_options(char **args,int *argc) args[ac++] = arg; } - if (batch_prefix) { - char *r_or_w = write_batch ? "write" : "read"; - if (asprintf(&arg, "--%s-batch=%s", r_or_w, batch_prefix) < 0) - goto oom; - args[ac++] = arg; - } - if (io_timeout) { if (asprintf(&arg, "--timeout=%d", io_timeout) < 0) goto oom; @@ -867,6 +922,12 @@ void server_options(char **args,int *argc) args[ac++] = arg; } + if (checksum_seed) { + if (asprintf(&arg, "--checksum-seed=%d", checksum_seed) < 0) + goto oom; + args[ac++] = arg; + } + if (keep_partial) args[ac++] = "--partial";