From 8a23ff0bc857d93eb9c7218f6a957fc8f4db6335 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Fri, 13 Dec 2019 16:51:49 -0800
Subject: [PATCH] Handle log file in parent properly
---
src/doomdef.h | 1 +
src/sdl/i_main.c | 12 +++++++-----
src/sdl/i_system.c | 15 ++++++++++++++-
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/doomdef.h b/src/doomdef.h
index d13ff9bc0..b2be062c3 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -127,6 +127,7 @@
#ifdef LOGMESSAGES
extern FILE *logstream;
+extern char logfilename[1024];
#endif
//#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index 69e49b4a7..d0830396f 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -47,6 +47,7 @@ extern int SDL_main(int argc, char *argv[]);
#ifdef LOGMESSAGES
FILE *logstream = NULL;
+char logfilename[1024];
#endif
#ifndef DOXYGEN
@@ -116,7 +117,6 @@ int main(int argc, char **argv)
#endif
{
const char *logdir = NULL;
- char logfile[MAX_WADPATH];
myargc = argc;
myargv = argv; /// \todo pull out path to exe from this string
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
timeinfo = localtime(&my_time);
strftime(buf, 26, "%Y-%m-%d %H-%M-%S", timeinfo);
- strcpy(logfile, va("log-%s.txt", buf));
+ strcpy(logfilename, va("log-%s.txt", buf));
#ifdef DEFAULTDIR
if (logdir)
@@ -149,14 +149,16 @@ int main(int argc, char **argv)
// Create dirs here because D_SRB2Main() is too late.
I_mkdir(va("%s%s"DEFAULTDIR, logdir, PATHSEP), 0755);
I_mkdir(va("%s%s"DEFAULTDIR"%slogs",logdir, PATHSEP, PATHSEP), 0755);
- logstream = fopen(va("%s%s"DEFAULTDIR"%slogs%s%s",logdir, PATHSEP, PATHSEP, PATHSEP, logfile), "wt");
+ strcpy(logfilename, va("%s%s"DEFAULTDIR"%slogs%s%s",logdir, PATHSEP, PATHSEP, PATHSEP, logfilename));
}
else
#endif
{
I_mkdir("."PATHSEP"logs"PATHSEP, 0755);
- logstream = fopen(va("."PATHSEP"logs"PATHSEP"%s", logfile), "wt");
+ strcpy(logfilename, va("."PATHSEP"logs"PATHSEP"%s", logfilename));
}
+
+ logstream = fopen(logfilename, "wt");
}
#endif
@@ -187,7 +189,7 @@ int main(int argc, char **argv)
D_SRB2Main();
#ifdef LOGMESSAGES
if (!M_CheckParm("-nolog"))
- CONS_Printf("Logfile: %s\n", logfile);
+ CONS_Printf("Logfile: %s\n", logfilename);
#endif
CONS_Printf("Entering main game loop...\n");
// never return
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index effdec8e2..a5e536bf5 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -2192,6 +2192,7 @@ static void I_Fork(void)
int child;
int status;
int signum;
+ int c;
child = fork();
@@ -2203,7 +2204,19 @@ static void I_Fork(void)
case 0:
break;
default:
- if (wait(&status) == -1)
+ if (logstream)
+ fclose(logstream);/* the child has this */
+
+ c = wait(&status);
+
+#ifdef LOGMESSAGES
+ /* By the way, exit closes files. */
+ logstream = fopen(logfilename, "at");
+#else
+ logstream = 0;
+#endif
+
+ if (c == -1)
{
kill(child, SIGKILL);
newsignalhandler_Warn("wait()");
--
GitLab