diff --git a/ChangeLog b/ChangeLog index a2248f482..959a14ea3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-05-09 Fred Kiefer + + * Source/NSBundle.m + Use fileSystemRepresentation instead of cString to get the file + name to load. + 2002-05-08 Richard Frith-Macdonald * Source/NSTask.m: When launching under windoze, don't forget to diff --git a/Source/NSBundle.m b/Source/NSBundle.m index 9957ebd2a..eae603715 100644 --- a/Source/NSBundle.m +++ b/Source/NSBundle.m @@ -117,7 +117,8 @@ static NSString *library_combo = const char * objc_executable_location (void) { - return [[_executable_path stringByDeletingLastPathComponent] cString]; + return [[_executable_path stringByDeletingLastPathComponent] + fileSystemRepresentation]; } static BOOL @@ -896,10 +897,11 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory) { path = _path; } + object = bundle_object_name(path, object); _loadingBundle = self; _bundleClasses = RETAIN([NSMutableArray arrayWithCapacity: 2]); - if (objc_load_module([object cString], + if (objc_load_module([object fileSystemRepresentation], stderr, _bundle_load_callback, NULL, NULL)) { [load_lock unlock];