BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-13 01:45:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow opening asset paths starting with "./"

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/13933
This commit is contained in:
Sam Lantinga 2025-11-18 15:29:04 -08:00
parent 908216bbae
commit cc768f3e88
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/core/android/SDL_android.c
View file

@ -1873,6 +1873,17 @@ static void Internal_Android_Destroy_AssetManager(void)
}
}
static const char *GetAssetPath(const char *path)
{
if (path && path[0] == '.' && path[1] == '/') {
path += 2;
while (*path == '/') {
++path;
}
}
return path;
}
bool Android_JNI_FileOpen(void **puserdata, const char *fileName, const char *mode)
{
SDL_assert(puserdata != NULL);
@ -1882,11 +1893,12 @@ bool Android_JNI_FileOpen(void **puserdata, const char *fileName, const char *mo
if (!asset_manager) {
Internal_Android_Create_AssetManager();
if (!asset_manager) {
return SDL_SetError("Couldn't create asset manager");
}
}
if (!asset_manager) {
return SDL_SetError("Couldn't create asset manager");
}
fileName = GetAssetPath(fileName);
asset = AAssetManager_open(asset_manager, fileName, AASSET_MODE_UNKNOWN);
if (!asset) {
@ -1944,6 +1956,8 @@ bool Android_JNI_EnumerateAssetDirectory(const char *path, SDL_EnumerateDirector
}
}
path = GetAssetPath(path);
AAssetDir *adir = AAssetManager_openDir(asset_manager, path);
if (!adir) {
return SDL_SetError("AAssetManager_openDir failed");
@ -1969,6 +1983,8 @@ bool Android_JNI_GetAssetPathInfo(const char *path, SDL_PathInfo *info)
}
}
path = GetAssetPath(path);
// this is sort of messy, but there isn't a stat()-like interface to the Assets.
AAsset *aasset = AAssetManager_open(asset_manager, path, AASSET_MODE_UNKNOWN);
if (aasset) { // it's a file!