Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-05-27 10:57:22 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

filesystem: Fix Android asset enumeration

Browse Source 
Passes expected relative paths to Android's AssetManager API instead of
absolute ones + fixes some indexing logic with trailing slashes.
This commit is contained in:
Alex Threlfo
2026-02-20 15:18:48 +11:00
committed by Sam Lantinga
parent 2aacf018f0
commit 6583134365
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/filesystem/posix/SDL_sysfsops.c
+5 -10
View File
@@ -83,26 +83,22 @@ bool SDL_SYS_EnumerateDirectory(const char *path, SDL_EnumerateDirectoryCallback
// trim down to a single path separator at the end, in case the caller added one or more. // trim down to a single path separator at the end, in case the caller added one or more.
pathwithseplen--; pathwithseplen--;
while ((pathwithseplen > 0) && (pathwithsep[pathwithseplen] == '/')) { while ((pathwithseplen > 0) && (pathwithsep[pathwithseplen - 1] == '/')) {
pathwithsep[pathwithseplen--] = '\0'; pathwithsep[pathwithseplen--] = '\0';
} }
DIR *dir = opendir(pathwithsep); DIR *dir = opendir(pathwithsep);
if (!dir) { if (!dir) {
#ifdef SDL_PLATFORM_ANDROID // Maybe it's an asset...? #ifdef SDL_PLATFORM_ANDROID // Maybe it's an asset...?
const bool retval = Android_JNI_EnumerateAssetDirectory(pathwithsep, cb, userdata); const bool retval = Android_JNI_EnumerateAssetDirectory(pathwithsep + extralen, cb, userdata);
SDL_free(pathwithsep); SDL_free(pathwithsep);
return retval; return retval;
#else #else
SDL_free(pathwithsep); SDL_free(pathwithsep);
return SDL_SetError("Can't open directory: %s", strerror(errno)); return SDL_SetError("Can't open directory: %s", strerror(errno));
#endif #endif
} }
// make sure there's a path separator at the end now for the actual callback.
pathwithsep[++pathwithseplen] = '/';
pathwithsep[++pathwithseplen] = '\0';
SDL_EnumerationResult result = SDL_ENUM_CONTINUE; SDL_EnumerationResult result = SDL_ENUM_CONTINUE;
struct dirent *ent; struct dirent *ent;
while ((result == SDL_ENUM_CONTINUE) && ((ent = readdir(dir)) != NULL)) { while ((result == SDL_ENUM_CONTINUE) && ((ent = readdir(dir)) != NULL)) {
@@ -454,4 +450,3 @@ char *SDL_SYS_GetCurrentDirectory(void)
} }
#endif // SDL_FSOPS_POSIX #endif // SDL_FSOPS_POSIX