Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-03-06 21:27:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Common: Correct ReadFileToString() with no size.

Browse Source 
If SEEK_END returns an error, just read bit by bit.  Also remove the
unnecessary temp buffer.
This commit is contained in:
Unknown W. Brackets 2021-05-10 18:29:06 -07:00
parent d775bf4e4c
commit b3ce171523
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Common/File/FileUtil.cpp
View File

@ -878,18 +878,28 @@ bool IOFile::Resize(uint64_t size)
return m_good;
}
bool ReadFileToString(bool text_file, const char *filename, std::string & str)
{
bool ReadFileToString(bool text_file, const char *filename, std::string &str) {
FILE *f = File::OpenCFile(filename, text_file ? "r" : "rb");
if (!f)
return false;
size_t len = (size_t)File::GetFileSize(f);
char *buf = new char[len + 1];
buf[fread(buf, 1, len, f)] = 0;
str = std::string(buf, len);
bool success;
if (len == -1) {
size_t totalSize = 1024;
size_t totalRead = 0;
do {
totalSize *= 2;
str.resize(totalSize);
totalRead += fread(&str[totalRead], 1, totalSize - totalRead, f);
} while (totalRead == totalSize);
str.resize(totalRead);
success = true;
} else {
str.resize(len);
success = fread(&str[0], 1, len, f) == len;
}
fclose(f);
delete[] buf;
return true;
return success;
}
uint8_t *ReadLocalFile(const char *filename, size_t * size) {