From 3db898c5b6f70c84383bf61914f99f71ca4f4b1f Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Thu, 13 Feb 2020 22:32:35 +0000 Subject: [PATCH] riscos: Implement SDL_GetPrefPath() --- CMakeLists.txt | 7 ++ configure | 8 ++ configure.ac | 6 ++ include/SDL_config.h.cmake | 1 + include/SDL_config.h.in | 1 + src/filesystem/riscos/SDL_sysfilesystem.c | 92 +++++++++++++++++++++++ 6 files changed, 115 insertions(+) create mode 100644 src/filesystem/riscos/SDL_sysfilesystem.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a067935f..cfd57125c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2114,6 +2114,13 @@ elseif(RISCOS) set(SOURCE_FILES ${SOURCE_FILES} ${MISC_SOURCES}) set(HAVE_SDL_MISC TRUE) + if(SDL_FILESYSTEM) + set(SDL_FILESYSTEM_RISCOS 1) + file(GLOB FILESYSTEM_SOURCES ${SDL2_SOURCE_DIR}/src/filesystem/riscos/*.c) + set(SOURCE_FILES ${SOURCE_FILES} ${FILESYSTEM_SOURCES}) + set(HAVE_SDL_FILESYSTEM TRUE) + endif() + if(SDL_TIMERS) set(SDL_TIMER_UNIX 1) file(GLOB TIMER_SOURCES ${SDL2_SOURCE_DIR}/src/timer/unix/*.c) diff --git a/configure b/configure index f626718e2..060845a7f 100755 --- a/configure +++ b/configure @@ -25794,6 +25794,14 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h SOURCES="$SOURCES $srcdir/src/misc/riscos/*.c" have_misc=yes + # Set up files for the filesystem library + if test x$enable_filesystem = xyes; then + +$as_echo "#define SDL_FILESYSTEM_RISCOS 1" >>confdefs.h + + SOURCES="$SOURCES $srcdir/src/filesystem/riscos/*.c" + have_filesystem=yes + fi # Set up files for the timer library if test x$enable_timers = xyes; then diff --git a/configure.ac b/configure.ac index a5f659bcf..3a71a16d5 100644 --- a/configure.ac +++ b/configure.ac @@ -4277,6 +4277,12 @@ case "$host" in SOURCES="$SOURCES $srcdir/src/misc/riscos/*.c" have_misc=yes + # Set up files for the filesystem library + if test x$enable_filesystem = xyes; then + AC_DEFINE(SDL_FILESYSTEM_RISCOS, 1, [ ]) + SOURCES="$SOURCES $srcdir/src/filesystem/riscos/*.c" + have_filesystem=yes + fi # Set up files for the timer library if test x$enable_timers = xyes; then AC_DEFINE(SDL_TIMER_UNIX, 1, [ ]) diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake index 4c23f2622..02b076426 100644 --- a/include/SDL_config.h.cmake +++ b/include/SDL_config.h.cmake @@ -469,6 +469,7 @@ #cmakedefine SDL_FILESYSTEM_HAIKU @SDL_FILESYSTEM_HAIKU@ #cmakedefine SDL_FILESYSTEM_COCOA @SDL_FILESYSTEM_COCOA@ #cmakedefine SDL_FILESYSTEM_DUMMY @SDL_FILESYSTEM_DUMMY@ +#cmakedefine SDL_FILESYSTEM_RISCOS @SDL_FILESYSTEM_RISCOS@ #cmakedefine SDL_FILESYSTEM_UNIX @SDL_FILESYSTEM_UNIX@ #cmakedefine SDL_FILESYSTEM_WINDOWS @SDL_FILESYSTEM_WINDOWS@ #cmakedefine SDL_FILESYSTEM_EMSCRIPTEN @SDL_FILESYSTEM_EMSCRIPTEN@ diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 09fb4e6fc..35f5bd0b4 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -447,6 +447,7 @@ #undef SDL_FILESYSTEM_ANDROID #undef SDL_FILESYSTEM_EMSCRIPTEN #undef SDL_FILESYSTEM_OS2 +#undef SDL_FILESYSTEM_RISCOS /* Enable assembly routines */ #undef SDL_ASSEMBLY_ROUTINES diff --git a/src/filesystem/riscos/SDL_sysfilesystem.c b/src/filesystem/riscos/SDL_sysfilesystem.c new file mode 100644 index 000000000..a16effffe --- /dev/null +++ b/src/filesystem/riscos/SDL_sysfilesystem.c @@ -0,0 +1,92 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2019 Sam Lantinga + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ +#include "../../SDL_internal.h" + +#ifdef SDL_FILESYSTEM_RISCOS + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* System dependent filesystem routines */ + +#include +#include + +#include "SDL_error.h" +#include "SDL_stdinc.h" +#include "SDL_filesystem.h" +#include "SDL_rwops.h" + +char * +SDL_GetBasePath(void) +{ + SDL_Unsupported(); + return NULL; +} + +char * +SDL_GetPrefPath(const char *org, const char *app) +{ + const char *prefix = "//"; + char *retval = NULL; + char *ptr = NULL; + size_t len = 0; + + if (!app) { + SDL_InvalidParamError("app"); + return NULL; + } + if (!org) { + org = ""; + } + + len = SDL_strlen(prefix) + SDL_strlen(org) + SDL_strlen(app) + 3; + retval = (char *) SDL_malloc(len); + if (!retval) { + SDL_OutOfMemory(); + return NULL; + } + + if (*org) { + SDL_snprintf(retval, len, "%s%s/%s/", prefix, org, app); + } else { + SDL_snprintf(retval, len, "%s%s/", prefix, app); + } + + for (ptr = retval+1; *ptr; ptr++) { + if (*ptr == '/') { + *ptr = '\0'; + if (mkdir(retval, 0700) != 0 && errno != EEXIST) + goto error; + *ptr = '/'; + } + } + if (mkdir(retval, 0700) != 0 && errno != EEXIST) { +error: + SDL_SetError("Couldn't create directory '%s': '%s'", retval, strerror(errno)); + SDL_free(retval); + return NULL; + } + + return retval; +} + +#endif /* SDL_FILESYSTEM_RISCOS */ + +/* vi: set ts=4 sw=4 expandtab: */