X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/74de13d19c5c9bd1d7d1acde810fcb5bd398a359..e16adcdff338999f3cd4aac05138e2f5f704f253:/options.c diff --git a/options.c b/options.c index 198a9031..57290df3 100644 --- a/options.c +++ b/options.c @@ -20,6 +20,7 @@ #include "rsync.h" #include "popt.h" +#include "zlib/zlib.h" extern int module_id; extern int sanitize_paths; @@ -64,6 +65,7 @@ int one_file_system = 0; int protocol_version = PROTOCOL_VERSION; int sparse_files = 0; int do_compression = 0; +int def_compress_level = Z_DEFAULT_COMPRESSION; int am_root = 0; int am_server = 0; int am_sender = 0; @@ -80,6 +82,7 @@ char *files_from = NULL; int filesfrom_fd = -1; char *filesfrom_host = NULL; int eol_nulls = 0; +int human_readable = 0; int recurse = 0; int xfer_dirs = -1; int am_daemon = 0; @@ -161,11 +164,13 @@ int list_only = 0; #define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */ char *batch_name = NULL; +struct chmod_mode_struct *chmod_modes = NULL; + static int daemon_opt; /* sets am_daemon after option error-reporting */ static int F_option_cnt = 0; static int modify_window_set; static int itemize_changes = 0; -static int refused_delete, refused_archive_part; +static int refused_delete, refused_archive_part, refused_compress; static int refused_partial, refused_progress, refused_delete_before; static int refused_inplace; static char *max_size_arg, *min_size_arg; @@ -208,8 +213,7 @@ 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-2005 by Andrew Tridgell and others\n"); + rprintf(f, "Copyright (C) 1996-2006 by Wayne Davison, Andrew Tridgell, and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " "%shard links, %ssymlinks, batchfiles, \n", @@ -237,12 +241,9 @@ static void print_rsync_version(enum logcode f) (int) SIZEOF_INT64, (int) sizeof (int64)); } - rprintf(f, -"\n" -"rsync comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" -"are welcome to redistribute it under certain conditions. See the GNU\n" -"General Public Licence for details.\n" - ); + rprintf(f,"\nrsync comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"); + rprintf(f,"are welcome to redistribute it under certain conditions. See the GNU\n"); + rprintf(f,"General Public Licence for details.\n"); } @@ -250,9 +251,10 @@ void usage(enum logcode F) { print_rsync_version(F); - rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n"); + rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\n"); + rprintf(F,"via a fast differencing algorithm.\n"); - rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... DEST\n"); + rprintf(F,"\nUsage: rsync [OPTION]... SRC [SRC]... DEST\n"); rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n"); rprintf(F," or rsync [OPTION]... SRC [SRC]... [USER@]HOST::DEST\n"); rprintf(F," or rsync [OPTION]... SRC [SRC]... rsync://[USER@]HOST[:PORT]/DEST\n"); @@ -266,7 +268,7 @@ void usage(enum logcode F) rprintf(F," -q, --quiet suppress non-error messages\n"); rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n"); rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H)\n"); - rprintf(F," --no-OPTION turn of an implied OPTION (e.g. --no-D)\n"); + rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n"); rprintf(F," -r, --recursive recurse into directories\n"); rprintf(F," -R, --relative use relative path names\n"); rprintf(F," --no-implied-dirs don't send implied dirs with --relative\n"); @@ -289,6 +291,7 @@ void usage(enum logcode F) rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); + rprintf(F," --chmod=CHMOD change destination permissions\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\n"); @@ -296,7 +299,7 @@ void usage(enum logcode F) rprintf(F," -B, --block-size=SIZE force a fixed checksum block-size\n"); rprintf(F," -e, --rsh=COMMAND specify the remote shell to use\n"); rprintf(F," --rsync-path=PROGRAM specify the rsync to run on the remote machine\n"); - rprintf(F," --existing only update files that already exist on receiver\n"); + rprintf(F," --existing ignore non-existing files on receiving side\n"); rprintf(F," --ignore-existing ignore files that already exist on receiving side\n"); rprintf(F," --remove-sent-files sent files/symlinks are removed from sending side\n"); rprintf(F," --del an alias for --delete-during\n"); @@ -324,6 +327,7 @@ void usage(enum logcode F) rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); rprintf(F," -z, --compress compress file data during the transfer\n"); + rprintf(F," --compress-level=NUM explicitly set compression level\n"); rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); rprintf(F," -f, --filter=RULE add a file-filtering RULE\n"); rprintf(F," -F same as --filter='dir-merge /.rsync-filter'\n"); @@ -338,6 +342,8 @@ void usage(enum logcode F) rprintf(F," --port=PORT specify double-colon alternate port number\n"); rprintf(F," --blocking-io use blocking I/O for the remote shell\n"); rprintf(F," --stats give some file-transfer stats\n"); + rprintf(F," -h, --human-readable output numbers in a human-readable format\n"); + rprintf(F," --si like human-readable, but use powers of 1000\n"); rprintf(F," --progress show progress during transfer\n"); rprintf(F," -P same as --partial --progress\n"); rprintf(F," -i, --itemize-changes output a change-summary for all updates\n"); @@ -354,7 +360,7 @@ void usage(enum logcode F) rprintf(F," -6, --ipv6 prefer IPv6\n"); #endif rprintf(F," --version print version number\n"); - rprintf(F," -h, --help show this help screen\n"); + rprintf(F," --help show this help screen\n"); rprintf(F,"\nUse \"rsync --daemon --help\" to see the daemon-mode command-line options.\n"); rprintf(F,"Please see the rsync(1) and rsyncd.conf(5) man pages for full documentation.\n"); @@ -362,20 +368,22 @@ void usage(enum logcode F) } enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, - OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, + OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, + OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, OPT_REFUSED_BASE = 9000}; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, + {"help", 0, POPT_ARG_NONE, 0, OPT_HELP, 0, 0 }, {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0}, {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, {"no-verbose", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, {"no-v", 0, POPT_ARG_VAL, &verbose, 0, 0, 0 }, {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, {"stats", 0, POPT_ARG_NONE, &do_stats, 0, 0, 0 }, + {"human-readable", 'h', POPT_ARG_VAL, &human_readable, 1, 0, 0}, + {"si", 0, POPT_ARG_VAL, &human_readable, 2, 0, 0}, {"dry-run", 'n', POPT_ARG_NONE, &dry_run, 0, 0, 0 }, {"archive", 'a', POPT_ARG_NONE, 0, 'a', 0, 0 }, {"recursive", 'r', POPT_ARG_VAL, &recurse, 2, 0, 0 }, @@ -413,13 +421,14 @@ static struct poptOption long_options[] = { {"no-relative", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 }, {"no-R", 0, POPT_ARG_VAL, &relative_paths, 0, 0, 0 }, {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, + {"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, + {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, - {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 }, {"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, + {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 }, {"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 }, {"min-size", 0, POPT_ARG_STRING, &min_size_arg, OPT_MIN_SIZE, 0, 0 }, {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 }, @@ -451,7 +460,8 @@ static struct poptOption long_options[] = { {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, - {"compress", 'z', POPT_ARG_NONE, &do_compression, 0, 0, 0 }, + {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 }, + {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, {"progress", 0, POPT_ARG_VAL, &do_progress, 1, 0, 0 }, {"no-progress", 0, POPT_ARG_VAL, &do_progress, 0, 0, 0 }, @@ -460,7 +470,7 @@ static struct poptOption long_options[] = { {"partial-dir", 0, POPT_ARG_STRING, &partial_dir, 0, 0, 0 }, {"delay-updates", 0, POPT_ARG_NONE, &delay_updates, 0, 0, 0 }, {"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 }, - {"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 0, 0, 0 }, + {"itemize-changes", 'i', POPT_ARG_NONE, 0, 'i', 0, 0 }, {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, @@ -512,7 +522,7 @@ static void daemon_usage(enum logcode F) 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," --help show this help screen\n"); rprintf(F,"\nIf you were not trying to invoke rsync as a daemon, avoid using any of the\n"); rprintf(F,"daemon-specific rsync options. See also the rsyncd.conf(5) man page.\n"); @@ -598,6 +608,9 @@ static void set_refuse_options(char *bp) case 't': case 'g': case 'o': case 'D': refused_archive_part = op->val; break; + case 'z': + refused_compress = op->val; + break; case '\0': if (wildmatch("delete", op->longName)) refused_delete = op->val; @@ -653,51 +666,51 @@ static int count_args(const char **argv) static OFF_T parse_size_arg(char **size_arg, char def_suf) { - int mult, make_compatible = 0; - const char *arg, *p; - OFF_T size = 0; + int reps, mult, make_compatible = 0; + const char *arg; + OFF_T size = 1; for (arg = *size_arg; isdigit(*(uchar*)arg); arg++) {} if (*arg == '.') for (arg++; isdigit(*(uchar*)arg); arg++) {} - if (*arg && (arg[1] == 't' || arg[1] == 'T')) - mult = 1000, make_compatible = 1; - else - mult = 1024; - if ((p = strstr(arg, "+1")) != NULL - || (p = strstr(arg, "-1")) != NULL) { - if (p[2] == '\0') { - size = atoi(p + (*p == '+')); - make_compatible = 1; - } else - p = NULL; - } - switch (*arg && arg != p ? *arg : def_suf) { + switch (*arg && *arg != '+' && *arg != '-' ? *arg++ : def_suf) { case 'b': case 'B': - size += atof(*size_arg); + reps = 0; break; case 'k': case 'K': - size += atof(*size_arg) * mult; + reps = 1; break; case 'm': case 'M': - size += atof(*size_arg) * mult*mult; + reps = 2; break; case 'g': case 'G': - size += atof(*size_arg) * mult*mult*mult; + reps = 3; break; default: - size = -1; - break; + return -1; } + if (*arg == 'b' || *arg == 'B') + mult = 1000, make_compatible = 1, arg++; + else if (!*arg || *arg == '+' || *arg == '-') + mult = 1024; + else if (strncasecmp(arg, "ib", 2) == 0) + mult = 1024, arg += 2; + else + return -1; + while (reps--) + size *= mult; + size *= atof(*size_arg); + if ((*arg == '+' || *arg == '-') && arg[1] == '1') + size += atoi(arg), make_compatible = 1, arg += 2; + if (*arg) + return -1; if (size > 0 && make_compatible) { /* We convert this manually because we may need %lld precision, * and that's not a portable sprintf() escape. */ - char buf[128], *s = buf + sizeof buf; + char buf[128], *s = buf + sizeof buf - 1; OFF_T num = size; - *--s = '\0'; + *s = '\0'; while (num) { - if (s == buf) /* impossible... */ - out_of_memory("parse_size_arg@buf"); *--s = (num % 10) + '0'; num /= 10; } @@ -860,10 +873,14 @@ int parse_arguments(int *argc, const char ***argv, int frommain) preserve_devices = 1; break; - case 'h': + case OPT_HELP: usage(FINFO); exit_cleanup(0); + case 'i': + itemize_changes++; + break; + case 'v': verbose++; break; @@ -873,6 +890,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain) quiet++; break; + case 'x': + one_file_system++; + break; + case OPT_SENDER: if (!am_server) { usage(FERROR); @@ -902,6 +923,21 @@ int parse_arguments(int *argc, const char ***argv, int frommain) keep_partial = 1; break; + case 'z': + if (def_compress_level < Z_DEFAULT_COMPRESSION + || def_compress_level > Z_BEST_COMPRESSION) { + snprintf(err_buf, sizeof err_buf, + "--compress-level value is invalid: %d\n", + def_compress_level); + return 0; + } + do_compression = def_compress_level != Z_NO_COMPRESSION; + if (do_compression && refused_compress) { + create_refuse_error(refused_compress); + return 0; + } + break; + case OPT_WRITE_BATCH: /* batch_name is already set */ write_batch = 1; @@ -968,6 +1004,16 @@ int parse_arguments(int *argc, const char ***argv, int frommain) basis_dir[basis_dir_cnt++] = (char *)arg; break; + case OPT_CHMOD: + arg = poptGetOptArg(pc); + if (!(chmod_modes = parse_chmod(arg, chmod_modes))) { + snprintf(err_buf, sizeof err_buf, + "Invalid argument passed to --chmod (%s)\n", + arg); + return 0; + } + break; + default: /* A large opt value means that set_refuse_options() * turned this option off. */ @@ -983,6 +1029,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain) } } + if (human_readable && *argc == 2) { + usage(FINFO); + exit_cleanup(0); + } + #ifndef SUPPORT_LINKS if (preserve_links && !am_sender) { snprintf(err_buf, sizeof err_buf, @@ -1162,27 +1213,31 @@ 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 && !am_sender) { - rprintf(FINFO, "backup_dir is %s\n", - safe_fname(backup_dir_buf)); - } + if (verbose > 1 && !am_sender) + rprintf(FINFO, "backup_dir is %s\n", backup_dir_buf); } else if (!backup_suffix_len && (!am_server || !am_sender)) { snprintf(err_buf, sizeof err_buf, "--suffix cannot be a null string without --backup-dir\n"); return 0; + } else if (delete_mode && !delete_excluded) { + snprintf(backup_dir_buf, sizeof backup_dir_buf, + "P *%s", backup_suffix); + parse_rule(&filter_list, backup_dir_buf, 0, 0); } if (make_backups && !backup_dir) omit_dir_times = 1; if (log_format) { - if (log_format_has(log_format, 'i')) - log_format_has_i = 1; + if (am_server && log_format_has(log_format, 'I')) + log_format_has_i = 2; + else if (log_format_has(log_format, 'i')) + log_format_has_i = itemize_changes | 1; if (!log_format_has(log_format, 'b') && !log_format_has(log_format, 'c')) log_before_transfer = !am_server; } else if (itemize_changes) { log_format = "%i %n%L"; - log_format_has_i = 1; + log_format_has_i = itemize_changes; log_before_transfer = !am_server; } @@ -1411,8 +1466,11 @@ void server_options(char **args,int *argc) argstr[x++] = 'I'; if (relative_paths) argstr[x++] = 'R'; - if (one_file_system) + if (one_file_system) { argstr[x++] = 'x'; + if (one_file_system > 1) + argstr[x++] = 'x'; + } if (sparse_files) argstr[x++] = 'S'; if (do_compression) @@ -1432,10 +1490,18 @@ void server_options(char **args,int *argc) if (list_only > 1) args[ac++] = "--list-only"; + if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) { + if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0) + goto oom; + args[ac++] = arg; + } + /* The server side doesn't use our log-format, but in certain * circumstances they need to know a little about the option. */ if (log_format && am_sender) { - if (log_format_has_i) + if (log_format_has_i > 1) + args[ac++] = "--log-format=%i%I"; + else if (log_format_has_i) args[ac++] = "--log-format=%i"; else if (log_format_has_o_or_i) args[ac++] = "--log-format=%o";