From a6039e38a42cc977f7f9da3dcc69e7f98317b4c1 Mon Sep 17 00:00:00 2001 From: Sören Tempel Date: Thu, 11 Oct 2018 13:39:25 +0200 Subject: Humanize size output of `apk info` This commits adds a function for receiving the closet byte unit and the size in that unit for a given size_t. The function doesn't return a string since dynamic memory allocation (or a static buffer) would be required to implement this properly. Discussion: It might be useful to add a command line flag for disabling this behaviour in order to retain compatibility with the previous apk info output format. --- src/info.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/info.c') diff --git a/src/info.c b/src/info.c index 9a37e1e..836e61f 100644 --- a/src/info.c +++ b/src/info.c @@ -179,12 +179,16 @@ static void info_print_license(struct apk_database *db, struct apk_package *pkg) static void info_print_size(struct apk_database *db, struct apk_package *pkg) { + off_t size; + const char *size_unit; + + size_unit = apk_get_human_size(pkg->installed_size, &size); if (apk_verbosity > 1) - printf("%s: %zu", pkg->name->name, pkg->installed_size); + printf("%s: %lld %s", pkg->name->name, + (long long)size, size_unit); else - printf(PKG_VER_FMT " installed size:\n%zu\n", - PKG_VER_PRINTF(pkg), - pkg->installed_size); + printf(PKG_VER_FMT " installed size:\n%lld %s\n", + PKG_VER_PRINTF(pkg), (long long)size, size_unit); } static void info_print_dep_array(struct apk_database *db, struct apk_package *pkg, -- cgit v1.2.3-60-g2f50