mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-04 16:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix {Read,Write}FileToString.

Browse source 
We should be using binary always.
This commit is contained in:
Matthew Parlane 2013-11-05 00:33:41 +13:00
parent 3f1ea21e4f
commit e15f628935
12 changed files with 35 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Source/Core/Common/Src/FileUtil.cpp
View file

@ -935,14 +935,14 @@ std::string GetThemeDir(const std::string& theme_name)
return dir;
}
bool WriteStringToFile(bool text_file, const std::string &str, const char *filename)
bool WriteStringToFile(const std::string &str, const char *filename)
{
return File::IOFile(filename, text_file ? "w" : "wb").WriteBytes(str.data(), str.size());
return File::IOFile(filename, "wb").WriteBytes(str.data(), str.size());
}
bool ReadFileToString(bool text_file, const char *filename, std::string &str)
bool ReadFileToString(const char *filename, std::string &str)
{
File::IOFile file(filename, text_file ? "r" : "rb");
File::IOFile file(filename, "rb");
auto const f = file.GetHandle();
if (!f)
@ -952,29 +952,6 @@ bool ReadFileToString(bool text_file, const char *filename, std::string &str)
str.resize(GetSize(f));
bool retval = file.ReadArray(&str[0], str.size(), &read_size);
// On Windows, reading a text file automatically translates \r\n to \n.
// This means we will read less characters than the expected size of the
// file. In that case, ignore the return value and count ourselves.
#ifdef _WIN32
if (text_file)
{
size_t count = 0;
for (size_t i = 0; i < read_size; ++i)
{
if (str[i] == '\n')
count += 2;
else
count += 1;
}
if (count != str.size())
return false;
str.resize(read_size);
return true;
}
#endif
return retval;
}