diff options
| author | Daniel Kesselberg <mail@danielkesselberg.de> | 2018-09-29 20:23:24 +0200 |
|---|---|---|
| committer | Daniel Kesselberg <mail@danielkesselberg.de> | 2018-09-29 20:25:19 +0200 |
| commit | d4dec43f8fec7430840e878b698a6c62e09fd915 (patch) | |
| tree | f8fd6d7242a9dad0bd032848d226c15a511573c1 /lib | |
| parent | 267605f60613d6e2102de1b3c35c63a0880df006 (diff) | |
| download | nextcloud-server-d4dec43f8fec7430840e878b698a6c62e09fd915.tar.gz nextcloud-server-d4dec43f8fec7430840e878b698a6c62e09fd915.zip | |
Dont use find to lookup binaries
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/legacy/helper.php | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php index 8373c191dce..5a05e147c2b 100644 --- a/lib/private/legacy/helper.php +++ b/lib/private/legacy/helper.php @@ -505,20 +505,7 @@ class OC_Helper { if (self::is_function_enabled('exec')) { $exeSniffer = new ExecutableFinder(); // Returns null if nothing is found - $result = $exeSniffer->find($program); - if (empty($result)) { - $paths = getenv('PATH'); - if (empty($paths)) { - $paths = '/usr/local/bin /usr/bin /opt/bin /bin'; - } else { - $paths = str_replace(':',' ',getenv('PATH')); - } - $command = 'find ' . $paths . ' -name ' . escapeshellarg($program) . ' 2> /dev/null'; - exec($command, $output, $returnCode); - if (count($output) > 0) { - $result = escapeshellcmd($output[0]); - } - } + $result = $exeSniffer->find($program, null, ['/usr/local/sbin', '/usr/local/bin', '/usr/sbin', '/usr/bin', '/sbin', '/bin', '/opt/bin']); } // store the value for 5 minutes $memcache->set($program, $result, 300); |