aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2008-06-11 15:08:44 +0300
committerLasse Collin <lasse.collin@tukaani.org>2008-06-11 15:08:44 +0300
commit0ea98e52ba87453497b1355c51f13bad55c8924a (patch)
tree23bd63c8c2638bee97d137f89679e8437f0391f0
parents/decompressed/compressed/ in the command line tool's (diff)
downloadxz-0ea98e52ba87453497b1355c51f13bad55c8924a.tar.xz
Improve command line integer parsing a little in lzma and
lzmadec to make them accept also KiB in addition Ki etc. Fix also memory usage information in lzmadec --help.
-rw-r--r--src/lzma/util.c23
-rw-r--r--src/lzmadec/lzmadec.c31
2 files changed, 32 insertions, 22 deletions
diff --git a/src/lzma/util.c b/src/lzma/util.c
index 6ef6eb0d..4bdbf8ec 100644
--- a/src/lzma/util.c
+++ b/src/lzma/util.c
@@ -60,20 +60,25 @@ str_to_uint64(const char *name, const char *value, uint64_t min, uint64_t max)
if (*value != '\0') {
// Look for suffix.
static const struct {
- const char *name;
+ const char name[4];
uint64_t multiplier;
} suffixes[] = {
- { "k", UINT64_C(1000) },
- { "M", UINT64_C(1000000) },
- { "G", UINT64_C(1000000000) },
- { "Ki", UINT64_C(1024) },
- { "Mi", UINT64_C(1048576) },
- { "Gi", UINT64_C(1073741824) },
- { NULL, 0 }
+ { "k", UINT64_C(1000) },
+ { "kB", UINT64_C(1000) },
+ { "M", UINT64_C(1000000) },
+ { "MB", UINT64_C(1000000) },
+ { "G", UINT64_C(1000000000) },
+ { "GB", UINT64_C(1000000000) },
+ { "Ki", UINT64_C(1024) },
+ { "KiB", UINT64_C(1024) },
+ { "Mi", UINT64_C(1048576) },
+ { "MiB", UINT64_C(1048576) },
+ { "Gi", UINT64_C(1073741824) },
+ { "GiB", UINT64_C(1073741824) }
};
uint64_t multiplier = 0;
- for (size_t i = 0; suffixes[i].name != NULL; ++i) {
+ for (size_t i = 0; i < ARRAY_SIZE(suffixes); ++i) {
if (strcmp(value, suffixes[i].name) == 0) {
multiplier = suffixes[i].multiplier;
break;
diff --git a/src/lzmadec/lzmadec.c b/src/lzmadec/lzmadec.c
index f92deadd..a1383842 100644
--- a/src/lzmadec/lzmadec.c
+++ b/src/lzmadec/lzmadec.c
@@ -116,7 +116,7 @@ help(void)
" MiB of memory at maximum.\n"
"\n"
"Report bugs to <" PACKAGE_BUGREPORT "> (in English or Finnish).\n",
- argv0, (uint64_t)((mem_limit + 512 * 1024) / (1024 * 1024)));
+ argv0, ((uint64_t)(mem_limit) + 512 * 1024) / (1024 * 1024));
// Using PRIu64 above instead of %zu to support pre-C99 libc.
exit(0);
}
@@ -196,20 +196,25 @@ str_to_size(const char *value)
if (*value != '\0') {
// Look for suffix.
static const struct {
- const char *name;
+ const char name[4];
size_t multiplier;
} suffixes[] = {
- { "k", 1000 },
- { "M", 1000000 },
- { "G", 1000000000 },
- { "Ki", 1024 },
- { "Mi", 1048576 },
- { "Gi", 1073741824 },
- { NULL, 0 }
+ { "k", 1000 },
+ { "kB", 1000 },
+ { "M", 1000000 },
+ { "MB", 1000000 },
+ { "G", 1000000000 },
+ { "GB", 1000000000 },
+ { "Ki", 1024 },
+ { "KiB", 1024 },
+ { "Mi", 1048576 },
+ { "MiB", 1048576 },
+ { "Gi", 1073741824 },
+ { "GiB", 1073741824 }
};
size_t multiplier = 0;
- for (size_t i = 0; suffixes[i].name != NULL; ++i) {
+ for (size_t i = 0; i < ARRAY_SIZE(suffixes); ++i) {
if (strcmp(value, suffixes[i].name) == 0) {
multiplier = suffixes[i].multiplier;
break;
@@ -224,9 +229,9 @@ str_to_size(const char *value)
// Don't overflow here either.
if (result > SIZE_MAX / multiplier)
- return SIZE_MAX;
-
- result *= multiplier;
+ result = SIZE_MAX;
+ else
+ result *= multiplier;
}
return result;