summaryrefslogtreecommitdiff
path: root/libbb
diff options
context:
space:
mode:
authorEric Andersen2001-06-13 08:02:45 +0000
committerEric Andersen2001-06-13 08:02:45 +0000
commitf429baca868b7f62ffdeefbfce41abd677f97876 (patch)
tree64925420925deb361a2024b9b362e5c987334124 /libbb
parent17822cd60aaf9333a9895494edcf03a0037de54c (diff)
downloadbusybox-f429baca868b7f62ffdeefbfce41abd677f97876.zip
busybox-f429baca868b7f62ffdeefbfce41abd677f97876.tar.gz
I reworked make_human_readable_str so it now has a sane interface,
and then fixed up df, du, and ls to use the new interface. I also fixed up some formatting issues in ls while I was in there. -Erik
Diffstat (limited to 'libbb')
-rw-r--r--libbb/human_readable.c48
-rw-r--r--libbb/libbb.h2
2 files changed, 27 insertions, 23 deletions
diff --git a/libbb/human_readable.c b/libbb/human_readable.c
index ff21751..2cb8875 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -1,10 +1,8 @@
/* vi: set sw=4 ts=4: */
/*
- * Utility routines.
+ * make_human_readable_str
*
- * Copyright (C) tons of folks. Tracking down who wrote what
- * isn't something I'm going to worry about... If you wrote something
- * here, please feel free to acknowledge your work.
+ * Copyright (C) 1999-2001 Erik Andersen <andersee@debian.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,10 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
- *
*/
#include <stdio.h>
@@ -30,28 +24,38 @@
-const char *make_human_readable_str(unsigned long val, unsigned long hr)
+const char *make_human_readable_str(unsigned long size,
+ unsigned long block_size, unsigned long display_unit)
{
- int i=0;
static char str[10] = "\0";
- static const char strings[] = { 'k', 'M', 'G', 'T', 0 };
- unsigned long divisor = 1;
+ static const char strings[] = { 0, 'k', 'M', 'G', 'T', 0 };
- if(val == 0)
+ if(size == 0 || block_size == 0)
return("0");
- if(hr)
- snprintf(str, 9, "%ld", val/hr);
- else {
- while(val >= divisor && i <= 4) {
- divisor=divisor<<10, i++;
- }
- divisor=divisor>>10, i--;
- snprintf(str, 9, "%.1Lf%c", (long double)(val)/divisor, strings[i]);
+
+ if(display_unit) {
+ snprintf(str, 9, "%ld", (size/display_unit)*block_size);
+ } else {
+ /* Ok, looks like they want us to autoscale */
+ int i=0;
+ unsigned long divisor = 1;
+ long double result = size*block_size;
+ for(i=0; i <= 4; i++) {
+ divisor<<=10;
+ if (result <= divisor) {
+ divisor>>=10;
+ break;
+ }
+ }
+ result/=divisor;
+ if (result > 10)
+ snprintf(str, 9, "%.0Lf%c", result, strings[i]);
+ else
+ snprintf(str, 9, "%.1Lf%c", result, strings[i]);
}
return(str);
}
-
/* END CODE */
/*
Local Variables:
diff --git a/libbb/libbb.h b/libbb/libbb.h
index f24a381..893a9f0 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -198,12 +198,12 @@ struct sysinfo {
};
extern int sysinfo (struct sysinfo* info);
-const char *make_human_readable_str(unsigned long val, unsigned long not_hr);
enum {
KILOBYTE = 1024,
MEGABYTE = (KILOBYTE*1024),
GIGABYTE = (MEGABYTE*1024)
};
+const char *make_human_readable_str(unsigned long size, unsigned long block_size, unsigned long display_unit);
int ask_confirmation(void);
int klogctl(int type, char * b, int len);