zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Factor "pipe standard outputs to files" code into baselayer.c.

Browse source 
The SDL and Windows layers had slightly different code: the latter would
dereference a NULL pointer if stdout.txt failed being write-opened.

git-svn-id: https://svn.eduke32.com/eduke32@3377 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-01-06 18:56:29 +00:00
parent 1e91bf1800
commit a959b998bd
4 changed files with 27 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
polymer/eduke32/build/include/baselayer.h
View file

@ -181,6 +181,7 @@ void wm_setapptitle(char *name);
int32_t baselayer_init(); int32_t baselayer_init();
void makeasmwriteable(void); void makeasmwriteable(void);
void maybe_redirect_outputs(void);
#ifdef EXTERNC #ifdef EXTERNC
} }

24
polymer/eduke32/build/src/baselayer.c
View file

@ -476,3 +476,27 @@ void makeasmwriteable(void)
# endif # endif
#endif #endif
} }
void maybe_redirect_outputs(void)
{
#if !(defined __APPLE__ && defined __BIG_ENDIAN__)
char *argp;
// pipe standard outputs to files
if ((argp = Bgetenv("BUILD_LOGSTDOUT")) != NULL)
if (!Bstrcasecmp(argp, "TRUE"))
{
FILE *fp = freopen("stdout.txt", "w", stdout);
if (!fp)
fp = fopen("stdout.txt", "w");
if (fp)
{
setvbuf(fp, 0, _IONBF, 0);
*stdout = *fp;
*stderr = *fp;
}
}
#endif
}

20
polymer/eduke32/build/src/sdlayer.c
View file

@ -206,7 +206,6 @@ int32_t main(int32_t argc, char *argv[])
{ {
int32_t r; int32_t r;
char *argp; char *argp;
FILE *fp;
buildkeytranslationtable(); buildkeytranslationtable();
@ -229,24 +228,7 @@ int32_t main(int32_t argc, char *argv[])
_buildargc = argc; _buildargc = argc;
_buildargv = (const char **)argv; _buildargv = (const char **)argv;
#if !(defined __APPLE__ && defined __BIG_ENDIAN__) maybe_redirect_outputs();
// pipe standard outputs to files
if ((argp = Bgetenv("BUILD_LOGSTDOUT")) != NULL)
if (!Bstrcasecmp(argp, "TRUE"))
{
fp = freopen("stdout.txt", "w", stdout);
if (!fp)
fp = fopen("stdout.txt", "w");
if (fp)
{
setvbuf(fp, 0, _IONBF, 0);
*stdout = *fp;
*stderr = *fp;
}
}
#endif
#ifdef USE_OPENGL #ifdef USE_OPENGL
if ((argp = Bgetenv("BUILD_NOFOG")) != NULL) if ((argp = Bgetenv("BUILD_NOFOG")) != NULL)

15
polymer/eduke32/build/src/winlayer.c
View file

@ -316,7 +316,6 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
{ {
int32_t r; int32_t r;
char *argp; char *argp;
FILE *fp;
HDC hdc; HDC hdc;
UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(lpCmdLine);
@ -419,19 +418,7 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
} }
} }
// pipe standard outputs to files maybe_redirect_outputs();
if ((argp = Bgetenv("BUILD_LOGSTDOUT")) != NULL)
if (!Bstrcasecmp(argp, "TRUE"))
{
fp = freopen("stdout.txt", "w", stdout);
if (!fp)
{
fp = fopen("stdout.txt", "w");
}
if (fp) setvbuf(fp, 0, _IONBF, 0);
*stdout = *fp;
*stderr = *fp;
}
#ifdef USE_OPENGL #ifdef USE_OPENGL
if ((argp = Bgetenv("BUILD_NOFOG")) != NULL) if ((argp = Bgetenv("BUILD_NOFOG")) != NULL)