diff --git a/interfaces/kits/js/src/mod_fs/properties/copy.cpp b/interfaces/kits/js/src/mod_fs/properties/copy.cpp index 678dda4b92bb331d0ef558b968f28cc42f2ea11c..f485c96bf0d15539ecba70cb50e2cbb708aa4c4d 100644 --- a/interfaces/kits/js/src/mod_fs/properties/copy.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy.cpp @@ -42,6 +42,7 @@ namespace OHOS { namespace FileManagement { namespace ModuleFileIO { using namespace AppFileService::ModuleFileUri; +namespace fs = std::filesystem; const std::string FILE_PREFIX_NAME = "file://"; const std::string NETWORK_PARA = "?networkid="; const string PROCEDURE_COPY_NAME = "FileFSCopy"; @@ -249,6 +250,22 @@ static void Deleter(struct NameList *arg) free(arg->namelist); } +std::string Copy::GetRealPath(const std::string& path) +{ + fs::path tempPath(path); + fs::path realPath{}; + for (const auto& component : tempPath) { + if (component == ".") { + continue; + } else if (component == "..") { + realPath = realPath.parent_path(); + } else { + realPath /= component; + } + } + return realPath.string(); +} + uint64_t Copy::GetDirSize(std::shared_ptr infos, std::string path) { unique_ptr pNameList = { new (nothrow) struct NameList, Deleter }; @@ -322,8 +339,8 @@ int Copy::CopyDirFunc(const string &src, const string &dest, std::shared_ptr infos, std::shared_ptr 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 +688,8 @@ tuple> Copy::CreateFileInfos( infos->listener = listener; infos->srcPath = ConvertUriToPath(infos->srcUri); infos->destPath = ConvertUriToPath(infos->destUri); + infos->srcPath = GetRealPath(infos->srcPath); + infos->destPath = GetRealPath(infos->destPath); 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 dc792fa968a262dab4777c9933d6aa5ceb1c4ac7..a7d932221d9302610d3326426f2a57dbb4138145 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 std::string GetRealPath(const std::string& path); }; } // namespace ModuleFileIO } // namespace FileManagement