summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-10-29 14:08:48 +0000
committerErmal <eri@pfsense.org>2010-10-29 14:08:48 +0000
commit0e604b3abc4e8a49da7d13720482c17e017bf0bf (patch)
tree8fb39921e6b8d259a13a8ac88c10cf04f5a2a890
parentb7ccf315a774247419815bea3df7af46929c9ba0 (diff)
downloadpfsense-0e604b3abc4e8a49da7d13720482c17e017bf0bf.zip
pfsense-0e604b3abc4e8a49da7d13720482c17e017bf0bf.tar.gz
Make isvalidpid() know about pidfile the same as the other *pid functions do.(consistency)
-rw-r--r--etc/inc/util.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc
index 90a5f9f..e4efbfb 100644
--- a/etc/inc/util.inc
+++ b/etc/inc/util.inc
@@ -42,11 +42,10 @@ function killbypid($pidfile) {
}
function isvalidpid($pid) {
- $running = `ps -p $pid | wc -l`;
- if(intval($running) > 1)
- return true;
- else
- return false;
+ $output = "";
+ exec("/bin/pgrep -F {$pid}", $output, $retval);
+
+ return (intval($retval) == 0);
}
function is_process_running($process) {
OpenPOWER on IntegriCloud