Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5ca8a90
)
Changed -h to mean powers of 1000 when used once, and powers of 1024
author
Wayne Davison
<wayned@samba.org>
Wed, 8 Feb 2006 16:52:25 +0000
(16:52 +0000)
committer
Wayne Davison
<wayned@samba.org>
Wed, 8 Feb 2006 16:52:25 +0000
(16:52 +0000)
when repeated. Got rid of --si.
options.c
patch
|
blob
|
blame
|
history
diff --git
a/options.c
b/options.c
index
a691cf8
..
527797f
100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-357,7
+357,6
@@
void usage(enum logcode F)
rprintf(F," --stats give some file-transfer stats\n");
rprintf(F," -8, --8-bit-output leave high-bit chars unescaped in output\n");
rprintf(F," -h, --human-readable output numbers in a human-readable format\n");
rprintf(F," --stats give some file-transfer stats\n");
rprintf(F," -8, --8-bit-output leave high-bit chars unescaped in output\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");
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");
@@
-397,8
+396,7
@@
static struct poptOption long_options[] = {
{"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 },
{"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},
+ {"human-readable", 'h', POPT_ARG_NONE, 0, 'h', 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 },
{"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 },
@@
-927,6
+925,10
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
preserve_devices = preserve_specials = 0;
break;
preserve_devices = preserve_specials = 0;
break;
+ case 'h':
+ human_readable++;
+ break;
+
case 'i':
itemize_changes++;
break;
case 'i':
itemize_changes++;
break;
@@
-1076,6
+1078,7
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
}
if (human_readable && *argc == 2) {
}
if (human_readable && *argc == 2) {
+ /* Allow the old meaning of 'h' (--help) on its own. */
usage(FINFO);
exit_cleanup(0);
}
usage(FINFO);
exit_cleanup(0);
}