X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f39b6638f682b76289c6399de6f8660086a8fda9..bb6721dce6bac8ff2374609bf5f99ea7e6fe2c70:/options.c diff --git a/options.c b/options.c index 6deafd0c..fdab554c 100644 --- a/options.c +++ b/options.c @@ -22,8 +22,9 @@ #include "popt.h" extern int sanitize_paths; +extern int select_timeout; extern char curr_dir[MAXPATHLEN]; -extern struct exclude_struct **exclude_list; +extern struct exclude_list_struct exclude_list; int make_backups = 0; @@ -38,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; @@ -83,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; @@ -91,6 +94,7 @@ int ignore_errors = 0; int modify_window = 0; int blocking_io = -1; int checksum_seed = 0; +int inplace = 0; unsigned int block_size = 0; @@ -114,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; @@ -130,15 +135,14 @@ 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; +#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ +char *batch_name = 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 - * 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; @@ -146,6 +150,7 @@ char *bind_address; static void print_rsync_version(enum logcode f) { char const *got_socketpair = "no "; + char const *have_inplace = "no "; char const *hardlinks = "no "; char const *links = "no "; char const *ipv6 = "no "; @@ -155,6 +160,10 @@ static void print_rsync_version(enum logcode f) got_socketpair = ""; #endif +#if HAVE_FTRUNCATE + have_inplace = ""; +#endif + #if SUPPORT_HARD_LINKS hardlinks = ""; #endif @@ -180,17 +189,18 @@ static void print_rsync_version(enum logcode f) /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature * macros. */ - rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n", - ipv6, + rprintf(f, " %sinplace, %sIPv6, %d-bit system inums, %d-bit internal inums\n", + have_inplace, 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()); #endif -#ifdef NO_INT64 - rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); +#ifdef INT64_IS_OFF_T + if (sizeof (int64) < 8) + rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); #endif rprintf(f, @@ -231,6 +241,8 @@ 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," --inplace update destination files inplace (SEE MAN PAGE)\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"); @@ -257,13 +269,14 @@ 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"); 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," -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"); rprintf(F," -P equivalent to --partial --progress\n"); @@ -274,7 +287,7 @@ 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 all *-from file lists are delimited by nulls\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 an rsync daemon\n"); rprintf(F," --no-detach do not detach from the parent\n"); @@ -288,13 +301,14 @@ void usage(enum logcode F) rprintf(F," --log-format=FORMAT log file transfers using specified format\n"); rprintf(F," --password-file=FILE get password from FILE\n"); 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," --write-batch=FILE write a batch to FILE\n"); + rprintf(F," --read-batch=FILE read a batch from FILE\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"); @@ -305,15 +319,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 }, @@ -336,6 +350,8 @@ 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 }, + {"inplace", 0, POPT_ARG_NONE, &inplace, 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 }, @@ -358,7 +374,7 @@ 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, &compare_dest, OPT_LINK_DEST, 0, 0 }, @@ -369,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 }, @@ -380,21 +397,22 @@ static struct poptOption long_options[] = { {"address", 0, POPT_ARG_STRING, &bind_address, 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 }, - {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 }, - {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 }, + {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 }, + {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 }, {"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 }, + {"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]; /** @@ -404,15 +422,12 @@ 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); } @@ -510,29 +525,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: + if (am_server || sanitize_paths) + return 0; /* Impossible... */ arg = poptGetOptArg(pc); - if (sanitize_paths) - arg = alloc_sanitize_path(arg, curr_dir); add_exclude_file(&exclude_list, arg, - MISSING_FATAL, ADD_EXCLUDE); + XFLG_FATAL_ERRORS); break; case OPT_INCLUDE_FROM: + if (am_server || sanitize_paths) + return 0; /* Impossible... */ arg = poptGetOptArg(pc); - if (sanitize_paths) - arg = alloc_sanitize_path(arg, curr_dir); add_exclude_file(&exclude_list, arg, - MISSING_FATAL, ADD_INCLUDE); + XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE); break; case 'h': @@ -562,15 +580,18 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_WRITE_BATCH: - /* popt stores the filename in batch_prefix for us */ + /* batch_name is already set */ write_batch = 1; - checksum_seed = FIXED_CHECKSUM_SEED; break; case OPT_READ_BATCH: - /* popt stores the filename in batch_prefix for us */ + /* batch_name is already set */ 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: @@ -581,7 +602,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 @@ -614,7 +634,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 @@ -624,20 +643,48 @@ 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 + 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, - "write-batch and read-batch can not be used together\n"); + "--write-batch and --read-batch can not be used together\n"); + exit_cleanup(RERR_SYNTAX); + } + if (write_batch || read_batch) { + if (dry_run) { + rprintf(FERROR, + "--%s-batch cannot be used with --dry_run (-n)\n", + write_batch ? "write" : "read"); + exit_cleanup(RERR_SYNTAX); + } + if (am_server) { + rprintf(FINFO, + "ignoring --%s-batch option sent to server\n", + write_batch ? "write" : "read"); + /* 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_name = NULL; + } + } + if (read_batch && files_from) { + rprintf(FERROR, + "--read-batch cannot be used with --files-from\n"); exit_cleanup(RERR_SYNTAX); } - if (batch_prefix && strlen(batch_prefix) > MAX_BATCH_PREFIX_LEN) { + if (batch_name && strlen(batch_name) > MAX_BATCH_NAME_LEN) { rprintf(FERROR, - "the batch-file prefix must be %d characters or less.\n", - MAX_BATCH_PREFIX_LEN); + "the batch-file name must be %d characters or less.\n", + MAX_BATCH_NAME_LEN); exit_cleanup(RERR_SYNTAX); } @@ -646,12 +693,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; @@ -680,6 +721,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain) (*argv)[i] = alloc_sanitize_path((*argv)[i], NULL); if (tmpdir) tmpdir = alloc_sanitize_path(tmpdir, curr_dir); + if (partial_dir) + partial_dir = alloc_sanitize_path(partial_dir, curr_dir); if (compare_dest) compare_dest = alloc_sanitize_path(compare_dest, curr_dir); if (backup_dir) @@ -688,6 +731,12 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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_len = strlen(backup_suffix); @@ -707,9 +756,9 @@ 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) + if (verbose > 1 && !am_sender) rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf); - } else if (!backup_suffix_len) { + } 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); @@ -718,9 +767,35 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (do_progress && !verbose) verbose = 1; + if (bwlimit) { + bwlimit_writemax = (size_t)bwlimit * 128; + if (bwlimit_writemax < 512) + bwlimit_writemax = 512; + } + + 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, + "--inplace is not supported on this %s\n", + am_server ? "server" : "client"); + return 0; +#endif + } else if (partial_dir) { + if (strcmp(partial_dir, ".") == 0) + partial_dir = NULL; + keep_partial = 1; + } + if (files_from) { char *colon; - if (*argc != 2) { + if (*argc != 2 && !(am_server && am_sender && *argc == 1)) { usage(FERROR); exit_cleanup(RERR_SYNTAX); } @@ -750,9 +825,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } - if (daemon_opt) - am_daemon = 1; - return 1; } @@ -804,6 +876,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'; @@ -864,13 +938,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; @@ -910,7 +977,16 @@ void server_options(char **args,int *argc) args[ac++] = arg; } - if (keep_partial) + if (checksum_seed) { + if (asprintf(&arg, "--checksum-seed=%d", checksum_seed) < 0) + goto oom; + args[ac++] = arg; + } + + if (partial_dir && am_sender) { + args[ac++] = "--partial-dir"; + args[ac++] = partial_dir; + } else if (keep_partial) args[ac++] = "--partial"; if (force_delete) @@ -937,6 +1013,9 @@ void server_options(char **args,int *argc) if (opt_ignore_existing && am_sender) args[ac++] = "--ignore-existing"; + if (inplace) + args[ac++] = "--inplace"; + if (tmpdir) { args[ac++] = "--temp-dir"; args[ac++] = tmpdir;