diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2009-05-21 17:22:01 +0300 |
---|---|---|
committer | Lasse Collin <lasse.collin@tukaani.org> | 2009-05-21 17:22:01 +0300 |
commit | 071b825b23911a69dd1cd2f8cda004ef8a781fae (patch) | |
tree | 03ac9e5b553e5ce71455bbfa9b31118b31392613 /src/xzdec | |
parent | Install lzdiff, lzgrep, and lzmore as symlinks (diff) | |
download | xz-071b825b23911a69dd1cd2f8cda004ef8a781fae.tar.xz |
Support special value "max" where xz and xzdec accept an integer.
Don't round the memory usage limit in xzdec --help to avoid
an integer overflow and to not give wrong impression that
the limit is high enough when it may not actually be.
Diffstat (limited to '')
-rw-r--r-- | src/xzdec/xzdec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/xzdec/xzdec.c b/src/xzdec/xzdec.c index 6c1f8249..90bc6579 100644 --- a/src/xzdec/xzdec.c +++ b/src/xzdec/xzdec.c @@ -86,7 +86,7 @@ help(void) " MiB of memory at maximum.\n" "\n" "Report bugs to <" PACKAGE_BUGREPORT "> (in English or Finnish).\n", - argv0, (memlimit + 512 * 1024) / (1024 * 1024)); + argv0, memlimit / (1024 * 1024)); my_exit(); } @@ -128,6 +128,10 @@ str_to_uint64(const char *value) { uint64_t result = 0; + // Accept special value "max". + if (strcmp(value, "max") == 0) + return UINT64_MAX; + if (*value < '0' || *value > '9') { fprintf(stderr, "%s: %s: Not a number\n", argv0, value); exit(EXIT_FAILURE); |