From 26480cdb9a7530f1330c0014a388ffff3bb5cadf Mon Sep 17 00:00:00 2001 From: N2614 Date: Wed, 21 Dec 2011 00:47:55 +0000 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8A=9B=E5=85=88=E3=83=87=E3=82=A3?= =?UTF-8?q?=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8B=E3=82=89=E5=87=BA=E5=8A=9B=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@547 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleDataMigration/sources/tools/CmacAdder/main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp b/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp index 46725fa..60e21c4 100644 --- a/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp +++ b/trunk/ConsoleDataMigration/sources/tools/CmacAdder/main.cpp @@ -109,9 +109,11 @@ bool AddCmac(const wchar_t * from_path, void* buf, const size_t bufSize) return false; } - // 出力先ディレクトリの作成 - const wchar_t* CMAC_DIR = L"CmacAdded/"; + // 出力先ディレクトリを削除してから作成 + const wchar_t* CMAC_DIR = L"CmacAdded"; targetDirectory << from_path << CMAC_DIR; + result = nn::fs::TryDeleteDirectoryRecursively(targetDirectory.str().c_str()); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); result = nn::fs::TryCreateDirectory(targetDirectory.str().c_str()); if (result.IsFailure()) { @@ -138,7 +140,7 @@ bool AddCmac(const wchar_t * from_path, void* buf, const size_t bufSize) target_to.str(L""); target_to.clear(std::stringstream::goodbit); - target_to << from_path << CMAC_DIR << entry.entryName; + target_to << from_path << CMAC_DIR << L"/" <