flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

fix driver root identification on Windows

Browse source
This commit is contained in:
wwylele 2016-04-15 11:50:50 +03:00
parent db0db6a182
commit 43b6cbd762
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/file_util.cpp
View file

@ -69,9 +69,10 @@ static void StripTailDirSlashes(std::string &fname)
{ {
if (fname.length() > 1) if (fname.length() > 1)
{ {
size_t i = fname.length() - 1; size_t i = fname.length();
while (fname[i] == DIR_SEP_CHR) while (i > 0 && fname[i - 1] == DIR_SEP_CHR)
fname[i--] = '\0'; --i;
fname.resize(i);
} }
return; return;
} }
@ -85,6 +86,10 @@ bool Exists(const std::string &filename)
StripTailDirSlashes(copy); StripTailDirSlashes(copy);
#ifdef _WIN32 #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); int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
#else #else
int result = stat64(copy.c_str(), &file_info); int result = stat64(copy.c_str(), &file_info);
@ -102,6 +107,10 @@ bool IsDirectory(const std::string &filename)
StripTailDirSlashes(copy); StripTailDirSlashes(copy);
#ifdef _WIN32 #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); int result = _wstat64(Common::UTF8ToUTF16W(copy).c_str(), &file_info);
#else #else
int result = stat64(copy.c_str(), &file_info); int result = stat64(copy.c_str(), &file_info);