mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-09-28 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix rounding carry in coolsize() (#91)

Browse source 
Sizes like 1.999 get rounded to (1 + 100/100), which should be displayed
as 2.00 not 1.100 as simple %i.%02i would do without additional measures.
This commit is contained in:
Alex Suykov 2018-03-04 21:18:10 +02:00 committed by Arun Prakash Jana
parent 3036b8a733
commit 7654a2e0c6
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nnn.c
View file

@ -1442,6 +1442,7 @@ coolsize(off_t size)
static char size_buf[12]; /* Buffer to hold human readable size */ static char size_buf[12]; /* Buffer to hold human readable size */
static int rem, i; static int rem, i;
static int fdig; /* number of fractional digits to show */ static int fdig; /* number of fractional digits to show */
static int frac;
i = 0; i = 0;
rem = 0; rem = 0;
@ -1452,12 +1453,16 @@ coolsize(off_t size)
++i; ++i;
} }
rem = (1000 * rem) >> 10; /* convert 1024th fractions to 1000th */
fdig = 3; fdig = 3;
frac = 1000;
rem = (10000 * rem) >> 10; /* convert 1024th fractions to 10000th */
rem = (rem / 10) + (rem % 10 >= 5 ? 1 : 0); /* round to 1000th */
/* Show 1 decimal for KB sizes and 2 decimals for MBs. */ /* Show 1 decimal for KB sizes and 2 decimals for MBs. */
if (i < 3) { --fdig; rem = (rem + 5) / 10; } if (i < 3) { --fdig; rem = (rem + 5) / 10; frac /= 10; }
if (i < 2) { --fdig; rem = (rem + 5) / 10; } if (i < 2) { --fdig; rem = (rem + 5) / 10; frac /= 10; }
/* carry, in case rounding above overflows the fractional part */
if (i < 3 && rem >= frac) { size++; rem = 0; }
if (i > 0) if (i > 0)
snprintf(size_buf, 12, "%" PRId64 ".%0*i%c", size, fdig, rem, U[i]); snprintf(size_buf, 12, "%" PRId64 ".%0*i%c", size, fdig, rem, U[i]);