summaryrefslogtreecommitdiff
path: root/sbin/modstat
diff options
context:
space:
mode:
authornonaka <nonaka@NetBSD.org>2011-06-03 15:34:46 +0000
committernonaka <nonaka@NetBSD.org>2011-06-03 15:34:46 +0000
commit4ad790a8901af2e2cd573be40926cfc2daf6c8a6 (patch)
tree28230c8293dc2f5d1bf97da2905c7028b10b9667 /sbin/modstat
parent97e1eee640fb6e4f575aa85503bd3a9bfe01ffe6 (diff)
fix output format for long module name.
Diffstat (limited to 'sbin/modstat')
-rw-r--r--sbin/modstat/main.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/sbin/modstat/main.c b/sbin/modstat/main.c
index e5309af8732..73f3360dd0f 100644
--- a/sbin/modstat/main.c
+++ b/sbin/modstat/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.11 2010/12/13 20:48:45 pooka Exp $ */
+/* $NetBSD: main.c,v 1.12 2011/06/03 15:34:46 nonaka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.11 2010/12/13 20:48:45 pooka Exp $");
+__RCSID("$NetBSD: main.c,v 1.12 2011/06/03 15:34:46 nonaka Exp $");
#endif /* !lint */
#include <sys/module.h>
@@ -71,6 +71,7 @@ main(int argc, char **argv)
const char *name;
char sbuf[32];
int ch;
+ size_t maxnamelen = 16, i;
name = NULL;
@@ -106,10 +107,15 @@ main(int argc, char **argv)
len = iov.iov_len;
}
- printf("%-16s %-10s %-10s %-5s %-8s %s\n",
- "NAME", "CLASS", "SOURCE", "REFS", "SIZE", "REQUIRES");
len = iov.iov_len / sizeof(modstat_t);
qsort(iov.iov_base, len, sizeof(modstat_t), modstatcmp);
+ for (i = 0, ms = iov.iov_base; i < len; i++, ms++) {
+ size_t namelen = strlen(ms->ms_name);
+ if (maxnamelen < namelen)
+ maxnamelen = namelen;
+ }
+ printf("%-*s %-10s %-10s %-5s %-8s %s\n",
+ maxnamelen, "NAME", "CLASS", "SOURCE", "REFS", "SIZE", "REQUIRES");
for (ms = iov.iov_base; len != 0; ms++, len--) {
const char *class;
const char *source;
@@ -136,8 +142,8 @@ main(int argc, char **argv)
else
source = "UNKNOWN";
- printf("%-16s %-10s %-10s %-5d %-8s %s\n",
- ms->ms_name, class, source, ms->ms_refcnt, sbuf,
+ printf("%-*s %-10s %-10s %-5d %-8s %s\n",
+ maxnamelen, ms->ms_name, class, source, ms->ms_refcnt, sbuf,
ms->ms_required);
}