Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Appelman <robin@icewind.nl>2020-07-27 17:36:53 +0300
committerRobin Appelman <robin@icewind.nl>2020-07-27 17:36:53 +0300
commit8c6328390f4062158c405af8bb1a4fe630f541a1 (patch)
treeac6d33e0fc1706e29539f95b417ef14f0ff26a0f /apps/files_external/3rdparty/icewind
parente0a06d7a48cf4ba3ca3aecea17cfdb86dd8adce8 (diff)
[stable18] update icewind/smb to 3.2.6
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'apps/files_external/3rdparty/icewind')
-rw-r--r--apps/files_external/3rdparty/icewind/smb/composer.json6
-rw-r--r--apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php17
2 files changed, 16 insertions, 7 deletions
diff --git a/apps/files_external/3rdparty/icewind/smb/composer.json b/apps/files_external/3rdparty/icewind/smb/composer.json
index 8ec551c7340..02cd629565e 100644
--- a/apps/files_external/3rdparty/icewind/smb/composer.json
+++ b/apps/files_external/3rdparty/icewind/smb/composer.json
@@ -18,7 +18,11 @@
},
"autoload" : {
"psr-4": {
- "Icewind\\SMB\\": "src/",
+ "Icewind\\SMB\\": "src/"
+ }
+ },
+ "autoload-dev" : {
+ "psr-4": {
"Icewind\\SMB\\Test\\": "tests/"
}
}
diff --git a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php
index 5b987253ada..6a0270ef8f4 100644
--- a/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php
+++ b/apps/files_external/3rdparty/icewind/smb/src/Native/NativeFileInfo.php
@@ -108,6 +108,11 @@ class NativeFileInfo implements IFileInfo {
* @return int
*/
protected function getMode() {
+ $mode = $this->stat()['mode'];
+
+ // Let us ignore the ATTR_NOT_CONTENT_INDEXED for now
+ $mode &= ~0x00002000;
+
return $this->stat()['mode'];
}
@@ -116,8 +121,8 @@ class NativeFileInfo implements IFileInfo {
*/
public function isDirectory() {
$mode = $this->getMode();
- if ($mode > 0x80) {
- return (bool)($mode & 0x4000); // 0x80: unix directory flag
+ if ($mode > 0x1000) {
+ return (bool)($mode & 0x4000); // 0x4000: unix directory flag
} else {
return (bool)($mode & IFileInfo::MODE_DIRECTORY);
}
@@ -128,7 +133,7 @@ class NativeFileInfo implements IFileInfo {
*/
public function isReadOnly() {
$mode = $this->getMode();
- if ($mode > 0x80) {
+ if ($mode > 0x1000) {
return !(bool)($mode & 0x80); // 0x80: owner write permissions
} else {
return (bool)($mode & IFileInfo::MODE_READONLY);
@@ -140,7 +145,7 @@ class NativeFileInfo implements IFileInfo {
*/
public function isHidden() {
$mode = $this->getMode();
- if ($mode > 0x80) {
+ if ($mode > 0x1000) {
return strlen($this->name) > 0 && $this->name[0] === '.';
} else {
return (bool)($mode & IFileInfo::MODE_HIDDEN);
@@ -152,7 +157,7 @@ class NativeFileInfo implements IFileInfo {
*/
public function isSystem() {
$mode = $this->getMode();
- if ($mode > 0x80) {
+ if ($mode > 0x1000) {
return false;
} else {
return (bool)($mode & IFileInfo::MODE_SYSTEM);
@@ -164,7 +169,7 @@ class NativeFileInfo implements IFileInfo {
*/
public function isArchived() {
$mode = $this->getMode();
- if ($mode > 0x80) {
+ if ($mode > 0x1000) {
return false;
} else {
return (bool)($mode & IFileInfo::MODE_ARCHIVE);