teambeef
/
ioq3quest
mirror of https://github.com/DrBeef/ioq3quest.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Reimplement r1597-1598 in a better way (Oopss) 

* Fix Sys_SetEnv warning
This commit is contained in:
Tim Angus 2009-11-05 20:20:23 +00:00
parent e8f5d5055d
commit eee9770fbf
4 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/qcommon/files.c
View File

@ -492,7 +492,10 @@ qboolean FS_CreatePath (char *OSPath) {
if (*ofs == PATH_SEP) {
// create the directory
*ofs = 0;
Sys_Mkdir (OSPath);
if (!Sys_Mkdir (OSPath)) {
Com_Error( ERR_FATAL, "FS_CreatePath: failed to create path \"%s\"\n",
OSPath );
}
*ofs = PATH_SEP;
}
}
@ -2807,6 +2810,7 @@ static void FS_Startup( const char *gameName )
// NOTE: same filtering below for mods and basegame
if (fs_homepath->string[0] && Q_stricmp(fs_homepath->string,fs_basepath->string)) {
FS_CreatePath ( fs_homepath->string );
FS_AddGameDirectory ( fs_homepath->string, gameName );
}

4
code/qcommon/qcommon.h
View File

@ -1071,7 +1071,7 @@ qboolean Sys_StringToAdr( const char *s, netadr_t *a, netadrtype_t family );
qboolean Sys_IsLANAddress (netadr_t adr);
void Sys_ShowIP(void);
void Sys_Mkdir( const char *path );
qboolean Sys_Mkdir( const char *path );
char *Sys_Cwd( void );
void Sys_SetDefaultInstallPath(const char *path);
char *Sys_DefaultInstallPath(void);
@ -1092,6 +1092,8 @@ void Sys_Sleep(int msec);
qboolean Sys_LowPhysicalMemory( void );
void Sys_SetEnv(const char *name, const char *value);
/* This is based on the Adaptive Huffman algorithm described in Sayood's Data
* Compression book. The ranks are not actually stored, but implicitly defined
* by the location of a node within a doubly-linked list */

24
code/sys/sys_unix.c
View File

@ -55,22 +55,11 @@ char *Sys_DefaultHomePath(void)
{
Q_strncpyz( homePath, p, sizeof( homePath ) );
#ifdef MACOS_X
Q_strcat( homePath, sizeof( homePath ), "/Library" );
mkdir( homePath, 0750 ); /* just in case. */
Q_strcat( homePath, sizeof( homePath ), "/Application Support" );
mkdir( homePath, 0750 ); /* just in case. */
Q_strcat( homePath, sizeof( homePath ), "/Quake3" );
Q_strcat( homePath, sizeof( homePath ),
"/Library/Application Support/Quake3" );
#else
Q_strcat( homePath, sizeof( homePath ), "/.q3a" );
#endif
if( mkdir( homePath, 0750 ) )
{
if( errno != EEXIST )
{
Sys_Error( "Unable to create directory \"%s\", error is %s(%d)\n",
homePath, strerror( errno ), errno );
}
}
}
}
@ -222,9 +211,14 @@ const char *Sys_Dirname( char *path )
Sys_Mkdir
==================
*/
void Sys_Mkdir( const char *path )
qboolean Sys_Mkdir( const char *path )
{
mkdir( path, 0777 );
int result = mkdir( path, 0750 );
if( result != 0 )
return errno == EEXIST;
return qtrue;
}
/*

17
code/sys/sys_win32.c
View File

@ -77,14 +77,6 @@ char *Sys_DefaultHomePath( void )
Q_strncpyz( homePath, szPath, sizeof( homePath ) );
Q_strcat( homePath, sizeof( homePath ), "\\Quake3" );
FreeLibrary(shfolder);
if( !CreateDirectory( homePath, NULL ) )
{
if( GetLastError() != ERROR_ALREADY_EXISTS )
{
Com_Printf("Unable to create directory \"%s\"\n", homePath );
return NULL;
}
}
}
return homePath;
@ -279,9 +271,14 @@ const char *Sys_Dirname( char *path )
Sys_Mkdir
==============
*/
void Sys_Mkdir( const char *path )
qboolean Sys_Mkdir( const char *path )
{
_mkdir (path);
int result = _mkdir( path );
if( result != 0 )
return errno == EEXIST;
return qtrue;
}
/*