X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8645af1d8cf9ad3a543c5b499cbbb287d113522f..14b61c63f00785c36e769142d98253229bde7354:/options.c diff --git a/options.c b/options.c index 7c39d76b..166faf85 100644 --- a/options.c +++ b/options.c @@ -46,27 +46,27 @@ 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 remote_version=0; -int sparse_files=0; -int do_compression=0; -int am_root=0; -int orig_umask=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 relative_paths = -1; int implied_dirs = 1; int numeric_ids = 0; int force_delete = 0; int io_timeout = 0; -int io_error = 0; 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; @@ -74,21 +74,22 @@ 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 block_size=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; /** Network address family. **/ @@ -105,9 +106,11 @@ int no_detach = 0; int write_batch = 0; int read_batch = 0; -int suffix_specified = 0; +int backup_dir_len = 0; +int backup_suffix_len; +unsigned int backup_dir_remainder; -char *backup_suffix = BACKUP_SUFFIX; +char *backup_suffix = NULL; char *tmpdir = NULL; char *compare_dest = NULL; char *config_file = NULL; @@ -116,6 +119,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,8 +128,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 @@ -161,11 +168,11 @@ static void print_rsync_version(enum logcode f) rprintf(f, "%s version %s protocol version %d\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION); rprintf(f, - "Copyright (C) 1996-2002 by Andrew Tridgell and others\n"); + "Copyright (C) 1996-2004 by Andrew Tridgell and others\n"); 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 @@ -173,8 +180,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()); @@ -218,14 +225,14 @@ void usage(enum logcode F) rprintf(F," -R, --relative use relative path names\n"); rprintf(F," --no-relative turn off --relative\n"); rprintf(F," --no-implied-dirs don't send implied dirs with -R\n"); - rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX); + rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); rprintf(F," --backup-dir make backups into this directory\n"); - rprintf(F," --suffix=SUFFIX override backup suffix\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," -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"); @@ -241,19 +248,19 @@ void usage(enum logcode F) 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"); - rprintf(F," --ignore-existing ignore files that already exist on the receiving side\n"); + rprintf(F," --ignore-existing ignore files that already exist on receiving side\n"); 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 delete after transferring, not before\n"); - rprintf(F," --ignore-errors delete even if there are IO errors\n"); + rprintf(F," --delete-after receiver deletes after transferring, not before\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," -I, --ignore-times don't exclude files that match length and time\n"); - rprintf(F," --size-only only use file size when determining if a file should be transferred\n"); - rprintf(F," --modify-window=NUM Timestamp window (seconds) for file match (default=%d)\n",modify_window); + 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"); rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\n"); @@ -265,14 +272,14 @@ void usage(enum logcode F) rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n"); rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n"); rprintf(F," --files-from=FILE read FILE for list of source-file names\n"); - rprintf(F," -0 --from0 file names we read are separated by nulls, not newlines\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"); @@ -293,20 +300,16 @@ void usage(enum logcode F) rprintf(F,"See http://rsync.samba.org/ for updates, bug reports, and answers\n"); } -enum {OPT_VERSION = 1000, OPT_SUFFIX, OPT_SENDER, OPT_SERVER, OPT_EXCLUDE, - OPT_EXCLUDE_FROM, OPT_DELETE, OPT_DELETE_EXCLUDED, OPT_NUMERIC_IDS, - OPT_RSYNC_PATH, OPT_FORCE, OPT_TIMEOUT, OPT_DAEMON, OPT_CONFIG, OPT_PORT, - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS, - OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, OPT_LINK_DEST, - OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, - OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, - OPT_IGNORE_ERRORS, OPT_BWLIMIT, - OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_IGNORE_EXISTING}; +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_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, OPT_SUFFIX, 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 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, @@ -359,7 +362,7 @@ static struct poptOption long_options[] = { {"link-dest", 0, POPT_ARG_STRING, 0, 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 }, @@ -380,6 +383,7 @@ static struct poptOption long_options[] = { {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 }, {"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 }, #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 }, @@ -400,7 +404,7 @@ void option_error(void) { if (err_buf[0]) { rprintf(FLOG, "%s", err_buf); - rprintf(FERROR, "%s: %s", RSYNC_NAME, 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"); @@ -411,33 +415,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; } @@ -466,6 +471,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) char *ref = lp_refuse_options(module_id); 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 @@ -473,10 +481,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. */ @@ -485,13 +489,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) print_rsync_version(FINFO); exit_cleanup(0); - case OPT_SUFFIX: - /* The value has already been set by popt, but - * we need to remember that a suffix was specified - * in case a backup-directory is used. */ - suffix_specified = 1; - break; - case OPT_MODIFY_WINDOW: /* The value has already been set by popt, but * we need to remember that we're using a @@ -533,30 +530,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: hard links not supported on this platform\n"); - return 0; -#endif /* SUPPORT_HARD_LINKS */ - break; - case 'v': verbose++; break; case 'q': - if (frommain) quiet++; + if (frommain) + quiet++; break; case OPT_SENDER: @@ -575,11 +555,13 @@ 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: @@ -588,41 +570,79 @@ int parse_arguments(int *argc, const char ***argv, int frommain) link_dest = 1; break; #else - snprintf(err_buf,sizeof(err_buf), + snprintf(err_buf, sizeof err_buf, "hard links are not supported on this %s\n", am_server ? "server" : "client"); - rprintf(FERROR,"ERROR: hard links not supported on this platform\n"); + rprintf(FERROR, "ERROR: %s", err_buf); 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 (write_batch && read_batch) { - snprintf(err_buf,sizeof(err_buf), - "write-batch and read-batch can not be used together\n"); - rprintf(FERROR,"ERROR: write-batch and read-batch" - " can not be used together\n"); +#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 (do_compression && (write_batch || read_batch)) { - snprintf(err_buf,sizeof(err_buf), - "compress can not be used with write-batch or read-batch\n"); - rprintf(FERROR,"ERROR: compress can not be used with" - " write-batch or read-batch\n"); +#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"); + exit_cleanup(RERR_SYNTAX); + } + if (batch_prefix && strlen(batch_prefix) > MAX_BATCH_PREFIX_LEN) { + rprintf(FERROR, + "the batch-file prefix must be %d characters or less.\n", + MAX_BATCH_PREFIX_LEN); + exit_cleanup(RERR_SYNTAX); + } + + if (tmpdir && strlen(tmpdir) >= MAXPATHLEN - 10) { + rprintf(FERROR, "the --temp-dir path is WAY too long.\n"); + 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) @@ -640,6 +660,36 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (relative_paths < 0) relative_paths = files_from? 1 : 0; + if (!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 = 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); + } + + if (do_progress && !verbose) + verbose = 1; + *argv = poptGetArgs(pc); if (*argv) *argc = count_args(*argv); @@ -652,8 +702,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain) usage(FERROR); exit_cleanup(RERR_SYNTAX); } - if (strcmp(files_from, "-") == 0) + if (strcmp(files_from, "-") == 0) { filesfrom_fd = 0; + if (am_server) + remote_filesfrom_file = "-"; + } else if ((colon = find_colon(files_from)) != 0) { if (am_server) { usage(FERROR); @@ -666,8 +719,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } else { extern int sanitize_paths; - if (sanitize_paths) - sanitize_path(strdup(files_from), NULL); + 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, @@ -678,6 +733,9 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } + if (daemon_opt) + am_daemon = 1; + return 1; } @@ -694,13 +752,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[MAXPATHLEN + 15]; + char *arg; int i, x; @@ -721,7 +773,7 @@ void server_options(char **args,int *argc) x = 1; argstr[0] = '-'; - for (i=0;i