robin/smb
1
0
Fork 0
mirror of https://codeberg.org/icewind/SMB.git synced 2026-06-03 17:24:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #79 from raffis/busybox

Browse source 
smbclient wrapper not compatible with busybox
This commit is contained in:
Robin Appelman 2019-03-30 18:23:34 +01:00 • committed by GitHub
commit 2580be8caf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Native/NativeShare.php
View file

@ -289,7 +289,7 @@ class NativeShare extends AbstractShare {
*/
public function append($source) {
$url = $this->buildUrl($source);
$handle = $this->getState()->open($url, "a");
$handle = $this->getState()->open($url, "a+");
return NativeWriteStream::wrap($this->getState(), $handle, "a", $url);
}

12
src/Wrapped/RawConnection.php
View file

@ -173,18 +173,6 @@ class RawConnection {
return;
}
if ($terminate) {
// if for case that posix_ functions are not available
if (function_exists('posix_kill')) {
$status = proc_get_status($this->process);
$ppid = $status['pid'];
$pids = preg_split('/\s+/', `ps -o pid --no-heading --ppid $ppid`);
foreach ($pids as $pid) {
if (is_numeric($pid)) {
//9 is the SIGKILL signal
posix_kill($pid, 9);
}
}
}
proc_terminate($this->process);
}
proc_close($this->process);

5
src/Wrapped/Share.php
View file

@ -55,6 +55,8 @@ class Share extends AbstractShare {
FileInfo::MODE_SYSTEM => 's'
];
const EXEC_CMD = 'exec';
/**
* @param IServer $server
* @param string $name
@ -78,7 +80,8 @@ class Share extends AbstractShare {
protected function getConnection() {
$command = sprintf(
'%s%s -t %s %s %s %s',
'%s %s%s -t %s %s %s %s',
self::EXEC_CMD,
$this->system->getStdBufPath() ? $this->system->getStdBufPath() . ' -o0 ' : '',
$this->system->getSmbclientPath(),
$this->server->getOptions()->getTimeout(),