X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ce58b1b479c9ffcdc6fc85d492206fcd5bd32d64..7be73df4e7c9978b619c7e849b3f8ac2987cb667:/options.c diff --git a/options.c b/options.c index d719a4d6..d5303c85 100644 --- a/options.c +++ b/options.c @@ -21,6 +21,8 @@ #include "rsync.h" #include "popt.h" +extern int sanitize_paths; +extern char curr_dir[MAXPATHLEN]; extern struct exclude_struct **exclude_list; int make_backups = 0; @@ -46,17 +48,17 @@ int preserve_gid = 0; int preserve_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_excluded=0; -int one_file_system=0; +int dry_run = 0; +int local_server = 0; +int ignore_times = 0; +int delete_mode = 0; +int delete_excluded = 0; +int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; -int sparse_files=0; -int do_compression=0; -int am_root=0; -int orig_umask=0; +int sparse_files = 0; +int do_compression = 0; +int am_root = 0; +int orig_umask = 0; int relative_paths = -1; int implied_dirs = 1; int numeric_ids = 0; @@ -66,6 +68,7 @@ int read_only = 0; int module_id = -1; int am_server = 0; int am_sender = 0; +int am_generator = 0; char *files_from = NULL; int filesfrom_fd = -1; char *remote_filesfrom_file = NULL; @@ -73,20 +76,21 @@ int eol_nulls = 0; int recurse = 0; int am_daemon = 0; int daemon_over_rsh = 0; -int do_stats=0; -int do_progress=0; -int keep_partial=0; -int safe_symlinks=0; -int copy_unsafe_links=0; -int size_only=0; -int bwlimit=0; -int delete_after=0; -int only_existing=0; -int opt_ignore_existing=0; -int max_delete=0; -int ignore_errors=0; -int modify_window=0; -int blocking_io=-1; +int do_stats = 0; +int do_progress = 0; +int keep_partial = 0; +int safe_symlinks = 0; +int copy_unsafe_links = 0; +int size_only = 0; +int bwlimit = 0; +int delete_after = 0; +int only_existing = 0; +int opt_ignore_existing = 0; +int max_delete = 0; +int ignore_errors = 0; +int modify_window = 0; +int blocking_io = -1; +int checksum_seed = 0; unsigned int block_size = 0; @@ -106,6 +110,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; @@ -116,6 +121,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; @@ -124,9 +130,11 @@ 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; +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 @@ -166,7 +174,7 @@ static void print_rsync_version(enum logcode f) rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " "%shard links, %ssymlinks, batchfiles, \n", - (int) (sizeof(OFF_T) * 8), + (int) (sizeof (OFF_T) * 8), got_socketpair, hardlinks, links); /* Note that this field may not have type ino_t. It depends @@ -174,8 +182,8 @@ static void print_rsync_version(enum logcode f) * macros. */ 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 dumstat->st_ino * 8), + (int) (sizeof (INO64_T) * 8)); #ifdef MAINTAINER_MODE rprintf(f, " panic action: \"%s\"\n", get_panic_action()); @@ -224,9 +232,9 @@ void usage(enum logcode F) 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," -l, --links copy symlinks as symlinks\n"); - rprintf(F," -L, --copy-links copy the referent of symlinks\n"); - rprintf(F," --copy-unsafe-links copy links outside the source tree\n"); - rprintf(F," --safe-links ignore links outside the destination tree\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"); + rprintf(F," --safe-links ignore \"unsafe\" symlinks\n"); rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -p, --perms preserve permissions\n"); rprintf(F," -o, --owner preserve owner (root only)\n"); @@ -246,12 +254,12 @@ void usage(enum logcode F) rprintf(F," --delete delete files that don't exist on the sending side\n"); rprintf(F," --delete-excluded also delete excluded files on the receiving side\n"); rprintf(F," --delete-after receiver deletes after transferring, not before\n"); - rprintf(F," --ignore-errors delete even if there are IO errors\n"); + 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," --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 IO timeout in seconds\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"); rprintf(F," --size-only ignore mod time for quick check (use size)\n"); rprintf(F," --modify-window=NUM compare mod times with reduced accuracy\n"); @@ -268,12 +276,12 @@ void usage(enum logcode F) rprintf(F," --files-from=FILE read FILE for list of source-file names\n"); rprintf(F," -0 --from0 all *-from file lists are delimited by nulls\n"); rprintf(F," --version print version number\n"); - rprintf(F," --daemon run as a rsync daemon\n"); + rprintf(F," --daemon run as an rsync daemon\n"); rprintf(F," --no-detach do not detach from the parent\n"); rprintf(F," --address=ADDRESS bind to the specified address\n"); rprintf(F," --config=FILE specify alternate rsyncd.conf file\n"); rprintf(F," --port=PORT specify alternate rsyncd port number\n"); - rprintf(F," --blocking-io use blocking IO for the remote shell\n"); + rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); rprintf(F," --no-blocking-io turn off --blocking-io\n"); rprintf(F," --stats give some file transfer stats\n"); rprintf(F," --progress show progress during transfer\n"); @@ -297,7 +305,8 @@ 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_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ @@ -352,10 +361,10 @@ static struct poptOption long_options[] = { {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 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, &am_daemon, 0, 0, 0 }, + {"daemon", 0, POPT_ARG_NONE, &daemon_opt, 0, 0, 0 }, {"no-detach", 0, POPT_ARG_NONE, &no_detach, 0, 0, 0 }, {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, {"progress", 0, POPT_ARG_NONE, &do_progress, 0, 0, 0 }, @@ -408,33 +417,34 @@ void option_error(void) /** - * 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; } @@ -461,8 +471,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 @@ -470,10 +484,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) { - if (check_refuse_options(ref, opt)) return 0; - } - /* most options are handled automatically by popt; * only special cases are returned and listed here. */ @@ -510,12 +520,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_EXCLUDE_FROM: - add_exclude_file(&exclude_list, poptGetOptArg(pc), + arg = poptGetOptArg(pc); + if (sanitize_paths) + arg = alloc_sanitize_path(arg, curr_dir); + add_exclude_file(&exclude_list, arg, MISSING_FATAL, ADD_EXCLUDE); break; case OPT_INCLUDE_FROM: - add_exclude_file(&exclude_list, poptGetOptArg(pc), + arg = poptGetOptArg(pc); + if (sanitize_paths) + arg = alloc_sanitize_path(arg, curr_dir); + add_exclude_file(&exclude_list, arg, MISSING_FATAL, ADD_INCLUDE); break; @@ -523,30 +539,13 @@ int parse_arguments(int *argc, const char ***argv, int frommain) usage(FINFO); exit_cleanup(0); - case 'H': -#if SUPPORT_HARD_LINKS - preserve_hard_links=1; -#else - /* FIXME: Don't say "server" if this is - * happening on the client. */ - /* FIXME: Why do we have the duplicated - * rprintf? Everybody who gets this message - * ought to send it to the client and also to - * the logs. */ - 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 /* SUPPORT_HARD_LINKS */ - break; - case 'v': verbose++; break; case 'q': - if (frommain) quiet++; + if (frommain) + quiet++; break; case OPT_SENDER: @@ -565,16 +564,17 @@ 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_LINK_DEST: #if HAVE_LINK - compare_dest = (char *)poptGetOptArg(pc); link_dest = 1; break; #else @@ -585,19 +585,50 @@ int parse_arguments(int *argc, const char ***argv, int frommain) return 0; #endif - default: - /* FIXME: If --daemon is specified, then errors for later - * parameters seem to disappear. */ - 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; } } +#if !SUPPORT_LINKS + if (preserve_links && !am_sender) { + 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 + +#if !SUPPORT_HARD_LINKS + if (preserve_hard_links) { + 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 + if (write_batch && read_batch) { rprintf(FERROR, "write-batch and read-batch can not be used together\n"); @@ -637,17 +668,49 @@ 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); + fprintf(stderr, "compare_dest=`%s'\n", compare_dest); + 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 (!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) + rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf); + } else if (!backup_suffix_len) { rprintf(FERROR, "--suffix cannot be a null string without --backup-dir\n"); exit_cleanup(RERR_SYNTAX); @@ -656,12 +719,6 @@ 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 (files_from) { char *colon; if (*argc != 2) { @@ -684,9 +741,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) exit_cleanup(RERR_SYNTAX); } } else { - extern int sanitize_paths; - if (sanitize_paths) - sanitize_path(strdup(files_from), NULL); filesfrom_fd = open(files_from, O_RDONLY|O_BINARY); if (filesfrom_fd < 0) { rsyserr(FERROR, errno, @@ -697,6 +751,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } + if (daemon_opt) + am_daemon = 1; + return 1; } @@ -713,13 +770,7 @@ void server_options(char **args,int *argc) { int ac = *argc; static char argstr[50]; - static char bsize[30]; - static char iotime[30]; - static char mdelete[30]; - static char mwindow[30]; - static char bw[50]; - /* Leave room for ``--(write|read)-batch='' */ - static char fext[MAX_BATCH_PREFIX_LEN + 15]; + char *arg; int i, x; @@ -740,7 +791,7 @@ void server_options(char **args,int *argc) x = 1; argstr[0] = '-'; - for (i=0;i