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

- Make pstat(8) WARNS=6 safe.

Browse Source 
- While here, eliminate the check for len > 0 in ttymode_sysctl
  as the code is able to handle this case well.

Reviewed by:	ed (initial version)
This commit is contained in:
Stanislav Sedov 2009-06-11 17:03:28 +00:00
parent c3ea428a25
commit 52074d389f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=194014
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/pstat/Makefile
View File

@ -6,7 +6,7 @@ LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo
MAN= pstat.8
MLINKS= pstat.8 swapinfo.8
WARNS?= 3
WARNS?= 6
DPADD= ${LIBKVM} ${LIBUTIL}
LDADD= -lkvm -lutil

53
usr.sbin/pstat/pstat.c
View File

@ -76,16 +76,22 @@ enum {
NL_CONSTTY,
NL_MAXFILES,
NL_NFILES,
NL_TTY_LIST
NL_TTY_LIST,
NL_MARKER
};
static struct nlist nl[] = {
{ .n_name = "_constty" },
{ .n_name = "_maxfiles" },
{ .n_name = "_openfiles" },
{ .n_name = "_tty_list" },
{ .n_name = "" }
static struct {
int order;
const char *name;
} namelist[] = {
{ NL_CONSTTY, "_constty" },
{ NL_MAXFILES, "_maxfiles" },
{ NL_NFILES, "_openfiles" },
{ NL_TTY_LIST, "_tty_list" },
{ NL_MARKER, "" },
};
#define NNAMES (sizeof(namelist) / sizeof(*namelist))
static struct nlist nl[NNAMES];
static int humanflag;
static int usenumflag;
@ -98,7 +104,7 @@ static kvm_t *kd;
static const char *usagestr;
static void filemode(void);
static int getfiles(char **, size_t *);
static int getfiles(struct xfile **, size_t *);
static void swapmode(void);
static void ttymode(void);
static void ttyprt(struct xtty *);
@ -107,8 +113,9 @@ static void usage(void);
int
main(int argc, char *argv[])
{
int ch, i, quit, ret;
int ch, quit, ret;
int fileflag, ttyflag;
unsigned int i;
char buf[_POSIX2_LINE_MAX];
const char *opts;
@ -170,6 +177,12 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
/*
* Initialize symbol names list.
*/
for (i = 0; i < NNAMES; i++)
nl[namelist[i].order].n_name = strdup(namelist[i].name);
if (memf != NULL) {
kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf);
if (kd == NULL)
@ -253,12 +266,12 @@ ttymode_kvm(void)
static void
ttymode_sysctl(void)
{
struct xtty *xt, *end;
void *xttys;
struct xtty *xttys;
size_t len;
unsigned int i, n;
(void)printf("%s", hdr);
if ((xttys = malloc(len = sizeof *xt)) == NULL)
if ((xttys = malloc(len = sizeof(*xttys))) == NULL)
err(1, "malloc()");
while (sysctlbyname("kern.ttys", xttys, &len, 0, 0) == -1) {
if (errno != ENOMEM)
@ -267,11 +280,9 @@ ttymode_sysctl(void)
if ((xttys = realloc(xttys, len)) == NULL)
err(1, "realloc()");
}
if (len > 0) {
end = (struct xtty *)((char *)xttys + len);
for (xt = xttys; xt < end; xt++)
ttyprt(xt);
}
n = len / sizeof(*xttys);
for (i = 0; i < n; i++)
ttyprt(&xttys[i]);
}
static void
@ -355,8 +366,8 @@ ttyprt(struct xtty *xt)
static void
filemode(void)
{
struct xfile *fp;
char *buf, flagbuf[16], *fbp;
struct xfile *fp, *buf;
char flagbuf[16], *fbp;
int maxf, openf;
size_t len;
static char const * const dtypes[] = { "???", "inode", "socket",
@ -413,11 +424,11 @@ filemode(void)
}
static int
getfiles(char **abuf, size_t *alen)
getfiles(struct xfile **abuf, size_t *alen)
{
struct xfile *buf;
size_t len;
int mib[2];
char *buf;
/*
* XXX