------------------------------------------------------------------------------- */
-
-
/* marker */
#define PATH_INIT_C
-
-
/* dependencies */
#include "q3map2.h"
-
-
/* path support */
#define MAX_BASE_PATHS 10
#define MAX_GAME_PATHS 10
#define MAX_PAK_PATHS 200
+qboolean customHomePath = qfalse;
char *homePath;
+
+#if GDEF_OS_MACOS
+char *macLibraryApplicationSupportPath;
+#elif GDEF_OS_XDG
+char *xdgDataHomePath;
+#endif // GDEF_OS_XDG
+
char installPath[ MAX_OS_PATH ];
int numBasePaths;
*/
char *LokiGetHomeDir( void ){
- #ifndef Q_UNIX
+ #if GDEF_OS_WINDOWS
return NULL;
- #else
+ #else // !GDEF_OS_WINDOWS
static char buf[ 4096 ];
struct passwd pw, *pwp;
char *home;
- static char homeBuf[MAX_OS_PATH];
-
/* get the home environment variable */
home = getenv( "HOME" );
/* look up home dir in password database */
- if(!home)
+ if( home == NULL )
{
if ( getpwuid_r( getuid(), &pw, buf, sizeof( buf ), &pwp ) == 0 ) {
return pw.pw_dir;
}
}
- snprintf( homeBuf, sizeof( homeBuf ), "%s/.", home );
-
/* return it */
- return homeBuf;
- #endif
+ return home;
+ #endif // !GDEF_OS_WINDOWS
}
*/
void LokiInitPaths( char *argv0 ){
- char *home;
+ char *home;
- if ( !homePath ) {
+ if ( homePath == NULL ) {
/* get home dir */
home = LokiGetHomeDir();
if ( home == NULL ) {
/* set home path */
homePath = home;
}
- else{
+ else {
home = homePath;
}
- #ifndef Q_UNIX
+ #if GDEF_OS_MACOS
+ char *subPath = "/Library/Application Support";
+ macLibraryApplicationSupportPath = safe_malloc( sizeof( char ) * ( strlen( home ) + strlen( subPath ) ) + 1 );
+ sprintf( macLibraryApplicationSupportPath, "%s%s", home, subPath );
+ #elif GDEF_OS_XDG
+ xdgDataHomePath = getenv( "XDG_DATA_HOME" );
+
+ if ( xdgDataHomePath == NULL ) {
+ char *subPath = "/.local/share";
+ xdgDataHomePath = safe_malloc( sizeof( char ) * ( strlen( home ) + strlen( subPath ) ) + 1 );
+ sprintf( xdgDataHomePath, "%s%s", home, subPath );
+ }
+ #endif // GDEF_OS_XDG
+
+ #if GDEF_OS_WINDOWS
/* this is kinda crap, but hey */
strcpy( installPath, "../" );
- #else
+ #else // !GDEF_OS_WINDOWS
+
char temp[ MAX_OS_PATH ];
- char *path;
- char *last;
+ char *path;
+ char *last;
qboolean found;
if ( strrchr( temp, '/' ) ) {
argv0 = strrchr( argv0, '/' ) + 1;
}
- else if ( path ) {
+ else if ( path != NULL ) {
/*
This code has a special behavior when q3map2 is a symbolic link.
path++;
}
-
/* concatenate */
if ( last > ( path + 1 ) ) {
// +1 hack: Q_strncat calls Q_strncpyz that expects a len including '\0'
*( strrchr( installPath, '/' ) ) = '\0';
*( strrchr( installPath, '/' ) ) = '\0';
}
- #endif
+ #endif // !GDEF_OS_WINDOWS
}
/*
AddHomeBasePath() - ydnar
- adds a base path to the beginning of the list, prefixed by ~/
+ adds a base path to the beginning of the list
*/
void AddHomeBasePath( char *path ){
int i;
char temp[ MAX_OS_PATH ];
- int homePathLen;
- if ( !homePath ) {
+ if ( homePath == NULL ) {
return;
}
return;
}
- /* strip leading dot, if homePath does not end in /. */
- homePathLen = strlen( homePath );
- if ( !strcmp( path, "." ) ) {
+ if ( strcmp( path, "." ) == 0 ) {
/* -fs_homebase . means that -fs_home is to be used as is */
strcpy( temp, homePath );
}
- else if ( homePathLen >= 2 && !strcmp( homePath + homePathLen - 2, "/." ) ) {
- /* remove trailing /. of homePath */
- homePathLen -= 2;
+ else {
+ char *tempHomePath;
+ tempHomePath = homePath;
- /* concatenate home dir and path */
- sprintf( temp, "%.*s/%s", homePathLen, homePath, path );
- }
- else
- {
- /* remove leading . of path */
- if ( path[0] == '.' ) {
- ++path;
+ /* homePath is . on Windows if not user supplied */
+
+ #if GDEF_OS_MACOS
+ /*
+ use ${HOME}/Library/Application as ${HOME}
+ if home path is not user supplied
+ and strip the leading dot from prefix in any case
+
+ basically it produces
+ ${HOME}/Library/Application/unvanquished
+ /user/supplied/home/path/unvanquished
+ */
+ tempHomePath = macLibraryApplicationSupportPath;
+ path = path + 1;
+ #elif GDEF_OS_XDG
+ /*
+ on Linux, check if game uses ${XDG_DATA_HOME}/prefix instead of ${HOME}/.prefix
+ if yes and home path is not user supplied
+ use XDG_DATA_HOME instead of HOME
+ and strip the leading dot
+
+ basically it produces
+ ${XDG_DATA_HOME}/unvanquished
+ /user/supplied/home/path/unvanquished
+
+ or
+ ${HOME}/.q3a
+ /user/supplied/home/path/.q3a
+ */
+
+ sprintf( temp, "%s/%s", xdgDataHomePath, ( path + 1 ) );
+ if ( access( temp, X_OK ) == 0 ) {
+ if ( customHomePath == qfalse ) {
+ tempHomePath = xdgDataHomePath;
+ }
+ path = path + 1;
}
+ #endif // GDEF_OS_XDG
/* concatenate home dir and path */
- sprintf( temp, "%s/%s", homePath, path );
+ sprintf( temp, "%s/%s", tempHomePath, path );
}
/* make a hole */
/* -game */
if ( strcmp( argv[ i ], "-game" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No game specified after %s", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;
/* -fs_forbiddenpath */
else if ( strcmp( argv[ i ], "-fs_forbiddenpath" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;
/* -fs_nobasepath */
else if ( strcmp( argv[ i ], "-fs_nobasepath" ) == 0 ) {
noBasePath = 1;
+ // we don't want any basepath, neither guessed ones
+ noMagicPath = 1;
argv[ i ] = NULL;
}
/* -fs_basepath */
else if ( strcmp( argv[ i ], "-fs_basepath" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;
/* -fs_game */
else if ( strcmp( argv[ i ], "-fs_game" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;
/* -fs_home */
else if ( strcmp( argv[ i ], "-fs_home" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;
+ customHomePath = qtrue;
homePath = argv[i];
argv[ i ] = NULL;
}
/* -fs_homebase */
else if ( strcmp( argv[ i ], "-fs_homebase" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;
/* -fs_homepath - sets both of them */
else if ( strcmp( argv[ i ], "-fs_homepath" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;
/* -fs_pakpath */
else if ( strcmp( argv[ i ], "-fs_pakpath" ) == 0 ) {
- if ( ++i >= *argc ) {
+ if ( ++i >= *argc || !argv[ i ] ) {
Error( "Out of arguments: No path specified after %s.", argv[ i - 1 ] );
}
argv[ i - 1 ] = NULL;