summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2016-04-19 23:40:13 +0200
committerbunnei <bunneidev@gmail.com>2016-04-19 23:40:13 +0200
commit6d29c202089e154186e796fd8fe85dae1ea26a1b (patch)
treea31fc8af3e98e6879ffe374ffb55396787d2aeb3
parentMerge pull request #1612 from ObsidianX/get-set-sockopt (diff)
parentfix driver root identification on Windows (diff)
downloadyuzu-6d29c202089e154186e796fd8fe85dae1ea26a1b.tar
yuzu-6d29c202089e154186e796fd8fe85dae1ea26a1b.tar.gz
yuzu-6d29c202089e154186e796fd8fe85dae1ea26a1b.tar.bz2
yuzu-6d29c202089e154186e796fd8fe85dae1ea26a1b.tar.lz
yuzu-6d29c202089e154186e796fd8fe85dae1ea26a1b.tar.xz
yuzu-6d29c202089e154186e796fd8fe85dae1ea26a1b.tar.zst
yuzu-6d29c202089e154186e796fd8fe85dae1ea26a1b.zip
-rw-r--r--src/common/file_util.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 53700c865..6e2867658 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -69,9 +69,10 @@ static void StripTailDirSlashes(std::string &fname)
{
if (fname.length() > 1)
{
- size_t i = fname.length() - 1;
- while (fname[i] == DIR_SEP_CHR)
- fname[i--] = '\0';
+ size_t i = fname.length();
+ while (i > 0 && fname[i - 1] == DIR_SEP_CHR)
+ --i;
+ fname.resize(i);
}
return;
}
@@ -85,6 +86,10 @@ bool Exists(const std::string &filename)
StripTailDirSlashes(copy);
#ifdef _WIN32
+ // Windows needs a slash to identify a driver root
+ if (copy.size() != 0 && copy.back() == ':')
+ copy += DIR_SEP_CHR;
+
int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
#else
int result = stat64(copy.c_str(), &file_info);
@@ -102,6 +107,10 @@ bool IsDirectory(const std::string &filename)
StripTailDirSlashes(copy);
#ifdef _WIN32
+ // Windows needs a slash to identify a driver root
+ if (copy.size() != 0 && copy.back() == ':')
+ copy += DIR_SEP_CHR;
+
int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
#else
int result = stat64(copy.c_str(), &file_info);