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

Use libprocstat(3) when retrieving binary information for a process.

Browse Source 
MFC after:	1 month
This commit is contained in:
Mikolaj Golub 2013-04-20 08:05:04 +00:00
parent eec6cb1cf2
commit 66e2f9998b
3 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/procstat/procstat.c
View File

@ -59,7 +59,7 @@ procstat(struct procstat *prstat, struct kinfo_proc *kipp)
{
if (bflag)
procstat_bin(kipp);
procstat_bin(prstat, kipp);
else if (cflag)
procstat_args(kipp);
else if (eflag)

2
usr.bin/procstat/procstat.h
View File

@ -37,7 +37,7 @@ void kinfo_proc_sort(struct kinfo_proc *kipp, int count);
void procstat_args(struct kinfo_proc *kipp);
void procstat_auxv(struct kinfo_proc *kipp);
void procstat_basic(struct kinfo_proc *kipp);
void procstat_bin(struct kinfo_proc *kipp);
void procstat_bin(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_cred(struct procstat *prstat, struct kinfo_proc *kipp);
void procstat_env(struct kinfo_proc *kipp);
void procstat_files(struct procstat *prstat, struct kinfo_proc *kipp);

33
usr.bin/procstat/procstat_bin.c
View File

@ -40,40 +40,19 @@
#include "procstat.h"
void
procstat_bin(struct kinfo_proc *kipp)
procstat_bin(struct procstat *prstat, struct kinfo_proc *kipp)
{
char pathname[PATH_MAX];
int error, osrel, name[4];
size_t len;
int osrel;
static char pathname[PATH_MAX];
if (!hflag)
printf("%5s %-16s %8s %s\n", "PID", "COMM", "OSREL", "PATH");
name[0] = CTL_KERN;
name[1] = KERN_PROC;
name[2] = KERN_PROC_PATHNAME;
name[3] = kipp->ki_pid;
len = sizeof(pathname);
error = sysctl(name, 4, pathname, &len, NULL, 0);
if (error < 0 && errno != ESRCH) {
warn("sysctl: kern.proc.pathname: %d", kipp->ki_pid);
if (procstat_getpathname(prstat, kipp, pathname, sizeof(pathname)) != 0)
return;
}
if (error < 0)
return;
if (len == 0 || strlen(pathname) == 0)
if (strlen(pathname) == 0)
strcpy(pathname, "-");
name[2] = KERN_PROC_OSREL;
len = sizeof(osrel);
error = sysctl(name, 4, &osrel, &len, NULL, 0);
if (error < 0 && errno != ESRCH) {
warn("sysctl: kern.proc.osrel: %d", kipp->ki_pid);
return;
}
if (error < 0)
if (procstat_getosrel(prstat, kipp, &osrel) != 0)
return;
printf("%5d ", kipp->ki_pid);