mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r26098) -Fix: close the log file when OpenTTD was forked and finally closed

release/1.4
rubidium 2013-11-25 09:20:35 +00:00
parent ee0aa389a8
commit 43edd2409e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dedicated.cpp
View File

@ -13,7 +13,8 @@
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
char *_log_file; ///< File to reroute output of a forked OpenTTD to char *_log_file = NULL; ///< File to reroute output of a forked OpenTTD to
FILE *_log_fd = NULL; ///< File to reroute output of a forked OpenTTD to
#if defined(UNIX) && !defined(__MORPHOS__) #if defined(UNIX) && !defined(__MORPHOS__)
@ -39,20 +40,18 @@ void DedicatedFork()
exit(1); exit(1);
case 0: { // We're the child case 0: { // We're the child
FILE *f;
/* Open the log-file to log all stuff too */ /* Open the log-file to log all stuff too */
f = fopen(_log_file, "a"); _log_fd = fopen(_log_file, "a");
if (f == NULL) { if (_log_fd == NULL) {
perror("Unable to open logfile"); perror("Unable to open logfile");
exit(1); exit(1);
} }
/* Redirect stdout and stderr to log-file */ /* Redirect stdout and stderr to log-file */
if (dup2(fileno(f), fileno(stdout)) == -1) { if (dup2(fileno(_log_fd), fileno(stdout)) == -1) {
perror("Rerouting stdout"); perror("Rerouting stdout");
exit(1); exit(1);
} }
if (dup2(fileno(f), fileno(stderr)) == -1) { if (dup2(fileno(_log_fd), fileno(stderr)) == -1) {
perror("Rerouting stderr"); perror("Rerouting stderr");
exit(1); exit(1);
} }

7
src/openttd.cpp
View File

@ -907,6 +907,13 @@ exit_normal:
free(_ini_videodriver); free(_ini_videodriver);
free(_ini_blitter); free(_ini_blitter);
#ifdef ENABLE_NETWORK
extern FILE *_log_fd;
if (_log_fd != NULL) {
fclose(_log_fd);
}
#endif /* ENABLE_NETWORK */
return ret; return ret;
} }