From 4305dc4c6e042ec035ea921c5a6f05d9face4a22 Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 24 Mar 2011 08:21:26 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B8=E3=81=8D=E8=BE=BC=E3=81=BF=E6=99=82?=
 =?UTF-8?q?=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA=E8=A8=88=E7=AE=97=E3=81=A7?=
 =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=80=81=E3=83=91=E3=83=87=E3=82=A3?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=92=E5=8A=A0=E7=AE=97=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20nim=E3=81=AE=E3=82=BB?=
 =?UTF-8?q?=E3=83=BC=E3=83=96=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AF=E3=83=95?=
 =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=83=AA=E3=82=B9=E3=83=88=E3=81=AB?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9B=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=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@156 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleDataMigration/common/FileTransfer.cpp  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/trunk/ConsoleDataMigration/common/FileTransfer.cpp b/trunk/ConsoleDataMigration/common/FileTransfer.cpp
index beb2021..8d1f80c 100644
--- a/trunk/ConsoleDataMigration/common/FileTransfer.cpp
+++ b/trunk/ConsoleDataMigration/common/FileTransfer.cpp
@@ -320,7 +320,6 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
                             ret_value = false;
                             continue;
                         }
-                        s_FinishedFileSize += sizeof(header);
                         swAesCtrContext.Decrypt(&dec, &header, sizeof(header));
                         COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
                         fileSizeWithoutHeaderAndFooter = dec.size;
@@ -436,7 +435,6 @@ bool CopyDirectory(ImportDataList* fileList, const wchar_t * from_path, const wc
                                     {
                                         readsize -= totalReadSize - fileSizeWithoutHeaderAndFooter;
                                         readDone = true;
-                                        s_FinishedFileSize += totalReadSize - fileSizeWithoutHeaderAndFooter;
                                     }
 
                                     result = to_file.TryWrite(&writesize, reinterpret_cast<bit8*> (buf) + bufSize / 2,
@@ -659,6 +657,14 @@ void AddPkcsPadding(u8* paddingSize, void* buf, size_t bufSize, s32* readSize)
     }
 }
 
+//! @brief パスにnimのセーブデータディレクトリが含まれているかどうかを返します
+//! @param[in]    str    パス
+//! @return パスにnimのセーブデータディレクトリが含まれているか
+bool ContainsNimSaveDataDir(const wchar_t* str)
+{
+    return std::wcsstr(str, common::NIM_SAVEDATA_DIRECTORY_NAME) != NULL;
+}
+
 //! @brief ファイルに文字列とサイズをカンマ区切り、改行付きで追加します
 //! @param[in]    file    文字列を出力したいファイル
 //! @param[in]    str         入力文字列
@@ -670,6 +676,11 @@ void AddPathNameAndUpdateContext(nn::fs::FileOutputStream* file, const wchar_t *
     nn::Result result;
     s32 writeSize;
 
+    if(ContainsNimSaveDataDir(str))
+    {
+        return;
+    }
+
     std::string output(GetCharStr(str));
     result = file->TryWrite(&writeSize, output.c_str(), output.size(), true);
     context->Update(output.c_str(), output.size());