diff --git a/src/d_main.c b/src/d_main.c index d0ed9c746..039fc5c01 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1214,8 +1214,10 @@ static void IdentifyVersion(void) const char *srb2waddir = NULL; #if defined (__unix__) || defined (UNIXCOMMON) || defined (HAVE_SDL) + CLEANUP(pfree) const char *allocwaddir = NULL; // here so we dont potentially free stack memory // change to the directory where 'srb2.srb' is found - srb2waddir = I_LocateWad(); + allocwaddir = I_LocateWad(); + srb2waddir = allocwaddir; #endif char tempsrb2path[256] = "."; diff --git a/src/dedicated/i_system.c b/src/dedicated/i_system.c index fe8889405..7423a35bf 100644 --- a/src/dedicated/i_system.c +++ b/src/dedicated/i_system.c @@ -127,16 +127,32 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #include -// Locations for searching the srb2.srb +/// Locations to directly check for srb2.srb in +const char *wadDefaultPaths[] = { #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) -#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2Kart" -#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2Kart" -#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2Kart" -#define DEFAULTWADLOCATION4 "/usr/games/SRB2Kart" -#define DEFAULTSEARCHPATH1 "/usr/local/games" -#define DEFAULTSEARCHPATH2 "/usr/games" -#define DEFAULTSEARCHPATH3 "/usr/local" + "/usr/local/share/games/SRB2Kart", + "/usr/local/games/SRB2Kart", + "/usr/share/games/SRB2Kart", + "/usr/games/SRB2Kart", +#elif defined (_WIN32) + "c:\\games\\srb2kart", + "\\games\\srb2kart", #endif + NULL +}; + +// Folders to recurse through looking for srb2.srb +const char *wadSearchPaths[] = { +#if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) + "/usr/local/games", + "/usr/games", + "/usr/local", +#elif defined (_WIN32) + "c:\\games", + "\\games", +#endif + NULL +}; /** \brief WAD file to look for */ @@ -1827,16 +1843,23 @@ static const char *searchWad(const char *searchDir) return tempsw; } - strcpy(tempsw, WADKEYWORD2); - fstemp = filesearch(tempsw, searchDir, NULL, true, 20); - if (fstemp == FS_FOUND) - { - pathonly(tempsw); - return tempsw; - } return NULL; } +#define CHECKWADPATH(ret) \ +do { \ + I_OutputMsg(",%s", ret); \ + if (isWadPathOk(ret)) \ + return ret; \ +} while (0) + +#define SEARCHWAD(str) \ +do { \ + WadPath = searchWad(str); \ + if (WadPath) \ + return WadPath; \ +} while (0) + /** \brief go through all possible paths and look for srb2.srb \return path to srb2.srb if any @@ -1845,6 +1868,7 @@ static const char *locateWad(void) { const char *envstr; const char *WadPath; + int i; I_OutputMsg("SRB2WADDIR"); // does SRB2WADDIR exist? @@ -1852,132 +1876,51 @@ static const char *locateWad(void) return envstr; #ifndef NOCWD - I_OutputMsg(",."); // examine current dir strcpy(returnWadPath, "."); + I_OutputMsg(",%s", returnWadPath); if (isWadPathOk(returnWadPath)) return NULL; #endif - +#ifndef NOHOME #ifdef DEFAULTDIR I_OutputMsg(",HOME/" DEFAULTDIR); // examine user jart directory if ((envstr = I_GetEnv("HOME")) != NULL) { sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr); - if (isWadPathOk(returnWadPath)) - return returnWadPath; - } -#endif - - -#ifdef CMAKECONFIG -#ifndef NDEBUG - I_OutputMsg(","CMAKE_ASSETS_DIR); - strcpy(returnWadPath, CMAKE_ASSETS_DIR); - if (isWadPathOk(returnWadPath)) - { - return returnWadPath; + CHECKWADPATH(returnWadPath); } #endif #endif #ifdef __APPLE__ OSX_GetResourcesPath(returnWadPath); - I_OutputMsg(",%s", returnWadPath); - if (isWadPathOk(returnWadPath)) - { - return returnWadPath; - } + CHECKWADPATH(returnWadPath); #endif // examine default dirs -#ifdef DEFAULTWADLOCATION1 - I_OutputMsg(","DEFAULTWADLOCATION1); - strcpy(returnWadPath, DEFAULTWADLOCATION1); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION2 - I_OutputMsg(","DEFAULTWADLOCATION2); - strcpy(returnWadPath, DEFAULTWADLOCATION2); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION3 - I_OutputMsg(","DEFAULTWADLOCATION3); - strcpy(returnWadPath, DEFAULTWADLOCATION3); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION4 - I_OutputMsg(","DEFAULTWADLOCATION4); - strcpy(returnWadPath, DEFAULTWADLOCATION4); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION5 - I_OutputMsg(","DEFAULTWADLOCATION5); - strcpy(returnWadPath, DEFAULTWADLOCATION5); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION6 - I_OutputMsg(","DEFAULTWADLOCATION6); - strcpy(returnWadPath, DEFAULTWADLOCATION6); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifdef DEFAULTWADLOCATION7 - I_OutputMsg(","DEFAULTWADLOCATION7); - strcpy(returnWadPath, DEFAULTWADLOCATION7); - if (isWadPathOk(returnWadPath)) - return returnWadPath; -#endif -#ifndef NOHOME - // find in $HOME - I_OutputMsg(",HOME/" DEFAULTDIR); - if ((envstr = I_GetEnv("HOME")) != NULL) + for (i = 0; wadDefaultPaths[i]; i++) { - char *tmp = malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR)); - strcpy(tmp, envstr); - strcat(tmp, PATHSEP); - strcat(tmp, DEFAULTDIR); - WadPath = searchWad(tmp); - free(tmp); - if (WadPath) - return WadPath; + strcpy(returnWadPath, wadDefaultPaths[i]); + CHECKWADPATH(returnWadPath); } -#endif -#ifdef DEFAULTSEARCHPATH1 - // find in /usr/local - I_OutputMsg(", in:"DEFAULTSEARCHPATH1); - WadPath = searchWad(DEFAULTSEARCHPATH1); - if (WadPath) - return WadPath; -#endif -#ifdef DEFAULTSEARCHPATH2 - // find in /usr/games - I_OutputMsg(", in:"DEFAULTSEARCHPATH2); - WadPath = searchWad(DEFAULTSEARCHPATH2); - if (WadPath) - return WadPath; -#endif -#ifdef DEFAULTSEARCHPATH3 - // find in ??? - I_OutputMsg(", in:"DEFAULTSEARCHPATH3); - WadPath = searchWad(DEFAULTSEARCHPATH3); - if (WadPath) - return WadPath; -#endif + + // search paths + for (i = 0; wadSearchPaths[i]; i++) + { + I_OutputMsg(", in:%s", wadSearchPaths[i]); + SEARCHWAD(wadSearchPaths[i]); + } + // if nothing was found return NULL; } const char *I_LocateWad(void) { - const char *waddir; + const char *waddir = NULL; I_OutputMsg("Looking for WADs in: "); waddir = locateWad(); @@ -1987,12 +1930,15 @@ const char *I_LocateWad(void) { // change to the directory where we found srb2.srb #if defined (_WIN32) + waddir = _fullpath(NULL, waddir, MAX_PATH); SetCurrentDirectoryA(waddir); #else + waddir = realpath(waddir, NULL); if (waddir == NULL || chdir(waddir) == -1) I_OutputMsg("Couldn't change working directory\n"); #endif } + return waddir; } diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index aa8a32866..6e21578f3 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -139,7 +139,7 @@ typedef LPVOID (WINAPI *p_MapViewOfFile) (HANDLE, DWORD, DWORD, DWORD, SIZE_T); #include #endif -// Locations to directly check for srb2.pk3 in +// Locations to directly check for srb2.srb in const char *wadDefaultPaths[] = { #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) "/usr/local/share/games/SRB2Kart", @@ -153,7 +153,7 @@ const char *wadDefaultPaths[] = { NULL }; -// Folders to recurse through looking for srb2.pk3 +// Folders to recurse through looking for srb2.srb const char *wadSearchPaths[] = { #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) "/usr/local/games", @@ -2346,7 +2346,7 @@ static void pathonly(char *s) */ static const char *searchWad(const char *searchDir) { - static char tempsw[MAX_WADPATH] = ""; + static char tempsw[255] = ""; filestatus_t fstemp; strcpy(tempsw, WADKEYWORD1); @@ -2397,6 +2397,18 @@ static const char *locateWad(void) return NULL; #endif +#ifndef NOHOME +#ifdef DEFAULTDIR + I_OutputMsg(",HOME/" DEFAULTDIR); + // examine user jart directory + if ((envstr = I_GetEnv("HOME")) != NULL) + { + sprintf(returnWadPath, "%s" PATHSEP DEFAULTDIR, envstr); + CHECKWADPATH(returnWadPath); + } +#endif +#endif + #ifdef __APPLE__ OSX_GetResourcesPath(returnWadPath); CHECKWADPATH(returnWadPath); @@ -2409,20 +2421,6 @@ static const char *locateWad(void) CHECKWADPATH(returnWadPath); } -#ifndef NOHOME - // find in $HOME - I_OutputMsg(",HOME/" DEFAULTDIR); - if ((envstr = I_GetEnv("HOME")) != NULL) - { - char *tmp = static_cast(malloc(strlen(envstr) + sizeof(PATHSEP) + sizeof(DEFAULTDIR))); - strcpy(tmp, envstr); - strcat(tmp, PATHSEP); - strcat(tmp, DEFAULTDIR); - CHECKWADPATH(tmp); - free(tmp); - } -#endif - // search paths for (i = 0; wadSearchPaths[i]; i++) { @@ -2436,7 +2434,7 @@ static const char *locateWad(void) const char *I_LocateWad(void) { - const char *waddir; + const char *waddir = NULL; I_OutputMsg("Looking for WADs in: "); waddir = locateWad(); @@ -2454,6 +2452,7 @@ const char *I_LocateWad(void) I_OutputMsg("Couldn't change working directory\n"); #endif } + return waddir; }