From 6502582e34e0b940c31ab7930acd005950c8a103 Mon Sep 17 00:00:00 2001
From: h30051954 <hemenghao2@huawei.com>
Date: Fri, 2 Feb 2024 15:00:42 +0800
Subject: [PATCH] =?UTF-8?q?copy=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: h30051954 <hemenghao2@huawei.com>
---
 interfaces/kits/js/src/mod_fs/properties/copy.cpp | 14 ++++++++++++--
 interfaces/kits/js/src/mod_fs/properties/copy.h   |  3 ++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp
index 678dda4b9..8237fe1c9 100644
--- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp
+++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp
@@ -19,6 +19,7 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <limits>
+#include <limits.h>
 #include <memory>
 #include <poll.h>
 #include <sys/eventfd.h>
@@ -249,6 +250,13 @@ static void Deleter(struct NameList *arg)
     free(arg->namelist);
 }
 
+void Copy::GetRealPath(string &path)
+{
+    char absPath[PATH_MAX + 1] = {0};
+    realpath(path.c_str(), absPath);
+    path = string(absPath);
+}
+
 uint64_t Copy::GetDirSize(std::shared_ptr<FileInfos> infos, std::string path)
 {
     unique_ptr<struct NameList, decltype(Deleter) *> pNameList = { new (nothrow) struct NameList, Deleter };
@@ -322,8 +330,8 @@ int Copy::CopyDirFunc(const string &src, const string &dest, std::shared_ptr<Fil
 
 int Copy::ExecLocal(std::shared_ptr<FileInfos> infos, std::shared_ptr<JsCallbackObject> callback)
 {
-    if (infos->srcPath == infos->destPath) {
-        HILOGE("The src and dest are the same.");
+    if (infos->destPath.find(infos->srcPath) != std::string::npos) {
+        HILOGE("The src directory is the subdirectory of dest");
         return EINVAL;
     }
     if (IsFile(infos->srcPath)) {
@@ -671,6 +679,8 @@ tuple<int, std::shared_ptr<FileInfos>> Copy::CreateFileInfos(
     infos->listener = listener;
     infos->srcPath = ConvertUriToPath(infos->srcUri);
     infos->destPath = ConvertUriToPath(infos->destUri);
+    GetRealPath(infos->destPath);
+    GetRealPath(infos->srcPath);
     infos->notifyTime = std::chrono::steady_clock::now() + NOTIFY_PROGRESS_DELAY;
     if (listener) {
         infos->hasListener = true;
diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.h b/interfaces/kits/js/src/mod_fs/properties/copy.h
index dc792fa96..22e55f87e 100644
--- a/interfaces/kits/js/src/mod_fs/properties/copy.h
+++ b/interfaces/kits/js/src/mod_fs/properties/copy.h
@@ -93,7 +93,7 @@ struct FileInfos {
         if (srcUri == infos.srcUri) {
             return destUri < infos.destUri;
         }
-        return (srcUri < infos.srcUri || destUri < infos.destUri);
+        return srcUri < infos.srcUri;
     }
 };
 
@@ -165,6 +165,7 @@ private:
     static bool IsDirectory(const std::string &path);
     static bool IsFile(const std::string &path);
     static std::string ConvertUriToPath(const std::string &uri);
+    static void GetRealPath(string &path);
 };
 } // namespace ModuleFileIO
 } // namespace FileManagement
-- 
Gitee