d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from Lite2 (print "??" instead NULL if devname() fails). More

Browse Source 
faithful stealing from pstat would have given this already.
This commit is contained in:
bde 1997-07-06 04:37:22 +00:00
parent 6fb9612d46
commit ec05f8c40b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/systat/swap.c
View File

@ -32,7 +32,11 @@
*/
#ifndef lint
static char sccsid[] = "@(#)swap.c 8.2 (Berkeley) 2/21/94";
#if 0
static char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95";
#endif
static const char rcsid[] =
"$Id$";
#endif /* not lint */
/*
@ -55,7 +59,6 @@ static char sccsid[] = "@(#)swap.c 8.2 (Berkeley) 2/21/94";
#include "systat.h"
#include "extern.h"
extern char *devname __P((int, int));
extern char *getbsize __P((int *headerlenp, long *blocksizep));
void showspace __P((char *header, int hlen, long blocksize));
@ -198,7 +201,7 @@ fetchswap()
void
labelswap()
{
char *header;
char *header, *p;
int row, i;
row = 0;
@ -210,9 +213,10 @@ labelswap()
for (i = 0; i < nswdev; i++) {
if (!sw[i].sw_freed)
continue;
p = devname(sw[i].sw_dev, S_IFBLK);
mvwprintw(wnd, i + 1, 0, "%-5s",
sw[i].sw_dev != NODEV?
devname(sw[i].sw_dev, S_IFBLK): "[NFS]");
sw[i].sw_dev == NODEV ? "[NFS]" :
p == NULL ? "??" : p);
}
}