Commit 491d0bcc3ca152158653f656957a5e78471436a7
2022-11-14T17:38:42
N3DS: Refactor N3DS_FileOpen.
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 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
diff --git a/src/file/n3ds/SDL_rwopsromfs.c b/src/file/n3ds/SDL_rwopsromfs.c
index c75323f..9d3ec87 100644
--- a/src/file/n3ds/SDL_rwopsromfs.c
+++ b/src/file/n3ds/SDL_rwopsromfs.c
@@ -22,6 +22,15 @@
#include "SDL_rwopsromfs.h"
#include "SDL_error.h"
+/* Checks if the mode is a kind of reading */
+SDL_FORCE_INLINE SDL_bool IsReadMode(const char *mode);
+
+/* Checks if the file starts with the given prefix */
+SDL_FORCE_INLINE SDL_bool HasPrefix(const char *file, const char *prefix);
+
+SDL_FORCE_INLINE FILE *TryOpenFile(const char *file, const char *mode);
+SDL_FORCE_INLINE FILE *TryOpenInRomfs(const char *file, const char *mode);
+
/* Nintendo 3DS applications may embed resources in the executable. The
resources are stored in a special read-only partition prefixed with
'romfs:/'. As such, when opening a file, we should first try the romfs
@@ -30,31 +39,58 @@
FILE *
N3DS_FileOpen(const char *file, const char *mode)
{
- FILE *fp = NULL;
- char *romfs_path;
-
/* romfs are read-only */
- if (SDL_strchr(mode, 'r') == NULL) {
+ if (!IsReadMode(mode)) {
return fopen(file, mode);
}
/* If the path has an explicit prefix, we skip the guess work */
- if (SDL_strncmp("romfs:/", file, 7) == 0 ||
- SDL_strncmp("sdmc:/", file, 6) == 0) {
+ if (HasPrefix(file, "romfs:/") || HasPrefix(file, "sdmc:/")) {
return fopen(file, mode);
}
- if (SDL_asprintf(&romfs_path, "romfs:/%s", file) < 0) {
- SDL_OutOfMemory();
- return NULL;
- }
+ return TryOpenFile(file, mode);
+}
+
+SDL_FORCE_INLINE SDL_bool
+IsReadMode(const char *mode)
+{
+ return SDL_strchr(mode, 'r') != NULL;
+}
+
+SDL_FORCE_INLINE SDL_bool
+HasPrefix(const char *file, const char *prefix)
+{
+ return SDL_strncmp(prefix, file, SDL_strlen(prefix)) == 0;
+}
- fp = fopen(romfs_path, mode);
+SDL_FORCE_INLINE FILE *
+TryOpenFile(const char *file, const char *mode)
+{
+ FILE *fp = NULL;
+
+ fp = TryOpenInRomfs(file, mode);
if (fp == NULL) {
fp = fopen(file, mode);
}
- SDL_free(romfs_path);
+ return fp;
+}
+
+SDL_FORCE_INLINE FILE *
+TryOpenInRomfs(const char *file, const char *mode)
+{
+ FILE *fp = NULL;
+ char *prefixed_filepath = NULL;
+
+ if (SDL_asprintf(&prefixed_filepath, "romfs:/%s", file) < 0) {
+ SDL_OutOfMemory();
+ return NULL;
+ }
+
+ fp = fopen(prefixed_filepath, mode);
+
+ SDL_free(prefixed_filepath);
return fp;
}