From 504cc9eca6b9ba09d4d5dbfbd570a4cdd10bb961 Mon Sep 17 00:00:00 2001
From: kamikawa <kamikawa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 2 Sep 2008 03:05:53 +0000
Subject: [PATCH] =?UTF-8?q?NAMUT=5FFormat=E3=81=A7=E3=82=B7=E3=82=B9?=
 =?UTF-8?q?=E3=83=86=E3=83=A0=E3=82=A2=E3=83=97=E3=83=AA=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=AE=E4=B9=B1?=
 =?UTF-8?q?=E6=95=B0=E3=82=AF=E3=83=AA=E3=82=A2=E3=82=92=E8=A1=8C=E3=81=86?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E5=BB=83=E6=AD=A2=E3=80=82=EF=BC=88=E3=81=9D?=
 =?UTF-8?q?=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E3=81=A7?=
 =?UTF-8?q?HW=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E7=AD=89=E3=81=8C?=
 =?UTF-8?q?=E7=99=BA=E7=94=9F=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88Bad?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=81=A8?=
 =?UTF-8?q?=E3=81=AA=E3=82=8B=E3=81=9F=E3=82=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2354 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../libraries_sysmenu/namut/ARM9/src/namut.c  | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/build/libraries_sysmenu/namut/ARM9/src/namut.c b/build/libraries_sysmenu/namut/ARM9/src/namut.c
index 2468c5df..d0532976 100644
--- a/build/libraries_sysmenu/namut/ARM9/src/namut.c
+++ b/build/libraries_sysmenu/namut/ARM9/src/namut.c
@@ -84,6 +84,7 @@ static BOOL NAMUTi_ClearSavedataAll(void);
 static BOOL NAMUTi_InitShareData(void);
 static BOOL NAMUTi_MountAndFormatOtherTitleSaveData(u64 titleID, const char *arcname);
 static BOOL NAMUTi_RandClearFile(const char* path);
+static BOOL NAMUTi_CheckExistenceFile(const char* path);
 static BOOL NAMUTi_ClearWiFiSettings( void );
 static BOOL NAMUTi_DeleteShopAccount( void );
 static void* NAMUT_Alloc(u32 size);
@@ -450,8 +451,6 @@ static BOOL NAMUTi_ClearSavedataAll( void )
     u32 title_num;
     NAMTitleId* pTitleIdArray;
     NAMTitleInfo namTitleInfo;
-    char savePublicPath[ FS_ENTRY_LONGNAME_MAX ];
-    char savePrivatePath[ FS_ENTRY_LONGNAME_MAX ];
     char subBannerPath[ FS_ENTRY_LONGNAME_MAX ];
     BOOL ret = TRUE;
     s32 i;
@@ -480,21 +479,16 @@ static BOOL NAMUTi_ClearSavedataAll( void )
         // タイトル情報取得
         if( NAM_ReadTitleInfo(&namTitleInfo, pTitleIdArray[i]) == NAM_OK )
         {
-            // セーブファイルパス取得
-            if (NAM_GetTitleSaveFilePath(savePublicPath, savePrivatePath, pTitleIdArray[i]) == NAM_OK)
+            // publicSaveSizeが0以上ならフォーマット
+            if (namTitleInfo.publicSaveSize > 0)
             {
-                // publicSaveSizeが0以上なら乱数クリア＆フォーマット
-                if (namTitleInfo.publicSaveSize > 0)
-                {
-                    ret &= NAMUTi_ClearSavedataPublic(savePublicPath, namTitleInfo.titleId);
-                }
-                // privateSaveSizeが0以上なら乱数クリア＆フォーマット
-                if (namTitleInfo.privateSaveSize > 0)
-                {
-                    ret &= NAMUTi_ClearSavedataPrivate(savePrivatePath, namTitleInfo.titleId);
-                }
+                ret &= NAMUTi_MountAndFormatOtherTitleSaveData(namTitleInfo.titleId, "otherPub");
+            }
+            // privateSaveSizeが0以上ならフォーマット
+            if (namTitleInfo.privateSaveSize > 0)
+            {
+                ret &= NAMUTi_MountAndFormatOtherTitleSaveData(namTitleInfo.titleId, "otherPrv");
             }
-            else { ret = FALSE; }
 
             // サブバナーファイルパス取得
             if (NAM_GetTitleBannerFilePath( subBannerPath, namTitleInfo.titleId) == NAM_OK)
@@ -706,9 +700,9 @@ static BOOL NAMUTi_InitShareData(void)
 
     for (i=0;i<NAMUT_SHARE_ARCHIVE_MAX;i++)
     {
-        // 乱数クリア
+        // ファイルの存在を確認
         STD_TSNPrintf(path, NAM_PATH_LEN, "nand:/shared2/000%d", i);
-        if (NAMUTi_RandClearFile(path) == FALSE)
+        if (NAMUTi_CheckExistenceFile(path) == FALSE)
         {
             // ファイルが存在しないものとみなす
             OS_TPrintf("%s is not exist\n", path);
@@ -806,6 +800,30 @@ static BOOL NAMUTi_RandClearFile(const char* path)
     return TRUE;
 }
 
+/*---------------------------------------------------------------------------*
+  Name:         NAMUTi_CheckExistenceFile
+
+  Description:  指定したファイルが存在するかどうかを判定します。
+
+  Arguments:    path
+
+  Returns:      存在するならTRUE
+ *---------------------------------------------------------------------------*/
+static BOOL NAMUTi_CheckExistenceFile(const char* path)
+{
+    FSFile file;
+
+    FS_InitFile(&file);
+
+    if (!FS_OpenFileEx(&file, path, FS_FILEMODE_R))
+    {
+		return FALSE;
+ 	}
+
+    FS_CloseFile(&file);
+	return TRUE;
+}
+
 /*---------------------------------------------------------------------------*
   Name:         NAMUT_GetSoftBoxCount