From 147df54dc649508579e57fb3d109348bdad249ce Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 1 Mar 2023 12:59:32 +0800 Subject: [PATCH] create a function that copies a file Bug: 240530709 Test: adb bugreport Change-Id: Ie09b70a7b9b10e42c46618944fa598f6c0120db2 --- insmod/include/dump/pixel_dump.h | 1 + insmod/pixel_dump.cpp | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/insmod/include/dump/pixel_dump.h b/insmod/include/dump/pixel_dump.h index bf74efa..4d67d15 100644 --- a/insmod/include/dump/pixel_dump.h +++ b/insmod/include/dump/pixel_dump.h @@ -10,5 +10,6 @@ void dumpFileContent(const char* title, const char* file_path); void runCommand(const char* title, const char* cmd); std::string concatenatePath(const char* folder, const char* file); void dumpLogs(const char* SrcDir, const char* DestDir, int limit, const char* prefix); +void copyFile(const char* SrcDir, const char* DestDir); #endif // DEVICE_GOOGLE_GS_COMMON_INSMOD_INCLUDE_DUMP_PIXEL_DUMP_H_ diff --git a/insmod/pixel_dump.cpp b/insmod/pixel_dump.cpp index db7fe3b..3bf3d6e 100644 --- a/insmod/pixel_dump.cpp +++ b/insmod/pixel_dump.cpp @@ -83,10 +83,7 @@ void dumpLogs(const char* SrcDir, const char* DestDir, int limit, const char* pr } copiedFiles++; - - std::ifstream src(concatenatePath(SrcDir, dirent_list[i]->d_name).c_str(), std::ios::binary); - std::ofstream dst(concatenatePath(DestDir, dirent_list[i]->d_name).c_str(), std::ios::binary); - dst << src.rdbuf(); + copyFile(concatenatePath(SrcDir, dirent_list[i]->d_name).c_str(), concatenatePath(DestDir, dirent_list[i]->d_name).c_str()); } while (num_entries--) { @@ -96,3 +93,11 @@ void dumpLogs(const char* SrcDir, const char* DestDir, int limit, const char* pr free(dirent_list); return; } + +void copyFile(const char* SrcDir, const char* DestDir) { + std::ifstream src(SrcDir, std::ios::binary); + std::ofstream dst(DestDir, std::ios::binary); + dst << src.rdbuf(); + return; +} +