X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8f14cc496bff26dda2697ccc0147ef131a28520e..c2c5682c0b5b56b455d9e7bada05f211213818c2:/options.c diff --git a/options.c b/options.c index b36f1259..a66c8e0f 100644 --- a/options.c +++ b/options.c @@ -272,7 +272,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"); @@ -346,7 +346,7 @@ 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," -m, --human-readable output numbers in a human-readable format\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"); @@ -364,7 +364,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"); @@ -372,21 +372,21 @@ 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_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, 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", 'm', POPT_ARG_VAL, &human_readable, 1, 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 }, @@ -526,7 +526,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"); @@ -670,41 +670,44 @@ 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') - return -1; - size = atoi(p); - make_compatible = 1; - } - 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. */ @@ -874,7 +877,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) preserve_devices = 1; break; - case 'h': + case OPT_HELP: usage(FINFO); exit_cleanup(0); @@ -1012,6 +1015,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, @@ -1199,6 +1207,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain) 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;