From b230c4488eaa217a7e1258cd0a8dc01814630af0 Mon Sep 17 00:00:00 2001 From: trociny Date: Sun, 29 Jan 2012 20:39:42 +0000 Subject: Always return 0 if the sysctl failed. 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. --- usr.bin/procstat/procstat_auxv.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'usr.bin/procstat') diff --git a/usr.bin/procstat/procstat_auxv.c b/usr.bin/procstat/procstat_auxv.c index 73a85cd..9bf7afb 100644 --- a/usr.bin/procstat/procstat_auxv.c +++ b/usr.bin/procstat/procstat_auxv.c @@ -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); -- cgit v1.1