Re: [dev] [PATCH] [sbase] Adding human readable output to du

From: Jeffrey Picard <jeff_AT_jeffreypicard.com>
Date: Fri, 17 Oct 2014 12:52:40 -0400

On Oct 16, 2014, at 5:08 AM, Dimitris Papastamos <sin_AT_2f30.org> wrote:

> On Wed, Oct 15, 2014 at 08:35:46PM -0400, Jeffrey Picard wrote:
>> Hey all,
>>
>> I was poking around at du recently and noticed it doesn�t support human readable output. This is pretty easy to add however, at most in a simplistic form which just rounds the number of bytes down to the nearest increment of the highest power of 1024 that�s appropriate. If there�s interest in this, I�d also be happy to implement it in for df in ubase.
>
> Applied thanks! Would be nice to have this in df(1) as well.
>
> Can you generate the next pull request with dropbox format-pull request and attach
> it here?
>
> Cheers,
> sin
>

Here�s the pull request for df. It was a little less non-trivial than for du, I moved a couple things around and also added the the -k flag. Let me know if anything doesn�t conform to the correct style or organization idioms.

�Jeffrey Picard

---
 df.c |   70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 63 insertions(+), 7 deletions(-)
diff --dropbox a/df.c b/df.c
index 07b0e15..bff5c14 100644
--- a/df.c
+++ b/df.c
_AT__AT_ -8,6 +8,11 @@
 #include "util.h"
+static long blksize = 512;
+static int aflag = 0;
+static int hflag = 0;
+static int kflag = 0;
+
 static void mnt_show(const char *fsname, const char *dir);
 static void
_AT__AT_ -21,21 +26,31 @@ main(int argc, char *argv[])
 {
 	struct mntent *me = NULL;
 	FILE *fp;
-	int aflag = 0;
 	ARGBEGIN {
 	case 'a':
 		aflag = 1;
 		break;
-	case 's':
 	case 'h':
+		hflag = 1;
+		break;
+	case 'k':
+		kflag = 1;
+		blksize = 1024;
+		break;
+	case 's':
 	case 'i':
 		eprintf("not implemented\n");
 	default:
 		usage();
 	} ARGEND;
-	printf("Filesystem  512-blocks      Used     Avail Capacity  Mounted on\n");
+	if (hflag)
+		printf("Filesystem         Size       Used      "
+		       "Avail Capacity   Mounted on\n");
+	else
+		printf("Filesystem  %ld-blocks      Used     "
+		       "Avail Capacity  Mounted on\n", blksize);
 	fp = setmntent("/proc/mounts", "r");
 	if (!fp)
_AT__AT_ -51,6 +66,45 @@ main(int argc, char *argv[])
 	return 0;
 }
+#define CALC_POWER(n, power, base, i) do { \
+	while (n > power) {                \
+		power = power * base;      \
+		i++;                       \
+	}                                  \
+} while(0)
+
+static void
+print_human(
+	const char         *fsname,
+	unsigned long long total,
+	unsigned long long used,
+	unsigned long long avail,
+	int                capacity,
+	const char         *dir)
+{
+	long base = 1024;
+	unsigned long long power_total = base;
+	unsigned long long power_used = base;
+	unsigned long long power_avail = base;
+	char postfixes[] = {'B', 'K', 'M', 'G', 'T', 'P', 'E'};
+	int i = 0, j = 0, k = 0;
+
+	total = total * blksize;
+	used = used * blksize;
+	avail = avail * blksize;
+
+	CALC_POWER(total, power_total, base, i);
+	CALC_POWER(used, power_used, base, j);
+	CALC_POWER(avail, power_avail, base, k);
+
+	total = i ? total / (power_total / base) : total;
+	used = j ? used / (power_used / base) : used;
+	avail = k ? avail / (power_avail / base) : avail;
+	printf("%-12s %9llu%c %9llu%c %9llu%c %7d%%  %s\n",
+	       fsname, total, postfixes[i], used, postfixes[j],
+	       avail, postfixes[k], capacity, dir);
+}
+
 static void
 mnt_show(const char *fsname, const char *dir)
 {
_AT__AT_ -61,7 +115,7 @@ mnt_show(const char *fsname, const char *dir)
 	statvfs(dir, &s);
-	bs = s.f_frsize / 512;
+	bs = s.f_frsize / blksize;
 	total = s.f_blocks * bs;
 	avail = s.f_bfree * bs;
 	used = total - avail;
_AT__AT_ -72,7 +126,9 @@ mnt_show(const char *fsname, const char *dir)
 			capacity++;
 	}
-	printf("%-12s %9llu %9llu %9llu %7d%%  %s\n",
-	       fsname, total, used, avail, capacity,
-	       dir);
+	if (hflag)
+		print_human(fsname, total, used, avail, capacity, dir);
+	else
+		printf("%-12s %9llu %9llu %9llu %7d%%  %s\n",
+		       fsname, total, used, avail, capacity, dir);
 }
--
1.7.1

Received on Fri Oct 17 2014 - 18:52:40 CEST