From 5144d36725ffae4b72f7133dba196a39b0765caf Mon Sep 17 00:00:00 2001 From: sunsun1006 Date: Tue, 14 Feb 2023 14:57:16 +0000 Subject: [PATCH 1/6] fixed 3a61b0b from https://gitee.com/sun-xuhui-1/filemanagement_file_api_3/pulls/188 update interfaces/kits/js/src/mod_fs/properties/move.cpp. Signed-off-by: sunsun1006 --- .../kits/js/src/mod_fs/properties/move.cpp | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/interfaces/kits/js/src/mod_fs/properties/move.cpp b/interfaces/kits/js/src/mod_fs/properties/move.cpp index bea653e94..286e39e05 100644 --- a/interfaces/kits/js/src/mod_fs/properties/move.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/move.cpp @@ -15,7 +15,13 @@ #include "move.h" +#ifdef __MUSL__ #include +#else +#include +#include +#endif + #include #include #include "uv.h" @@ -28,6 +34,8 @@ namespace FileManagement { namespace ModuleFileIO { using namespace std; using namespace OHOS::FileManagement::LibN; + +#ifdef __MUSL__ static bool CheckDir(const string &path) { if (!filesystem::is_directory(filesystem::status(path))) { @@ -35,6 +43,18 @@ static bool CheckDir(const string &path) } return true; } +#else +static bool CheckDir(const string &path) +{ + struct stat fileInformation; + if (EOK == stat(path.c_str(), fileInfomation)) { + if (fileInformation.st_mode & S_IFDIR) { + return true; + } + } + return false; +} +#endif static tuple, unique_ptr, int> ParseJsOperand(napi_env env, const NFuncArg& funcArg) { -- Gitee From acdcc27366342c96e1ba2cbaa455709a7b035b79 Mon Sep 17 00:00:00 2001 From: sunsun1006 Date: Tue, 14 Feb 2023 15:11:14 +0000 Subject: [PATCH 2/6] update interfaces/kits/js/src/mod_fs/properties/move.cpp. Signed-off-by: sunsun1006 --- interfaces/kits/js/src/mod_fs/properties/move.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/move.cpp b/interfaces/kits/js/src/mod_fs/properties/move.cpp index 286e39e05..d5ee40417 100644 --- a/interfaces/kits/js/src/mod_fs/properties/move.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/move.cpp @@ -47,7 +47,7 @@ static bool CheckDir(const string &path) static bool CheckDir(const string &path) { struct stat fileInformation; - if (EOK == stat(path.c_str(), fileInfomation)) { + if (EOK == stat(path.c_str(), fileInformation)) { if (fileInformation.st_mode & S_IFDIR) { return true; } -- Gitee From 4dd3a7f6b234e305a9662c56eed51376407ca13f Mon Sep 17 00:00:00 2001 From: sunsun1006 Date: Wed, 15 Feb 2023 01:08:36 +0000 Subject: [PATCH 3/6] update interfaces/kits/js/src/mod_fs/properties/move.cpp. Signed-off-by: sunsun1006 --- interfaces/kits/js/src/mod_fs/properties/move.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/move.cpp b/interfaces/kits/js/src/mod_fs/properties/move.cpp index d5ee40417..27117e43e 100644 --- a/interfaces/kits/js/src/mod_fs/properties/move.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/move.cpp @@ -47,7 +47,7 @@ static bool CheckDir(const string &path) static bool CheckDir(const string &path) { struct stat fileInformation; - if (EOK == stat(path.c_str(), fileInformation)) { + if (EOK == stat(path.c_str(), &fileInformation)) { if (fileInformation.st_mode & S_IFDIR) { return true; } -- Gitee From 30f75d0b2970dcb55b342e37194db0c40d5b1c0a Mon Sep 17 00:00:00 2001 From: sunsun1006 Date: Wed, 15 Feb 2023 01:28:10 +0000 Subject: [PATCH 4/6] update interfaces/kits/js/src/mod_fs/properties/move.cpp. Signed-off-by: sunsun1006 --- interfaces/kits/js/src/mod_fs/properties/move.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interfaces/kits/js/src/mod_fs/properties/move.cpp b/interfaces/kits/js/src/mod_fs/properties/move.cpp index 27117e43e..861a27fb3 100644 --- a/interfaces/kits/js/src/mod_fs/properties/move.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/move.cpp @@ -39,6 +39,7 @@ using namespace OHOS::FileManagement::LibN; static bool CheckDir(const string &path) { if (!filesystem::is_directory(filesystem::status(path))) { + HILOGE("Path is not a directory"); return false; } return true; @@ -52,6 +53,7 @@ static bool CheckDir(const string &path) return true; } } + HILOGE("Path is not a directory"); return false; } #endif -- Gitee From b91dc6e879aee8da1904fc50f928bb892201f3c2 Mon Sep 17 00:00:00 2001 From: sunsun1006 Date: Wed, 15 Feb 2023 01:30:38 +0000 Subject: [PATCH 5/6] update interfaces/kits/js/src/mod_fs/properties/move.cpp. Signed-off-by: sunsun1006 --- interfaces/kits/js/src/mod_fs/properties/move.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/move.cpp b/interfaces/kits/js/src/mod_fs/properties/move.cpp index 861a27fb3..265865dbe 100644 --- a/interfaces/kits/js/src/mod_fs/properties/move.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/move.cpp @@ -39,7 +39,6 @@ using namespace OHOS::FileManagement::LibN; static bool CheckDir(const string &path) { if (!filesystem::is_directory(filesystem::status(path))) { - HILOGE("Path is not a directory"); return false; } return true; -- Gitee From 3d1c619dc65d984f377c9ae1324fcee7cd104ce2 Mon Sep 17 00:00:00 2001 From: sunsun1006 Date: Wed, 15 Feb 2023 02:12:12 +0000 Subject: [PATCH 6/6] update interfaces/kits/js/src/mod_fs/properties/move.cpp. Signed-off-by: sunsun1006 --- interfaces/kits/js/src/mod_fs/properties/move.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/move.cpp b/interfaces/kits/js/src/mod_fs/properties/move.cpp index 265865dbe..da980d8c0 100644 --- a/interfaces/kits/js/src/mod_fs/properties/move.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/move.cpp @@ -51,8 +51,9 @@ static bool CheckDir(const string &path) if (fileInformation.st_mode & S_IFDIR) { return true; } + } else { + HILOGE("Failed to stat file"); } - HILOGE("Path is not a directory"); return false; } #endif -- Gitee