From 203bf166b0dec4cdbcb7fdfc7f45f8401b60222e Mon Sep 17 00:00:00 2001 From: 18721213663 Date: Sat, 22 Jul 2023 15:08:32 +0800 Subject: [PATCH] fixed b50e9d3 from https://gitee.com/zhuhongtao66/filemanagement_file_api/pulls/333 fs_bugfix_sendfile Signed-off-by: 18721213663 --- .../js/src/mod_fs/properties/copy_file.cpp | 19 ++++++++++++++++--- .../kits/js/src/mod_fs/properties/copy_file.h | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/interfaces/kits/js/src/mod_fs/properties/copy_file.cpp b/interfaces/kits/js/src/mod_fs/properties/copy_file.cpp index 6dc697584..15eb6ea4b 100755 --- a/interfaces/kits/js/src/mod_fs/properties/copy_file.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/copy_file.cpp @@ -57,11 +57,24 @@ static NError SendFileCore(FileInfo& srcFdg, FileInfo& destFdg, struct stat& sta HILOGE("Failed to request heap memory."); return NError(ENOMEM); } - int ret = uv_fs_sendfile(nullptr, sendfile_req.get(), destFdg.fdg->GetFD(), srcFdg.fdg->GetFD(), 0, - statbf.st_size, nullptr); + int64_t offset = 0; + size_t size = static_cast(statbf.st_size); + int ret = 0; + while (size > MAX_SIZE) { + ret = uv_fs_sendfile(nullptr, sendfile_req.get(), destFdg.fdg->GetFD(), srcFdg.fdg->GetFD(), + offset, MAX_SIZE, nullptr); + if (ret < 0) { + HILOGE("Failed to sendfile by ret : %{public}d", ret); + return NError(ret); + } + offset += MAX_SIZE; + size -= MAX_SIZE; + } + ret = uv_fs_sendfile(nullptr, sendfile_req.get(), destFdg.fdg->GetFD(), srcFdg.fdg->GetFD(), + offset, size, nullptr); if (ret < 0) { HILOGE("Failed to sendfile by ret : %{public}d", ret); - return NError(errno); + return NError(ret); } return NError(ERRNO_NOERR); } diff --git a/interfaces/kits/js/src/mod_fs/properties/copy_file.h b/interfaces/kits/js/src/mod_fs/properties/copy_file.h index fef4af34b..2801c4a43 100755 --- a/interfaces/kits/js/src/mod_fs/properties/copy_file.h +++ b/interfaces/kits/js/src/mod_fs/properties/copy_file.h @@ -36,7 +36,7 @@ public: Para(FileInfo src, FileInfo dest) : src_(move(src)), dest_(move(dest)){}; }; - +constexpr size_t MAX_SIZE = 0x7ffff000; const string PROCEDURE_COPYFILE_NAME = "FileIOCopyFile"; } // namespace ModuleFileIO } // namespace FileManagement -- Gitee