cleanup system

src/ISystem.php

@@ -49,9 +49,9 @@ interface ISystem {
 	public function getNetPath();
 
 	/**
-	 * Whether or not the `stdbuf` command is available in the path
+	 * Get the full path to the `stdbuf` binary of false if the binary is not available
 	 *
-	 * @return bool
+	 * @return string|bool
 	 */
-	public function hasStdBuf();
+	public function getStdBufPath();
 }

src/System.php

@@ -10,11 +10,8 @@ namespace Icewind\SMB;
 use Icewind\SMB\Exception\Exception;
 
 class System implements ISystem {
-	private $smbclient;
-
-	private $net;
-
-	private $stdbuf;
+	/** @var (string|bool)[] */
+	private $paths = [];
 
 	/**
 	 * Get the path to a file descriptor of the current process
@@ -37,26 +34,24 @@ class System implements ISystem {
 	}
 
 	public function getSmbclientPath() {
-		if (!$this->smbclient) {
-			$this->smbclient = trim(`which smbclient`);
-		}
-		return $this->smbclient;
+		return $this->getBinaryPath('smbclient');
 	}
 
 	public function getNetPath() {
-		if (!$this->net) {
-			$this->net = trim(`which net`);
-		}
-		return $this->net;
+		return $this->getBinaryPath('net');
 	}
 
-	public function hasStdBuf() {
-		if (!$this->stdbuf) {
+	public function getStdBufPath() {
+		return $this->getBinaryPath('stdbuf');
+	}
+
+	private function getBinaryPath($binary) {
+		if (!isset($this->paths[$binary])) {
 			$result = null;
 			$output = array();
-			exec('which stdbuf 2>&1', $output, $result);
-			$this->stdbuf = $result === 0;
+			exec("which $binary 2>&1", $output, $result);
+			$this->paths[$binary] = $result === 0 ? trim(implode('', $output)) : false;
 		}
-		return $this->stdbuf;
+		return $this->paths[$binary];
 	}
 }

src/Wrapped/Share.php

@@ -75,7 +75,7 @@ class Share extends AbstractShare {
 
 	protected function getConnection() {
 		$command = sprintf('%s%s -t %s %s %s %s',
-			$this->system->hasStdBuf() ? 'stdbuf -o0 ' : '',
+			$this->system->getStdBufPath() ? $this->system->getStdBufPath() . ' -o0 ' : '',
 			$this->system->getSmbclientPath(),
 			$this->server->getOptions()->getTimeout(),
 			$this->getAuthFileArgument(),
@@ -364,7 +364,7 @@ class Share extends AbstractShare {
 	 * @throws DependencyException
 	 */
 	public function notify($path) {
-		if (!$this->system->hasStdBuf()) { //stdbuf is required to disable smbclient's output buffering
+		if (!$this->system->getStdBufPath()) { //stdbuf is required to disable smbclient's output buffering
 			throw new DependencyException('stdbuf is required for usage of the notify command');
 		}
 		$connection = $this->getConnection(); // use a fresh connection since the notify command blocks the process