ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FileSystem: Add Error to CopyFilePath()

This commit is contained in:
Stenzek 2025-01-18 13:47:36 +10:00
parent feeb8d9e56
commit d054d76a76
No known key found for this signature in database
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/file_system.cpp
View File

@ -1639,19 +1639,22 @@ bool FileSystem::RecursiveDeleteDirectory(const char* path, Error* error)
return DeleteDirectory(path, error); return DeleteDirectory(path, error);
} }
bool FileSystem::CopyFilePath(const char* source, const char* destination, bool replace) bool FileSystem::CopyFilePath(const char* source, const char* destination, bool replace, Error* error)
{ {
#ifndef _WIN32 #ifndef _WIN32
// TODO: There's technically a race here between checking and opening the file.. // TODO: There's technically a race here between checking and opening the file..
// But fopen doesn't specify any way to say "don't create if it exists"... // But fopen doesn't specify any way to say "don't create if it exists"...
if (!replace && FileExists(destination)) if (!replace && FileExists(destination))
{
Error::SetStringView(error, "File already exists.");
return false; return false;
}
auto in_fp = OpenManagedCFile(source, "rb"); auto in_fp = OpenManagedCFile(source, "rb", error);
if (!in_fp) if (!in_fp)
return false; return false;
auto out_fp = OpenManagedCFile(destination, "wb"); auto out_fp = OpenManagedCFile(destination, "wb", error);
if (!out_fp) if (!out_fp)
return false; return false;
@ -1662,6 +1665,7 @@ bool FileSystem::CopyFilePath(const char* source, const char* destination, bool
if ((bytes_in == 0 && !std::feof(in_fp.get())) || if ((bytes_in == 0 && !std::feof(in_fp.get())) ||
(bytes_in > 0 && std::fwrite(buf, 1, bytes_in, out_fp.get()) != bytes_in)) (bytes_in > 0 && std::fwrite(buf, 1, bytes_in, out_fp.get()) != bytes_in))
{ {
Error::SetErrno(error, "fread() or fwrite() failed: ", errno);
out_fp.reset(); out_fp.reset();
DeleteFile(destination); DeleteFile(destination);
return false; return false;
@ -1670,6 +1674,7 @@ bool FileSystem::CopyFilePath(const char* source, const char* destination, bool
if (std::fflush(out_fp.get()) != 0) if (std::fflush(out_fp.get()) != 0)
{ {
Error::SetErrno(error, "fflush() failed: ", errno);
out_fp.reset(); out_fp.reset();
DeleteFile(destination); DeleteFile(destination);
return false; return false;
@ -1677,7 +1682,11 @@ bool FileSystem::CopyFilePath(const char* source, const char* destination, bool
return true; return true;
#else #else
return CopyFileW(GetWin32Path(source).c_str(), GetWin32Path(destination).c_str(), !replace); if (CopyFileW(GetWin32Path(source).c_str(), GetWin32Path(destination).c_str(), !replace))
return true;
Error::SetWin32(error, "CopyFileW() failed(): ", GetLastError());
return false;
#endif #endif
} }

2
src/common/file_system.h
View File

@ -208,7 +208,7 @@ bool DeleteDirectory(const char* path, Error* error = nullptr);
bool RecursiveDeleteDirectory(const char* path, Error* error = nullptr); bool RecursiveDeleteDirectory(const char* path, Error* error = nullptr);
/// Copies one file to another, optionally replacing it if it already exists. /// Copies one file to another, optionally replacing it if it already exists.
bool CopyFilePath(const char* source, const char* destination, bool replace); bool CopyFilePath(const char* source, const char* destination, bool replace, Error* error = nullptr);
/// Returns the path to the current executable. /// Returns the path to the current executable.
std::string GetProgramPath(); std::string GetProgramPath();