pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exempted writable modes from bundle check on OS X since bundle areas are typically read-only.

Browse source
This commit is contained in:
Eric Wing 2010-05-08 04:52:17 -07:00
parent a67b7bdcab
commit 1a24b61487
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/file/cocoa/SDL_rwopsbundlesupport.m
View file

@ -12,6 +12,12 @@ FILE* SDL_OpenFPFromBundleOrFallback(const char *file, const char *mode)
{ {
FILE* fp = NULL; 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]; NSAutoreleasePool* autorelease_pool = [[NSAutoreleasePool alloc] init];

6
test/automated/rwops/Test_rwopsbundlesupport.m
View file

@ -12,6 +12,12 @@ FILE* Test_OpenFPFromBundleOrFallback(const char *file, const char *mode)
{ {
FILE* fp = NULL; 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]; NSAutoreleasePool* autorelease_pool = [[NSAutoreleasePool alloc] init];

2
test/automated/rwops/rwops.c
View file

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