Merge pull request #5957 from dolphin-emu/revert-5939-WIP/broken-fstream-copy

Revert "Try to fix File::Copy with non-1024-byte aligned sizes"
This commit is contained in:
Pierre Bourdon 2017-08-21 18:30:12 +02:00 committed by GitHub
commit 36a0c689d0
1 changed files with 2 additions and 2 deletions

View File

@ -358,7 +358,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename)
while (!input.eof())
{
// read input
auto read_size = input.readsome(buffer, BSIZE);
input.read(buffer, BSIZE);
if (!input)
{
ERROR_LOG(COMMON, "Copy: failed reading from source, %s --> %s", srcFilename.c_str(),
@ -367,7 +367,7 @@ bool Copy(const std::string& srcFilename, const std::string& destFilename)
}
// write output
if (!output.WriteBytes(buffer, read_size))
if (!output.WriteBytes(buffer, BSIZE))
{
ERROR_LOG(COMMON, "Copy: failed writing to output, %s --> %s: %s", srcFilename.c_str(),
destFilename.c_str(), LastStrerrorString().c_str());