sbase

commit b6b8fe9591b4e16e0c262965cc48ea6fe1f9ebfc
parent ff93350289a96308e73cc5d7ab1d689d08ea0efc
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sat, 18 Oct 2014 21:25:00 +0000

separate humansize into a util function

also show 1 decimal of human size string like: 4M -> 4.4M

Diffstat:
M
Makefile
 | 
1
+
M
du.c
 | 
20
+-------------------
M
util.h
 | 
1
+
A
util/human.c
 | 
21
+++++++++++++++++++++

4 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
@@ -17,6 +17,7 @@ LIB = \
 	util/estrtol.o   \
 	util/fnck.o      \
 	util/getlines.o  \
+	util/human.o     \
 	util/md5.o       \
 	util/mode.o      \
 	util/putword.o   \
diff --git a/du.c b/du.c
@@ -86,28 +86,10 @@ main(int argc, char *argv[])
 }
 
 static void
-print_human(long n, char *path)
-{
-	long base = 1024;
-	long power = base;
-	char postfixes[] = {'B', 'K', 'M', 'G', 'T', 'P', 'E'};
-	int i = 0;
-
-	n = n * blksize;
-	while (n > power) {
-		power = power*base;
-		i++;
-	}
-
-	n = i ? n / (power / base) : n;
-	printf("%lu%c\t%s\n", n, postfixes[i], path);
-}
-
-static void
 print(long n, char *path)
 {
 	if (hflag)
-		print_human(n, path);
+		printf("%s\t%s\n", humansize(n * blksize), path);
 	else
 		printf("%lu\t%s\n", n, path);
 }
diff --git a/util.h b/util.h
@@ -20,6 +20,7 @@ void enprintf(int, const char *, ...);
 double estrtod(const char *);
 long estrtol(const char *, int);
 void fnck(const char *, const char *, int (*)(const char *, const char *));
+char *humansize(double);
 void putword(const char *);
 void recurse(const char *, void (*)(const char *));
 #undef strlcat
diff --git a/util/human.c b/util/human.c
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <string.h>
+
+#include "../util.h"
+
+char *
+humansize(double n)
+{
+	static char buf[16];
+	const char postfixes[] = " KMGTPE";
+	size_t i;
+
+	for(i = 0; n >= 1024 && i < strlen(postfixes); i++)
+		n /= 1024;
+
+	if(!i)
+		snprintf(buf, sizeof(buf), "%lu%c", (unsigned long)n, postfixes[i]);
+	else
+		snprintf(buf, sizeof(buf), "%.1f%c", n, postfixes[i]);
+	return buf;
+}