Exempted writable modes from bundle check on OS X since bundle areas …

…are typically read-only.
libsdl-org · May 8, 2010 · 31f815b · 31f815b
1 parent 4869aa0
commit 31f815b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/file/cocoa/SDL_rwopsbundlesupport.m b/src/file/cocoa/SDL_rwopsbundlesupport.m
@@ -12,6 +12,12 @@
 {
     FILE* fp = NULL;
 
+	// If the file mode is writable, skip all the bundle stuff because generally the bundle is read-only.
+	if(strcmp("r", mode) && strcmp("rb", mode))
+	{
+		return fopen(file, mode);
+	}
+
 	NSAutoreleasePool* autorelease_pool = [[NSAutoreleasePool alloc] init];
 
 

diff --git a/test/automated/rwops/Test_rwopsbundlesupport.m b/test/automated/rwops/Test_rwopsbundlesupport.m
@@ -12,6 +12,12 @@
 {
     FILE* fp = NULL;
 
+	// If the file mode is writable, skip all the bundle stuff because generally the bundle is read-only.
+	if(strcmp("r", mode) && strcmp("rb", mode))
+	{
+		return fopen(file, mode);
+	}
+
 	NSAutoreleasePool* autorelease_pool = [[NSAutoreleasePool alloc] init];
 
 

diff --git a/test/automated/rwops/rwops.c b/test/automated/rwops/rwops.c
@@ -227,7 +227,6 @@ static void rwops_testFP (void)
 
    /* Run read tests. */
 #if __APPLE__
-	/* Cheating: Using private API in SDL */
 	fp = Test_OpenFPFromBundleOrFallback( RWOPS_READ, "r" );
 #else
    fp = fopen( RWOPS_READ, "r" );
@@ -243,7 +242,6 @@ static void rwops_testFP (void)
 
    /* Run write tests. */
 #if __APPLE__
-	/* Cheating: Using private API in SDL */
 	fp = Test_OpenFPFromTemporaryDir( RWOPS_WRITE, "w+" );
 #else
    fp = fopen( RWOPS_WRITE, "w+" );