emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'heftig/procps-fix-free-h-si'

Browse Source 
References:
 procps-ng/procps!140
 procps-ng/procps#133
This commit is contained in:
Craig Small 2021-06-16 19:45:31 +10:00
commit 48b977f2dc
1 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
free.c
View File

@ -107,73 +107,52 @@ double power(unsigned int base, unsigned int expo)
/* idea of this function is copied from top size scaling */ /* idea of this function is copied from top size scaling */
static const char *scale_size(unsigned long size, int flags, struct commandline_arguments args) static const char *scale_size(unsigned long size, int flags, struct commandline_arguments args)
{ {
static char nextup[] = { 'B', 'K', 'M', 'G', 'T', 'P', 0 }; static char up[] = { 'B', 'K', 'M', 'G', 'T', 'P', 0 };
static char buf[BUFSIZ]; static char buf[BUFSIZ];
int i; int i;
char *up;
float base; float base;
long long bytes;
if (flags & FREE_SI) base = (flags & FREE_SI) ? 1000.0 : 1024.0;
base = 1000.0; bytes = size * 1024LL;
else
base = 1024.0;
/* default output */
if (args.exponent == 0 && !(flags & FREE_HUMANREADABLE)) {
snprintf(buf, sizeof(buf), "%ld", size);
return buf;
}
if (!(flags & FREE_HUMANREADABLE)) { if (!(flags & FREE_HUMANREADABLE)) {
if (args.exponent == 1) { switch (args.exponent) {
/* in bytes, which can not be in SI */ case 0:
snprintf(buf, sizeof(buf), "%lld", ((long long int)size) * 1024); /* default output */
snprintf(buf, sizeof(buf), "%ld", size);
return buf; return buf;
} case 1:
if (args.exponent > 1) { /* in bytes, which can not be in SI */
snprintf(buf, sizeof(buf), "%lld", bytes);
return buf;
default:
/* In desired scale. */ /* In desired scale. */
snprintf(buf, sizeof(buf), "%ld", snprintf(buf, sizeof(buf), "%ld",
(long int)((size * 1024.0) / power(base, args.exponent-1)) (long)(bytes / power(base, args.exponent-1)));
);
return buf; return buf;
} }
} }
/* human readable output */ /* human readable output */
up = nextup; if (4 >= snprintf(buf, sizeof(buf), "%lld%c", bytes, up[0]))
for (i = 1; up[0] != 0; i++, up++) { return buf;
switch (i) {
case 1: for (i = 1; up[i] != 0; i++) {
if (4 >= snprintf(buf, sizeof(buf), "%ld%c", (long)size * 1024, *up)) if (flags & FREE_SI) {
if (4 >= snprintf(buf, sizeof(buf), "%.1f%c",
(float)(bytes / power(base, i)), up[i]))
return buf;
if (4 >= snprintf(buf, sizeof(buf), "%ld%c",
(long)(bytes / power(base, i)), up[i]))
return buf;
} else {
if (5 >= snprintf(buf, sizeof(buf), "%.1f%ci",
(float)(bytes / power(base, i)), up[i]))
return buf;
if (5 >= snprintf(buf, sizeof(buf), "%ld%ci",
(long)(bytes / power(base, i)), up[i]))
return buf; return buf;
break;
case 2:
case 3:
case 4:
case 5:
case 6:
if (!(flags & FREE_SI)) {
if (5 >=
snprintf(buf, sizeof(buf), "%.1f%ci",
(float)((size / 1024) * base / power(base, i - 2)), *up))
return buf;
if (5 >=
snprintf(buf, sizeof(buf), "%ld%ci",
(long)((size / 1024) * base / power(base, i - 2)), *up))
return buf;
} else {
if (4 >=
snprintf(buf, sizeof(buf), "%.1f%c",
(float)((size / 1024) * base / power(base, i - 2)), *up))
return buf;
if (4 >=
snprintf(buf, sizeof(buf), "%ld%c",
(long)((size / 1024) * base / power(base, i - 2)), *up))
return buf;
}
break;
case 7:
break;
} }
} }
/* /*