From af565b58fabdfdefea4fcbfdaab7971ef659be2b Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Wed, 26 May 2004 11:08:35 +0000 Subject: [PATCH] Print provider's size in human-readable form as well. --- sbin/geom/core/Makefile | 4 ++-- sbin/geom/core/geom.c | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sbin/geom/core/Makefile b/sbin/geom/core/Makefile index d17d51a05fb2..2790e04205d5 100644 --- a/sbin/geom/core/Makefile +++ b/sbin/geom/core/Makefile @@ -9,7 +9,7 @@ SRCS= geom.c subr.c CFLAGS+= -DCLASSDIR=\"${CLASSDIR}\" CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/.. -DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} -LDADD= -lgeom -lsbuf -lbsdxml +DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBSBUF} ${LIBUTIL} +LDADD= -lbsdxml -lgeom -lsbuf -lutil .include diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c index 963b1bc000fb..4a2d1cc9320f 100644 --- a/sbin/geom/core/geom.c +++ b/sbin/geom/core/geom.c @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -586,10 +587,13 @@ static void show_one(struct gprovider *pp) { struct gconfig *conf; + char buf[5]; printf(" NAME: %s\n", pp->lg_name); printf(" geom name: %s\n", pp->lg_geom->lg_name); - printf(" mediasize: %jd\n", (intmax_t)pp->lg_mediasize); + humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "", + HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); + printf(" mediasize: %jd (%s)\n", (intmax_t)pp->lg_mediasize, buf); printf(" sectorsize: %u\n", pp->lg_sectorsize); printf(" mode: %s\n", pp->lg_mode); LIST_FOREACH(conf, &pp->lg_config, lg_config) {