From 2c24127d328d1dc894c07a518b20a2893512c8aa Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 4 Feb 2011 07:03:21 +0000
Subject: [PATCH] =?UTF-8?q?=E5=90=B8=E5=87=BA=E3=81=97=E8=B5=B7=E5=8B=95?=
 =?UTF-8?q?=E6=99=82=E3=81=AB=E3=83=AD=E3=82=B0=E3=82=92=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E3=81=99=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@17 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleBackup/ConsoleBackup.cpp             |  3 +++
 .../common/CommonLogger.cpp                     |  6 ++++++
 .../ConsoleDataMigration/common/CommonLogger.h  |  2 ++
 trunk/ConsoleDataMigration/common/SdLogger.cpp  | 17 +++++++++++++++++
 trunk/ConsoleDataMigration/common/SdLogger.h    |  1 +
 5 files changed, 29 insertions(+)

diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
index a129e7b..75a3188 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
@@ -191,6 +191,9 @@ extern "C" void nnMain(void)
     // RenderSystemを作ってからログが出せる
     common::Logger::InitializeEjectThread();
     common::Logger::SetEjectHandler(OnSdEjected);
+    // 起動時に削除
+    common::Logger::GetLoggerInstance()->ClearLog();
+
     COMMON_LOGGER("\n");
     COMMON_LOGGER("CTR Console Backup start\n");
 
diff --git a/trunk/ConsoleDataMigration/common/CommonLogger.cpp b/trunk/ConsoleDataMigration/common/CommonLogger.cpp
index c75a924..cb31ac5 100644
--- a/trunk/ConsoleDataMigration/common/CommonLogger.cpp
+++ b/trunk/ConsoleDataMigration/common/CommonLogger.cpp
@@ -91,6 +91,12 @@ void CommonLogger::PrintResultIfFailed(nn::Result result, u32 line)
     }
 }
 
+void CommonLogger::ClearLog()
+{
+    nn::os::CriticalSection::ScopedLock lock(m_CriticalSection);
+    GetSdInstance()->Clear();
+}
+
 void CommonLogger::ScrollUp()
 {
     GetConsoleInstance()->ScrollUp();
diff --git a/trunk/ConsoleDataMigration/common/CommonLogger.h b/trunk/ConsoleDataMigration/common/CommonLogger.h
index 4018a3b..b413c17 100644
--- a/trunk/ConsoleDataMigration/common/CommonLogger.h
+++ b/trunk/ConsoleDataMigration/common/CommonLogger.h
@@ -28,6 +28,7 @@
     (void)common::Logger::GetLoggerInstance()->PrintResult("Result = %X\n", result.GetPrintableBits()); \
 
 #define COMMON_LOGGER_RESULT_WITH_LINE(result, line)  \
+    (void)nn::dbg::detail::Printf("%d\n", line); \
     (void)nn::dbg::PrintResult(result); \
     (void)common::Logger::GetLoggerInstance()->PrintResult("line   = %d\n", line); \
     (void)common::Logger::GetLoggerInstance()->PrintResult("Result = %X\n", result.GetPrintableBits()); \
@@ -62,6 +63,7 @@ public:
     void Print(const char* fmt, ...);
     void PrintResult(const char* fmt, ...);
     void PrintResultIfFailed(nn::Result result, u32 line = 0);
+    void ClearLog();
     void ScrollUp();
     void ScrollDown();
     void ScrollToBegin();
diff --git a/trunk/ConsoleDataMigration/common/SdLogger.cpp b/trunk/ConsoleDataMigration/common/SdLogger.cpp
index 86042f2..db2b6c9 100644
--- a/trunk/ConsoleDataMigration/common/SdLogger.cpp
+++ b/trunk/ConsoleDataMigration/common/SdLogger.cpp
@@ -189,6 +189,23 @@ void SdLogger::Print(const char* fmt, ::std::va_list arg)
     SdMountManager::Unmount();
 }
 
+void SdLogger::Clear()
+{
+    nn::Result result;
+    SdMountManager::Mount();
+
+    ::std::wstring log(SDMC_ROOT_NAME);
+    log += LOG_FILENAME;
+
+    result = nn::fs::TryDeleteFile(log.c_str());
+    if(result.IsFailure())
+    {
+        nn::dbg::PrintResult(result);
+    }
+
+    SdMountManager::Unmount();
+}
+
 } // namespace Logger
 } // namespace ConsoleBackup
 
diff --git a/trunk/ConsoleDataMigration/common/SdLogger.h b/trunk/ConsoleDataMigration/common/SdLogger.h
index 4c15ae9..f770f35 100644
--- a/trunk/ConsoleDataMigration/common/SdLogger.h
+++ b/trunk/ConsoleDataMigration/common/SdLogger.h
@@ -36,6 +36,7 @@ public:
     ~SdLogger() {};
 
     void Print(const char* fmt, ::std::va_list arg);
+    void Clear();
 
 private:
     nn::fs::FileOutputStream sd;