hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-26 10:53:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Output "human-readable" values with a non-0 precision where

Browse Source 
appropriate.  Before this, a 2.9 GB file was misleadingly reported as
"2G".  This mostly brings unit_adjust() in line with what is in du(1).

Reviewed by:	jmallett
Approved by:	nik
This commit is contained in:
Dima Dorfman 2002-10-18 04:06:59 +00:00
parent 64ac587b8a
commit 598420ee63
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=105375
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/ls/print.c
View File

@ -93,7 +93,7 @@ static unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TE
typedef enum {
NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX
} unit_t;
static unit_t unit_adjust(off_t *);
static unit_t unit_adjust(double *);
static int unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA};
@ -602,16 +602,18 @@ printlink(FTSENT *p)
static void
printsize(size_t width, off_t bytes)
{
double dbytes;
unit_t unit;
if (f_humanval) {
unit = unit_adjust(&bytes);
dbytes = bytes;
unit = unit_adjust(&dbytes);
if (bytes == 0)
if (dbytes == 0)
(void)printf("%*s ", width, "0B");
else
(void)printf("%*lld%c ", width - 1, bytes,
"BKMGTPE"[unit]);
(void)printf("%*.*f%c ", width - 1, dbytes > 10 ? 0 : 1,
dbytes, "BKMGTPE"[unit]);
} else
(void)printf("%*lld ", width, bytes);
}
@ -623,13 +625,13 @@ printsize(size_t width, off_t bytes)
*
*/
unit_t
unit_adjust(off_t *val)
unit_adjust(double *val)
{
double abval;
unit_t unit;
unsigned int unit_sz;
abval = fabs((double)*val);
abval = fabs(*val);
unit_sz = abval ? ilogb(abval) / 10 : 0;