From 5e87d95013f2599aa1f4fceb86eb1da03ea444fb Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Thu, 21 Mar 2024 17:11:32 +0000 Subject: [PATCH] Return success boolean from FioRenameFile --- src/fileio.cpp | 12 +++++++++--- src/fileio_func.h | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/fileio.cpp b/src/fileio.cpp index d9396f8ef1..d61aef58b5 100644 --- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -374,12 +374,18 @@ void FioCreateDirectory(const std::string &name) #endif } -void FioRenameFile(const std::string &oldname, const std::string &newname) +/** + * Renames a file from oldname to newname. + * @param oldname file name to rename from + * @param newname file name to rename to + * @return true iff the operation succeeded + */ +bool FioRenameFile(const std::string &oldname, const std::string &newname) { #if defined(_WIN32) - _wrename(OTTD2FS(oldname).c_str(), OTTD2FS(newname).c_str()); + return _wrename(OTTD2FS(oldname).c_str(), OTTD2FS(newname).c_str()) == 0; #else - rename(oldname.c_str(), newname.c_str()); + return rename(oldname.c_str(), newname.c_str()) == 0; #endif } diff --git a/src/fileio_func.h b/src/fileio_func.h index 6d33130551..a78fe3cf6c 100644 --- a/src/fileio_func.h +++ b/src/fileio_func.h @@ -22,7 +22,7 @@ std::string FioFindFullPath(Subdirectory subdir, const std::string &filename); std::string FioGetDirectory(Searchpath sp, Subdirectory subdir); std::string FioFindDirectory(Subdirectory subdir); void FioCreateDirectory(const std::string &name); -void FioRenameFile(const std::string &oldname, const std::string &newname); +bool FioRenameFile(const std::string &oldname, const std::string &newname); const char *FiosGetScreenshotDir();