diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-02 13:28:05 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-02 13:59:02 -0500 |
| commit | 840292befd6ad78e018f5ea16bec80e83d910071 (patch) | |
| tree | d98d75d5f2e8d9bfa7ceba880ebef23056ee51ef /src/shared/util.c | |
| parent | 9480794b277b5ce33e467578ed669996df576bb9 (diff) | |
Disallow sizes with increasing unit size
Things like 3B4T, 4B50B, 400 100 (meaning 4*1024**4+3, 54, and 500,
respectively) are now disallowed. It is necessary to say 4T3B, 54B,
500 instead. I think this was confusing and error prone.
As a special form, 400B 100 is allowed, i.e. "B" suffix is treated
as different from "", although they mean the same thing.
Diffstat (limited to 'src/shared/util.c')
| -rw-r--r-- | src/shared/util.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 3164515a9e..285a263cdb 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -2157,31 +2157,31 @@ int parse_size(const char *t, off_t base, off_t *size) { }; static const struct table iec[] = { - { "B", 1 }, - { "K", 1024ULL }, - { "M", 1024ULL*1024ULL }, - { "G", 1024ULL*1024ULL*1024ULL }, - { "T", 1024ULL*1024ULL*1024ULL*1024ULL }, - { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL }, { "E", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL*1024ULL }, + { "P", 1024ULL*1024ULL*1024ULL*1024ULL*1024ULL }, + { "T", 1024ULL*1024ULL*1024ULL*1024ULL }, + { "G", 1024ULL*1024ULL*1024ULL }, + { "M", 1024ULL*1024ULL }, + { "K", 1024ULL }, + { "B", 1 }, { "", 1 }, }; static const struct table si[] = { - { "B", 1 }, - { "K", 1000ULL }, - { "M", 1000ULL*1000ULL }, - { "G", 1000ULL*1000ULL*1000ULL }, - { "T", 1000ULL*1000ULL*1000ULL*1000ULL }, - { "P", 1000ULL*1000ULL*1000ULL*1000ULL*1000ULL }, { "E", 1000ULL*1000ULL*1000ULL*1000ULL*1000ULL*1000ULL }, + { "P", 1000ULL*1000ULL*1000ULL*1000ULL*1000ULL }, + { "T", 1000ULL*1000ULL*1000ULL*1000ULL }, + { "G", 1000ULL*1000ULL*1000ULL }, + { "M", 1000ULL*1000ULL }, + { "K", 1000ULL }, + { "B", 1 }, { "", 1 }, }; const struct table *table; const char *p; unsigned long long r = 0; - unsigned n_entries; + unsigned n_entries, start_pos = 0; assert(t); assert(base == 1000 || base == 1024); @@ -2235,7 +2235,7 @@ int parse_size(const char *t, off_t base, off_t *size) { e += strspn(e, WHITESPACE); - for (i = 0; i < n_entries; i++) + for (i = start_pos; i < n_entries; i++) if (startswith(e, table[i].suffix)) { unsigned long long tmp; if ((unsigned long long) l + (frac > 0) > ULLONG_MAX / table[i].factor) @@ -2249,6 +2249,8 @@ int parse_size(const char *t, off_t base, off_t *size) { return -ERANGE; p = e + strlen(table[i].suffix); + + start_pos = i + 1; break; } |