git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25052 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-04-15 09:15:56 +00:00
parent e4b89ea9aa
commit 3117236cd7
2 changed files with 12 additions and 5 deletions

View file

@ -1,3 +1,10 @@
2007-04-15 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m:
([+pathForResource:ofType:inRootPath:inDirectory:withVersion:])
Tolerate nil/empty resource name for compatibility with MacOS-X
nad to fix bug #19588
2007-04-13 Ricccardo Mottola <riccardo@kaffe.org>
* Source/NSSortDescriptor.m : removed C99-ism

View file

@ -1595,11 +1595,9 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
NSString *path, *fullpath;
NSEnumerator* pathlist;
if (!name || [name length] == 0)
if (name == nil)
{
[NSException raise: NSInvalidArgumentException
format: @"No resource name specified."];
/* NOT REACHED */
name = @"";
}
pathlist = [[self _bundleResourcePathsWithRootPath: rootPath
@ -1627,7 +1625,9 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
}
}
else
fullpath = nil;
{
fullpath = nil;
}
}
else
{