From f38dd4ddf584bf6891be786d69c13d9aa3a64140 Mon Sep 17 00:00:00 2001 From: yangbiao59 Date: Wed, 18 Jun 2025 06:45:52 +0000 Subject: [PATCH 1/3] =?UTF-8?q?update=20interfaces/kits/js/src/mod=5Ffs/pr?= =?UTF-8?q?operties/open=5Fcore.cpp.=20=E5=91=8A=E8=AD=A6=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangbiao59 --- interfaces/kits/js/src/mod_fs/properties/open_core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/open_core.cpp b/interfaces/kits/js/src/mod_fs/properties/open_core.cpp index f688e8b5e..8ead99468 100644 --- a/interfaces/kits/js/src/mod_fs/properties/open_core.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/open_core.cpp @@ -75,7 +75,7 @@ static tuple ValidAndConvertFlags(const optional &mode) } flags = static_cast(modeValue); uint32_t invalidMode = (O_WRONLY | O_RDWR); - if ((modeValue & invalidMode) == invalidMode) { + if ((flags & invalidMode) == invalidMode) { HILOGE("Invalid mode"); return { false, flags }; } -- Gitee From c66819e4a3d6d32cdd0f47df00611143ef9eb460 Mon Sep 17 00:00:00 2001 From: yangbiao59 Date: Fri, 20 Jun 2025 08:55:51 +0000 Subject: [PATCH 2/3] modify Signed-off-by: yangbiao59 --- interfaces/kits/js/src/mod_fs/class_file/fs_file.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/class_file/fs_file.cpp b/interfaces/kits/js/src/mod_fs/class_file/fs_file.cpp index 0c6f7c2a1..45cb2d418 100644 --- a/interfaces/kits/js/src/mod_fs/class_file/fs_file.cpp +++ b/interfaces/kits/js/src/mod_fs/class_file/fs_file.cpp @@ -153,7 +153,7 @@ FsResult FsFile::TryLock(bool exclusive) const } int ret = 0; - auto mode = exclusive ? LOCK_EX : LOCK_SH; + auto mode = static_cast(exclusive ? LOCK_EX : LOCK_SH); ret = flock(fileEntity->fd_.get()->GetFD(), mode | LOCK_NB); if (ret < 0) { HILOGE("Failed to try to lock file"); -- Gitee From d5b21b283ed9d525e1b27ce9dc30c26295254847 Mon Sep 17 00:00:00 2001 From: yangbiao59 Date: Fri, 20 Jun 2025 13:05:22 +0000 Subject: [PATCH 3/3] modify Signed-off-by: yangbiao59 --- interfaces/kits/js/src/mod_fs/properties/ani/access_ani.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/access_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/access_ani.cpp index 329e11623..41052ff71 100644 --- a/interfaces/kits/js/src/mod_fs/properties/ani/access_ani.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/ani/access_ani.cpp @@ -102,10 +102,10 @@ ani_boolean AccessAni::AccessSync3( auto flagType = OptToAccessFlagType(flagOpt); FsResult fsRet = FsResult::Error(UNKNOWN_ERR); - if (flagOpt == std::nullopt) { - fsRet = AccessCore::DoAccess(pathStr, modeType); - } else { + if (modeType != std::nullopt && flagType != std::nullopt) { fsRet = AccessCore::DoAccess(pathStr, modeType.value(), flagType.value()); + } else { + fsRet = AccessCore::DoAccess(pathStr, modeType); } if (!fsRet.IsSuccess()) { -- Gitee