MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formating problems with GetApplicationDir.

Browse Source 
Don't ever return an empty string
This commit is contained in:
Jeffery Myers 2022-01-14 09:48:08 -08:00
parent f57727995a
commit 3a5374fac4
1 changed files with 70 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/rcore.c
View File

@ -3003,86 +3003,94 @@ const char *GetWorkingDirectory(void)
const char *GetApplicationDirectory(void) const char *GetApplicationDirectory(void)
{ {
static char appDir[MAX_FILEPATH_LENGTH] = { 0 }; static char appDir[MAX_FILEPATH_LENGTH] = { 0 };
memset(appDir, 0, MAX_FILEPATH_LENGTH); memset(appDir, 0, MAX_FILEPATH_LENGTH);
#if defined(_WIN32) #if defined(_WIN32)
typedef unsigned long(*GetModuleFileNameFunc)(void*, void*, void*, unsigned long); typedef unsigned long(*GetModuleFileNameFunc)(void*, void*, void*, unsigned long);
GetModuleFileNameFunc getModuleFileNameExWPtr = NULL; GetModuleFileNameFunc getModuleFileNameExWPtr = NULL;
void *lib = LoadLibrary(L"psapi.dll"); void *lib = LoadLibrary(L"psapi.dll");
if (lib == NULL) if (lib == NULL)
{ {
appDir[0] = '\\'; appDir[0] = '\\';
} }
else else
{ {
#if defined (UNICODE) #if defined (UNICODE)
getModuleFileNameExWPtr = (GetModuleFileNameFunc)GetProcAddress(lib, "GetModuleFileNameExW"); getModuleFileNameExWPtr = (GetModuleFileNameFunc)GetProcAddress(lib, "GetModuleFileNameExW");
#else #else
getModuleFileNameExWPtr = (GetModuleFileNameFunc)GetProcAddress(lib, "GetModuleFileNameExA"); getModuleFileNameExWPtr = (GetModuleFileNameFunc)GetProcAddress(lib, "GetModuleFileNameExA");
#endif #endif
if (getModuleFileNameExWPtr == NULL) if (getModuleFileNameExWPtr == NULL)
{ {
appDir[0] = '\\'; appDir[0] = '\\';
} }
else else
{ {
int len = 0; int len = 0;
#if defined (UNICODE) #if defined (UNICODE)
unsigned short widePath[MAX_PATH]; unsigned short widePath[MAX_PATH];
len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, widePath, MAX_PATH); len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, widePath, MAX_PATH);
len = WideCharToMultiByte(0, 0, widePath, len, appDir, MAX_PATH, NULL, NULL); len = WideCharToMultiByte(0, 0, widePath, len, appDir, MAX_PATH, NULL, NULL);
#else #else
len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, appDir, MAX_PATH); len = getModuleFileNameExWPtr(GetCurrentProcess(), NULL, appDir, MAX_PATH);
#endif #endif
if (len > 0) if (len > 0)
{ {
for (int i = len; i >= 0; --i) for (int i = len; i >= 0; --i)
{ {
if (appDir[i] == '\\') if (appDir[i] == '\\')
{ {
appDir[i + 1] = '\0'; appDir[i + 1] = '\0';
i = -1; i = -1;
} }
} }
} }
} }
FreeLibrary(lib); FreeLibrary(lib);
} }
#elif defined(__linux__) #elif defined(__linux__)
unsigned int size = sizeof(appDir); unsigned int size = sizeof(appDir);
ssize_t len = readlink("/proc/self/exe", appDir, size); ssize_t len = readlink("/proc/self/exe", appDir, size);
if (len > 0) if (len > 0)
{ {
for (int i = len; i >= 0; --i) for (int i = len; i >= 0; --i)
{ {
if (appDir[i] == '/') if (appDir[i] == '/')
{ {
appDir[i + 1] = '\0'; appDir[i + 1] = '\0';
i = -1; i = -1;
} }
} }
} }
else
{
appDir[0] = '/';
}
#elif defined(__APPLE__) #elif defined(__APPLE__)
uint32_t size = sizeof(appDir); uint32_t size = sizeof(appDir);
if (_NSGetExecutablePath(appDir, &size) == 0) if (_NSGetExecutablePath(appDir, &size) == 0)
{ {
int len = strlen(appDir); int len = strlen(appDir);
for (int i = len; i >= 0; --i) for (int i = len; i >= 0; --i)
{ {
if (appDir[i] == '/') if (appDir[i] == '/')
{ {
appDir[i + 1] = '\0'; appDir[i + 1] = '\0';
i = -1; i = -1;
} }
} }
} }
else
{
appDir[0] = '/';
}
#endif #endif
return appDir; return appDir;