IsFileExist를 tstring으로 사용하도록 변경함

전상현 · 전상현 · commit f11075c1d215 · 2021-03-28T15:20:19.000+09:00
diff --git a/Src/100_System/FileSystem.h b/Src/100_System/FileSystem.h
@@ -11,7 +11,6 @@
 #define GetFileName					GetFileNameW
 #define GetModuleFileName			GetModuleFileNameW
 #define PathFileExists				PathFileExistsW
-#define IsFileExist					IsFileExistW
 #define IsDirectory					IsDirectoryW
 #define CopyFile					CopyFileW
 #define MoveFile					MoveFileW
@@ -30,7 +29,6 @@
 #define GetFileName					GetFileNameA
 #define GetModuleFileName			GetModuleFileNameA
 #define PathFileExists				PathFileExistsA
-#define IsFileExist					IsFileExistA
 #define IsDirectory					IsDirectoryA
 #define CopyFile					CopyFileA
 #define MoveFile					MoveFileA
@@ -54,8 +52,6 @@ namespace core
 	
 	bool			PathFileExistsA(const char* pszExistFile);
 	bool			PathFileExistsW(const wchar_t* pszExistFile);
-	bool			IsFileExistA(const char* pszExistFile);
-	bool			IsFileExistW(const wchar_t* pszExistFile);
 	bool			IsDirectoryA(const char* pszPath);
 	bool			IsDirectoryW(const wchar_t* pszPath);
 
diff --git a/Src/100_System/FileSystemT_Linux_Mac.cpp b/Src/100_System/FileSystemT_Linux_Mac.cpp
@@ -58,16 +58,6 @@ namespace core
 		return (S_ISDIR(stStat.st_mode) || S_ISREG(stStat.st_mode));
 	}
 
-	//////////////////////////////////////////////////////////////////////////
-	bool IsFileExist(LPCTSTR pszExistFile)
-	{
-		struct stat stStat = { 0, };
-		if( ::stat(MBSFromTCS(pszExistFile).c_str(), &stStat) < 0 )
-			return false;
-
-		return (S_ISDIR(stStat.st_mode) || S_ISREG(stStat.st_mode));
-	}
-
 	//////////////////////////////////////////////////////////////////////////
 	bool IsDirectory(LPCTSTR pszPath)
 	{
diff --git a/Src/100_System/FileSystemT_Win.cpp b/Src/100_System/FileSystemT_Win.cpp
@@ -69,16 +69,6 @@ namespace core
 		return ::PathFileExists(pszExistFile) != FALSE;
 	}
 
-	//////////////////////////////////////////////////////////////////////////
-	bool IsFileExist(LPCTSTR pszExistFile)
-	{
-#ifdef UNICODE
-		return 0 == ::_waccess(pszExistFile, 0);
-#else
-		return 0 == ::_access(pszExistFile, 0);
-#endif
-	}
-
 	//////////////////////////////////////////////////////////////////////////	
 	bool IsDirectory(LPCTSTR pszPath)
 	{
diff --git a/Src/200_Common/Utility.h b/Src/200_Common/Utility.h
@@ -19,6 +19,9 @@ namespace core
 		ST_FUNC_CONSOLE_LOG(std::wstring strName);
 		~ST_FUNC_CONSOLE_LOG(void);
 	};
+
+	bool IsFileExist(std::string strFile);
+	bool IsFileExist(std::wstring strFile);
     
 	char ReverseByteOrder(char btData);
 	WORD ReverseByteOrder(WORD wData);
diff --git a/Src/200_Common/UtilityT.cpp b/Src/200_Common/UtilityT.cpp
@@ -21,6 +21,12 @@ namespace core
 		printf("---------- %s started ----------\n", m_strName.c_str());
 	}
 
+	//////////////////////////////////////////////////////////////////////////
+	bool IsFileExist(std::tstring strFile)
+	{
+		return PathFileExists(strFile.c_str());
+	}
+
 	//////////////////////////////////////////////////////////////////////////
 	template <typename T>
 	static inline ECODE ReadFileContentsWorker(LPCTSTR pszFilePath, T& strContents, E_BOM_TYPE nEncodeType)
diff --git a/Src/200_Common/unzip.cpp b/Src/200_Common/unzip.cpp
@@ -3931,7 +3931,7 @@ ZRESULT TUnzip::Find(const TCHAR *tname,bool ic,int *index,ZIPENTRY *ze)
 }
 
 void EnsureDirectory(const TCHAR *rootdir, const TCHAR *dir)
-{ if (rootdir!=0 && !IsFileExist(rootdir)) CreateDirectory(rootdir);
+{ if (rootdir!=0 && !PathFileExists(rootdir)) CreateDirectory(rootdir);
   if (*dir==0) return;
   const TCHAR *lastslash=dir, *c=lastslash;
   while (*c!=0) {if (*c=='/' || *c=='\\') lastslash=c; c++;}
@@ -3943,7 +3943,7 @@ void EnsureDirectory(const TCHAR *rootdir, const TCHAR *dir)
     name++;
   }
   TCHAR cd[MAX_PATH]; *cd=0; if (rootdir!=0) SafeStrCpy(cd,MAX_PATH,rootdir); SafeStrCat(cd,MAX_PATH,dir);
-  if (!IsFileExist(cd)) CreateDirectory(cd);
+  if (!PathFileExists(cd)) CreateDirectory(cd);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -3931,7 +3931,7 @@ ZRESULT TUnzip::Find(const TCHAR tname,bool ic,int index,ZIPENTRY *ze)`
`3931`	`3931`	`}`
`3932`	`3932`
`3933`	`3933`	`void EnsureDirectory(const TCHAR rootdir, const TCHAR dir)`
`3934`		`-{ if (rootdir!=0 && !IsFileExist(rootdir)) CreateDirectory(rootdir);`
	`3934`	`+{ if (rootdir!=0 && !PathFileExists(rootdir)) CreateDirectory(rootdir);`
`3935`	`3935`	`if (*dir==0) return;`
`3936`	`3936`	`const TCHAR lastslash=dir, c=lastslash;`
`3937`	`3937`	`while (c!=0) {if (c=='/' \|\| *c=='\\') lastslash=c; c++;}`
`@@ -3943,7 +3943,7 @@ void EnsureDirectory(const TCHAR rootdir, const TCHAR dir)`
`3943`	`3943`	`name++;`
`3944`	`3944`	`}`
`3945`	`3945`	`TCHAR cd[MAX_PATH]; *cd=0; if (rootdir!=0) SafeStrCpy(cd,MAX_PATH,rootdir); SafeStrCat(cd,MAX_PATH,dir);`
`3946`		`- if (!IsFileExist(cd)) CreateDirectory(cd);`
	`3946`	`+ if (!PathFileExists(cd)) CreateDirectory(cd);`
`3947`	`3947`	`}`
`3948`	`3948`
`3949`	`3949`