summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO/Src/VolumeDirectory.cpp
diff options
context:
space:
mode:
authorMaarten ter Huurne <maarten@treewalker.org>2008-09-23 10:05:46 +0000
committerMaarten ter Huurne <maarten@treewalker.org>2008-09-23 10:05:46 +0000
commit6bffd4d4bbaab5b0e75c86a5f9adee3b6c080712 (patch)
tree3768852e87ee37ba8b09177c7e9b5532f0060916 /Source/Core/DiscIO/Src/VolumeDirectory.cpp
parent385e3276bbbe9c2ca0578737cb9cbc97f65bdc4e (diff)
Use existing File::IsDirectory() function. Thanks to nakee for pointing this out.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@639 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO/Src/VolumeDirectory.cpp')
-rw-r--r--Source/Core/DiscIO/Src/VolumeDirectory.cpp21
1 files changed, 2 insertions, 19 deletions
diff --git a/Source/Core/DiscIO/Src/VolumeDirectory.cpp b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
index ccd15bdcb3..33ae382d14 100644
--- a/Source/Core/DiscIO/Src/VolumeDirectory.cpp
+++ b/Source/Core/DiscIO/Src/VolumeDirectory.cpp
@@ -20,14 +20,12 @@
#include <io.h>
#include <windows.h>
#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#include <unistd.h>
#endif
#include "VolumeDirectory.h"
#include "FileBlob.h"
+#include "FileUtil.h"
namespace DiscIO
{
@@ -76,22 +74,7 @@ CVolumeDirectory::~CVolumeDirectory()
bool CVolumeDirectory::IsValidDirectory(const std::string& _rDirectory)
{
std::string directoryName = ExtractDirectoryName(_rDirectory);
-
-#ifdef _WIN32
- WIN32_FIND_DATA ffd;
- HANDLE hFind = FindFirstFile(directoryName.c_str(), &ffd);
-
- if (hFind == INVALID_HANDLE_VALUE)
- return false;
-
- return true;
-#else
- struct stat info;
- if (!stat(directoryName.c_str(), &info))
- return false;
-
- return S_ISDIR(info.st_mode);
-#endif
+ return File::IsDirectory(directoryName.c_str());
}
bool CVolumeDirectory::Read(u64 _Offset, u64 _Length, u8* _pBuffer) const