From 991d64ece898f927d7fc5780ac1ba095e4d202ff Mon Sep 17 00:00:00 2001
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 24 May 2004 22:52:32 +0000
Subject: [PATCH] In verbose mode print disk sizes in human readable form as
 well.

OK'ed by:	phk
---
 usr.sbin/diskinfo/Makefile   | 3 +++
 usr.sbin/diskinfo/diskinfo.c | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile
index 1c569875b0b..5ffa27f6f0d 100644
--- a/usr.sbin/diskinfo/Makefile
+++ b/usr.sbin/diskinfo/Makefile
@@ -5,6 +5,9 @@ MAN=	diskinfo.8
 
 WARNS?=	5
 
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
+
 .include <bsd.prog.mk>
 
 test:	${PROG}
diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c
index 986ad24d33f..49ef474e1ff 100644
--- a/usr.sbin/diskinfo/diskinfo.c
+++ b/usr.sbin/diskinfo/diskinfo.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <libutil.h>
 #include <paths.h>
 #include <err.h>
 #include <sys/disk.h>
@@ -110,10 +111,13 @@ main(int argc, char **argv)
 				printf("\t%u", fwsectors);
 			} 
 		} else {
+			humanize_number(buf, 6 - (mediasize < 0 ? 0 : 1),
+			    (int64_t)mediasize, "",
+			    HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
 			printf("%s\n", argv[i]);
 			printf("\t%-12u\t# sectorsize\n", sectorsize);
-			printf("\t%-12jd\t# mediasize in bytes\n",
-			    (intmax_t)mediasize);
+			printf("\t%-12jd\t# mediasize in bytes (%s)\n",
+			    (intmax_t)mediasize, buf);
 			printf("\t%-12jd\t# mediasize in sectors\n",
 			    (intmax_t)mediasize/sectorsize);
 			if (fwsectors != 0 && fwheads != 0) {
-- 
2.45.0