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

Use procstat_getumask(3) for retrieving umaks information instead of

Browse Source 
direct sysctl.

MFC after:	1 month
This commit is contained in:
Mikolaj Golub 2013-04-20 07:58:20 +00:00
parent 5b9bcba971
commit 90a15eb9cb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=249673
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
usr.bin/procstat/procstat_cred.c
View File

@ -38,7 +38,8 @@
#include "procstat.h" #include "procstat.h"
static const char *get_umask(struct kinfo_proc *kipp); static const char *get_umask(struct procstat *procstat,
struct kinfo_proc *kipp);
void void
procstat_cred(struct procstat *procstat, struct kinfo_proc *kipp) procstat_cred(struct procstat *procstat, struct kinfo_proc *kipp)
@ -59,7 +60,7 @@ procstat_cred(struct procstat *procstat, struct kinfo_proc *kipp)
printf("%5d ", kipp->ki_groups[0]); printf("%5d ", kipp->ki_groups[0]);
printf("%5d ", kipp->ki_rgid); printf("%5d ", kipp->ki_rgid);
printf("%5d ", kipp->ki_svgid); printf("%5d ", kipp->ki_svgid);
printf("%5s ", get_umask(kipp)); printf("%5s ", get_umask(procstat, kipp));
printf("%s", kipp->ki_cr_flags & CRED_FLAG_CAPMODE ? "C" : "-"); printf("%s", kipp->ki_cr_flags & CRED_FLAG_CAPMODE ? "C" : "-");
printf(" "); printf(" ");
@ -84,21 +85,12 @@ procstat_cred(struct procstat *procstat, struct kinfo_proc *kipp)
} }
static const char * static const char *
get_umask(struct kinfo_proc *kipp) get_umask(struct procstat *procstat, struct kinfo_proc *kipp)
{ {
int error;
int mib[4];
size_t len;
u_short fd_cmask; u_short fd_cmask;
static char umask[4]; static char umask[4];
mib[0] = CTL_KERN; if (procstat_getumask(procstat, kipp, &fd_cmask) == 0) {
mib[1] = KERN_PROC;
mib[2] = KERN_PROC_UMASK;
mib[3] = kipp->ki_pid;
len = sizeof(fd_cmask);
error = sysctl(mib, 4, &fd_cmask, &len, NULL, 0);
if (error == 0) {
snprintf(umask, 4, "%03o", fd_cmask); snprintf(umask, 4, "%03o", fd_cmask);
return (umask); return (umask);
} else { } else {