From a3bfd366659dfcd46e7e3948bfa3c4fe64533066 Mon Sep 17 00:00:00 2001
From: Alex Threlfo <[EMAIL REDACTED]>
Date: Fri, 20 Feb 2026 15:18:48 +1100
Subject: [PATCH] filesystem: Fix Android asset enumeration
Passes expected relative paths to Android's AssetManager API instead of
absolute ones + fixes some indexing logic with trailing slashes.
---
src/filesystem/posix/SDL_sysfsops.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/filesystem/posix/SDL_sysfsops.c b/src/filesystem/posix/SDL_sysfsops.c
index fb47e986fd7bc..1ab9f803018be 100644
--- a/src/filesystem/posix/SDL_sysfsops.c
+++ b/src/filesystem/posix/SDL_sysfsops.c
@@ -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.
pathwithseplen--;
- while ((pathwithseplen > 0) && (pathwithsep[pathwithseplen] == '/')) {
+ while ((pathwithseplen > 0) && (pathwithsep[pathwithseplen - 1] == '/')) {
pathwithsep[pathwithseplen--] = '\0';
}
DIR *dir = opendir(pathwithsep);
if (!dir) {
- #ifdef SDL_PLATFORM_ANDROID // Maybe it's an asset...?
- const bool retval = Android_JNI_EnumerateAssetDirectory(pathwithsep, cb, userdata);
+#ifdef SDL_PLATFORM_ANDROID // Maybe it's an asset...?
+ const bool retval = Android_JNI_EnumerateAssetDirectory(pathwithsep + extralen, cb, userdata);
SDL_free(pathwithsep);
return retval;
- #else
+#else
SDL_free(pathwithsep);
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;
struct dirent *ent;
while ((result == SDL_ENUM_CONTINUE) && ((ent = readdir(dir)) != NULL)) {
@@ -454,4 +450,3 @@ char *SDL_SYS_GetCurrentDirectory(void)
}
#endif // SDL_FSOPS_POSIX
-