Check to see if the file exists in the base path before returning it
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
diff --git a/test/testutils.c b/test/testutils.c
index fa21fe2..e6773ac 100644
--- a/test/testutils.c
+++ b/test/testutils.c
@@ -30,6 +30,7 @@ GetNearbyFilename(const char *file)
base = SDL_GetBasePath();
if (base != NULL) {
+ SDL_RWops *rw;
size_t len = SDL_strlen(base) + SDL_strlen(pathsep) + SDL_strlen(file) + 1;
path = SDL_malloc(len);
@@ -42,13 +43,21 @@ GetNearbyFilename(const char *file)
SDL_snprintf(path, len, "%s%s%s", base, pathsep, file);
SDL_free(base);
- } else {
- path = SDL_strdup(file);
- if (path == NULL) {
- SDL_OutOfMemory();
+
+ rw = SDL_RWFromFile(path, "rb");
+ if (rw) {
+ SDL_RWclose(rw);
+ return path;
}
+
+ /* Couldn't find the file in the base path */
+ SDL_free(path);
}
+ path = SDL_strdup(file);
+ if (path == NULL) {
+ SDL_OutOfMemory();
+ }
return path;
}