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

Always return 0 if the sysctl failed.

Browse Source 
This fixes the bug: when procstat -xa was run and the sysctl for a
process returned ESRCH or EPERM, for this process procstat output the
result collected for the previous successful process.
This commit is contained in:
Mikolaj Golub 2012-01-29 20:39:42 +00:00
parent dfdcd4c733
commit 8d2393a033
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=230753
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usr.bin/procstat/procstat_auxv.c
View File

@ -81,7 +81,7 @@ is_elf32(pid_t pid)
static size_t
retrieve_auxv32(pid_t pid)
{
int error, name[4];
int name[4];
size_t len, i;
void *ptr;
@ -90,9 +90,9 @@ retrieve_auxv32(pid_t pid)
name[2] = KERN_PROC_AUXV;
name[3] = pid;
len = sizeof(auxv32);
error = sysctl(name, 4, auxv32, &len, NULL, 0);
if (error < 0 && errno != ESRCH && errno != EPERM) {
warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
if (sysctl(name, 4, auxv32, &len, NULL, 0) == -1) {
if (errno != ESRCH && errno != EPERM)
warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
return (0);
}
for (i = 0; i < len; i++) {
@ -117,7 +117,7 @@ retrieve_auxv32(pid_t pid)
static size_t
retrieve_auxv(pid_t pid)
{
int error, name[4];
int name[4];
size_t len;
#if __ELF_WORD_SIZE == 64
@ -129,9 +129,9 @@ retrieve_auxv(pid_t pid)
name[2] = KERN_PROC_AUXV;
name[3] = pid;
len = sizeof(auxv);
error = sysctl(name, 4, auxv, &len, NULL, 0);
if (error < 0 && errno != ESRCH && errno != EPERM) {
warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
if (sysctl(name, 4, auxv, &len, NULL, 0) == -1) {
if (errno != ESRCH && errno != EPERM)
warn("sysctl: kern.proc.auxv: %d: %d", pid, errno);
return (0);
}
return (len);