updated to latest SDL2 (f9244b2a151)

jni/SDL2-2.0.3/src/filesystem/android/SDL_sysfilesystem.c

@@ -0,0 +1,62 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  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_ANDROID
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+/* System dependent filesystem routines                                */
+
+#include <unistd.h>
+#include <errno.h>
+
+#include "SDL_error.h"
+#include "SDL_filesystem.h"
+#include "SDL_system.h"
+
+
+char *
+SDL_GetBasePath(void)
+{
+    /* The current working directory is / on Android */
+    return NULL;
+}
+
+char *
+SDL_GetPrefPath(const char *org, const char *app)
+{
+    const char *path = SDL_AndroidGetInternalStoragePath();
+    if (path) {
+        size_t pathlen = SDL_strlen(path)+2;
+        char *fullpath = (char *)SDL_malloc(pathlen);
+        if (!fullpath) {
+            SDL_OutOfMemory();
+            return NULL;
+        }
+        SDL_snprintf(fullpath, pathlen, "%s/", path);
+        return fullpath;
+    }
+    return NULL;
+}
+
+#endif /* SDL_FILESYSTEM_ANDROID */
+
+/* vi: set ts=4 sw=4 expandtab: */

jni/SDL2-2.0.3/src/filesystem/cocoa/SDL_sysfilesystem.m

@@ -35,8 +35,8 @@
 
 char *
 SDL_GetBasePath(void)
+{ @autoreleasepool
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSBundle *bundle = [NSBundle mainBundle];
     const char* baseType = [[[bundle infoDictionary] objectForKey:@"SDL_FILESYSTEM_BASE_DIR_TYPE"] UTF8String];
     const char *base = NULL;
@@ -62,14 +62,13 @@ SDL_GetBasePath(void)
         }
     }
 
-    [pool release];
     return retval;
-}
+}}
 
 char *
 SDL_GetPrefPath(const char *org, const char *app)
+{ @autoreleasepool
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     NSArray *array = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
     char *retval = NULL;
 
@@ -96,9 +95,8 @@ SDL_GetPrefPath(const char *org, const char *app)
         }
     }
 
-    [pool release];
     return retval;
-}
+}}
 
 #endif /* SDL_FILESYSTEM_COCOA */
 

jni/SDL2-2.0.3/src/filesystem/unix/SDL_sysfilesystem.c

@@ -197,7 +197,7 @@ SDL_GetPrefPath(const char *org, const char *app)
     }
     if (mkdir(retval, 0700) != 0 && errno != EEXIST) {
 error:
-        SDL_SetError("Couldn't create directory '%s': ", retval, strerror(errno));
+        SDL_SetError("Couldn't create directory '%s': '%s'", retval, strerror(errno));
         SDL_free(retval);
         return NULL;
     }