diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-06-25 17:04:30 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-06-25 17:04:30 +0000 |
| commit | ea230021d34a107f820c818bc565b61a3aa946c3 (patch) | |
| tree | b687231d23ab305da10a935705213363204a355c /usr.sbin/pstat | |
| parent | 55fe185ec48e6997502b09d21702230957147d38 (diff) | |
handle no swap case
Diffstat (limited to 'usr.sbin/pstat')
| -rw-r--r-- | usr.sbin/pstat/pstat.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c index 91008d85b2a..5388c6de08e 100644 --- a/usr.sbin/pstat/pstat.c +++ b/usr.sbin/pstat/pstat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pstat.c,v 1.16 1997/11/09 22:03:29 millert Exp $ */ +/* $OpenBSD: pstat.c,v 1.17 1998/06/25 17:04:29 deraadt Exp $ */ /* $NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $ */ /*- @@ -44,7 +44,7 @@ static char copyright[] = #if 0 from: static char sccsid[] = "@(#)pstat.c 8.9 (Berkeley) 2/16/94"; #else -static char *rcsid = "$OpenBSD: pstat.c,v 1.16 1997/11/09 22:03:29 millert Exp $"; +static char *rcsid = "$OpenBSD: pstat.c,v 1.17 1998/06/25 17:04:29 deraadt Exp $"; #endif #endif /* not lint */ @@ -949,18 +949,34 @@ void swapmode() { char *header; - int hlen, nswap, nswdev, dmmax, nswapmap, niswap, niswdev; + int hlen = 10, nswap, nswdev, dmmax, nswapmap, niswap, niswdev; int s, e, div, i, l, avail, nfree, npfree, used; struct swdevt *sw; long blocksize, *perdev; struct map *swapmap, *kswapmap; struct mapent *mp; + if (kflag) { + header = "1K-blocks"; + blocksize = 1024; + hlen = strlen(header); + } else + header = getbsize(&hlen, &blocksize); + KGET(VM_NSWAP, nswap); KGET(VM_NSWDEV, nswdev); KGET(VM_DMMAX, dmmax); KGET(VM_NSWAPMAP, nswapmap); KGET(VM_SWAPMAP, kswapmap); /* kernel `swapmap' is a pointer */ + if (nswap == 0) { + if (!totalflag) + (void)printf("%-11s %*s %8s %8s %8s %s\n", + "Device", hlen, header, + "Used", "Avail", "Capacity", "Type"); + (void)printf("%-11s %*d %8d %8d %5.0f%%\n", + "Total", hlen, 0, 0, 0, 0); + return; + } if ((sw = malloc(nswdev * sizeof(*sw))) == NULL || (perdev = malloc(nswdev * sizeof(*perdev))) == NULL || (mp = malloc(nswapmap * sizeof(*mp))) == NULL) @@ -1040,12 +1056,6 @@ swapmode() } } - if (kflag) { - header = "1K-blocks"; - blocksize = 1024; - hlen = strlen(header); - } else - header = getbsize(&hlen, &blocksize); if (!totalflag) (void)printf("%-11s %*s %8s %8s %8s %s\n", "Device", hlen, header, |