From 3c7c40fc60889256b3beb85290764c2d336b72d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E9=91=AB?= <zhouxin176@huawei.com>
Date: Tue, 26 Aug 2025 09:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E9=BB=84=E5=B7=AE=E5=BC=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 周鑫 <zhouxin176@huawei.com>
Change-Id: Ibfd374242876f6abae0f07c15f959cfe3e26da13
---
 interfaces/kits/js/src/common/fs_file_filter.h            | 2 +-
 .../kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp    | 8 +++-----
 .../kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp     | 2 +-
 .../kits/js/src/mod_fs/properties/ani/movedir_ani.cpp     | 2 +-
 interfaces/kits/js/src/mod_fs/properties/dup_core.cpp     | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/interfaces/kits/js/src/common/fs_file_filter.h b/interfaces/kits/js/src/common/fs_file_filter.h
index f16c17821..00fcff4d8 100644
--- a/interfaces/kits/js/src/common/fs_file_filter.h
+++ b/interfaces/kits/js/src/common/fs_file_filter.h
@@ -71,7 +71,7 @@ public:
         return fileSizeOver_;
     }
 
-    void SetLastModifiedAfter(const std::optional<int64_t> &lastModifiedAfter)
+    void SetLastModifiedAfter(const std::optional<double> &lastModifiedAfter)
     {
         lastModifiedAfter_ = std::move(lastModifiedAfter);
     }
diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp
index ae5941101..3ed6715ac 100644
--- a/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/ani/copy_dir_ani.cpp
@@ -56,7 +56,7 @@ static tuple<bool, ani_object> ToConflictFiles(ani_env *env, const ConflictFiles
     }
 
     auto [succDest, dest] = TypeConverter::ToAniString(env, files.destFiles);
-    if (!succSrc) {
+    if (!succDest) {
         HILOGE("Convert ConflictFiles destFiles to ani string failed!");
         return { false, nullptr };
     }
@@ -122,18 +122,16 @@ static tuple<bool, optional<ani_object>> ToConflictFilesArray(
 void CopyDirAni::CopyDirSync(
     ani_env *env, [[maybe_unused]] ani_class clazz, ani_string src, ani_string dest, ani_object mode)
 {
-    error_code errCode;
-
     auto [succSrc, srcPath] = TypeConverter::ToUTF8String(env, src);
     if (!succSrc) {
-        HILOGE("Invalid src, errCode = %{public}d", errCode.value());
+        HILOGE("Invalid src");
         ErrorHandler::Throw(env, EINVAL);
         return;
     }
 
     auto [succDest, destPath] = TypeConverter::ToUTF8String(env, dest);
     if (!succDest) {
-        HILOGE("Invalid dest, errCode = %{public}d", errCode.value());
+        HILOGE("Invalid dest");
         ErrorHandler::Throw(env, EINVAL);
         return;
     }
diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp
index 42b5a7316..915f0574d 100644
--- a/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/ani/mkdtemp_ani.cpp
@@ -38,7 +38,7 @@ ani_string MkdtempAni::MkdtempSync(ani_env *env, [[maybe_unused]] ani_class claz
 
     auto ret = MkdtempCore::DoMkdtemp(prefixPath);
     if (!ret.IsSuccess()) {
-        HILOGE("Mkdtemp faild");
+        HILOGE("Mkdtemp failed");
         const auto &err = ret.GetError();
         ErrorHandler::Throw(env, err);
         return nullptr;
diff --git a/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp b/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp
index e571ae53a..b832a5a49 100644
--- a/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/ani/movedir_ani.cpp
@@ -54,7 +54,7 @@ static tuple<bool, ani_object> ToConflictFiles(ani_env *env, const ErrFiles &fil
     }
 
     auto [succDest, dest] = TypeConverter::ToAniString(env, files.destFiles);
-    if (!succSrc) {
+    if (!succDest) {
         HILOGE("Convert ConflictFiles destFiles to ani string failed!");
         return { false, nullptr };
     }
diff --git a/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp b/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp
index b70fac876..b4e5b0cbd 100644
--- a/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/dup_core.cpp
@@ -58,7 +58,7 @@ FsResult<FsFile *> DupCore::DoDup(const int32_t &fd)
     }
     string path = "/proc/self/fd/" + to_string(dstFd);
     int ret = uv_fs_readlink(nullptr, readLinkReq.get(), path.c_str(), nullptr);
-    if (ret < 0) {
+    if (ret < 0 || readLinkReq->ptr == nullptr) {
         HILOGE("Failed to readlink fd, ret: %{public}d", ret);
         close(dstFd);
         return FsResult<FsFile *>::Error(ret);
-- 
Gitee