mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-22 03:42:41 +01:00
Code Issues Releases Wiki Activity

Codechange: Replace all FILE * with FileHandle RAII class. (#12718)

Browse Source 
This removes the need to manually ensure all files are closed.
This commit is contained in:
Peter Nelson
2024-09-16 08:45:26 +01:00
committed by GitHub
parent 3784a3d3d6
commit 908ee7292b
40 changed files with 368 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dedicated.cpp
View File

@@ -11,8 +11,8 @@
#include "fileio_func.h"
#include "debug.h"
std::string _log_file; ///< File to reroute output of a forked OpenTTD to
std::unique_ptr<FILE, FileDeleter> _log_fd; ///< File to reroute output of a forked OpenTTD to
std::string _log_file; ///< Filename to reroute output of a forked OpenTTD to
std::optional<FileHandle> _log_fd; ///< File to reroute output of a forked OpenTTD to
#if defined(UNIX)
@@ -31,17 +31,17 @@ void DedicatedFork()
case 0: { // We're the child
/* Open the log-file to log all stuff too */
_log_fd.reset(fopen(_log_file.c_str(), "a"));
if (!_log_fd) {
_log_fd = FileHandle::Open(_log_file, "a");
if (!_log_fd.has_value()) {
perror("Unable to open logfile");
exit(1);
}
/* Redirect stdout and stderr to log-file */
if (dup2(fileno(_log_fd.get()), fileno(stdout)) == -1) {
if (dup2(fileno(*_log_fd), fileno(stdout)) == -1) {
perror("Rerouting stdout");
exit(1);
}
if (dup2(fileno(_log_fd.get()), fileno(stderr)) == -1) {
if (dup2(fileno(*_log_fd), fileno(stderr)) == -1) {
perror("Rerouting stderr");
exit(1);
}