diff options
author | Jim Meyering <jim@meyering.net> | 1999-05-17 13:03:46 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1999-05-17 13:03:46 +0000 |
commit | 1ee4fffc88d88a91e817eaf2e2f741194192e15a (patch) | |
tree | e1842ec22f941d2def9725ae4a962675d1d650ba | |
parent | 4fd5e023370836fadb619de050d3d04dacdd1382 (diff) | |
download | coreutils-1ee4fffc88d88a91e817eaf2e2f741194192e15a.tar.xz |
(human_readable): Allow from_block_size to be zero.
-rw-r--r-- | lib/human.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/human.c b/lib/human.c index 86b33e819..7b923dc89 100644 --- a/lib/human.c +++ b/lib/human.c @@ -76,7 +76,7 @@ static const char suffixes[] = /* Convert N to a human readable format in BUF. N is expressed in units of FROM_BLOCK_SIZE. FROM_BLOCK_SIZE must - be positive. + be nonnegative. If OUTPUT_BLOCK_SIZE is positive, use units of OUTPUT_BLOCK_SIZE in the output number. OUTPUT_BLOCK_SIZE must be a multiple of @@ -101,7 +101,7 @@ human_readable (uintmax_t n, char *buf, uintmax_t amt; int base; int to_block_size; - int tenths; + int tenths = 0; int power; char *p; @@ -109,7 +109,7 @@ human_readable (uintmax_t n, char *buf, 1 means AMT.TENTHS < adjusted N < AMT.TENTHS + 0.05; 2 means adjusted N == AMT.TENTHS + 0.05; 3 means AMT.TENTHS + 0.05 < adjusted N < AMT.TENTHS + 0.1. */ - int rounding; + int rounding = 0; if (output_block_size < 0) { @@ -136,7 +136,6 @@ human_readable (uintmax_t n, char *buf, { int multiplier = from_block_size / to_block_size; amt = n * multiplier; - tenths = rounding = 0; if (amt / multiplier != n) { @@ -172,6 +171,8 @@ human_readable (uintmax_t n, char *buf, return buf; } } + else if (from_block_size == 0) + amt = 0; else { int divisor = to_block_size / from_block_size; |