ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* (bug #5709) Fix crash when invoked with --version

This commit is contained in:
Tim Angus 2012-07-07 17:32:19 +00:00
parent 79bb668a9f
commit 37f2b4db90
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/sys/sys_main.c
View File

@ -140,7 +140,12 @@ Sys_PIDFileName
*/ */
static char *Sys_PIDFileName( void ) static char *Sys_PIDFileName( void )
{ {
const char *homePath = Sys_DefaultHomePath( );
if( *homePath != NULL )
return va( "%s/%s", Sys_DefaultHomePath( ), PID_FILENAME ); return va( "%s/%s", Sys_DefaultHomePath( ), PID_FILENAME );
return NULL;
} }
/* /*
@ -156,6 +161,9 @@ qboolean Sys_WritePIDFile( void )
FILE *f; FILE *f;
qboolean stale = qfalse; qboolean stale = qfalse;
if( pidFile == NULL )
return qfalse;
// First, check if the pid file is already there // First, check if the pid file is already there
if( ( f = fopen( pidFile, "r" ) ) != NULL ) if( ( f = fopen( pidFile, "r" ) ) != NULL )
{ {
@ -204,7 +212,10 @@ static __attribute__ ((noreturn)) void Sys_Exit( int exitCode )
if( exitCode < 2 ) if( exitCode < 2 )
{ {
// Normal exit // Normal exit
remove( Sys_PIDFileName( ) ); char *pidFile = Sys_PIDFileName( );
if( pidFile != NULL )
remove( pidFile );
} }
Sys_PlatformExit( ); Sys_PlatformExit( );

2
code/sys/sys_unix.c
View File

@ -53,7 +53,7 @@ char *Sys_DefaultHomePath(void)
{ {
char *p; char *p;
if( !*homePath ) if( !*homePath && com_homepath != NULL )
{ {
if( ( p = getenv( "HOME" ) ) != NULL ) if( ( p = getenv( "HOME" ) ) != NULL )
{ {