gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix for bug #32564 ?

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32462 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-03-05 16:33:24 +00:00
parent f8989f9ba3
commit 62a00dd0a8
2 changed files with 90 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-03-05 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: AbsolutePathOfExecutable() attempt to fix this
to return a fully standardised path without symbolic links.
2011-03-05 Tom Davie <beelsebob2>
* Source/NSSet.m:

151
Source/NSBundle.m
View file

@ -159,78 +159,91 @@ static NSString *library_combo =
static NSString*
AbsolutePathOfExecutable(NSString *path, BOOL atLaunch)
{
NSFileManager *mgr = manager();
NSDictionary *env;
NSString *pathlist;
NSString *prefix;
id patharr;
if (NO == [path isAbsolutePath])
{
NSFileManager *mgr = manager();
NSDictionary *env;
NSString *pathlist;
NSString *prefix;
id patharr;
NSString *result = nil;
path = [path stringByStandardizingPath];
if ([path isAbsolutePath])
{
return path;
}
env = [[NSProcessInfo processInfo] environment];
pathlist = [env objectForKey:@"PATH"];
env = [[NSProcessInfo processInfo] environment];
pathlist = [env objectForKey:@"PATH"];
/* Windows 2000 and perhaps others have "Path" not "PATH" */
if (pathlist == nil)
{
pathlist = [env objectForKey:@"Path"];
}
#if defined(__MINGW__)
patharr = [pathlist componentsSeparatedByString:@";"];
#else
patharr = [pathlist componentsSeparatedByString:@":"];
#endif
/* Add . if not already in path */
if ([patharr indexOfObject: @"."] == NSNotFound)
{
patharr = AUTORELEASE([patharr mutableCopy]);
[patharr addObject: @"."];
}
patharr = [patharr objectEnumerator];
while ((prefix = [patharr nextObject]))
{
if ([prefix isEqual:@"."])
/* Windows 2000 and perhaps others have "Path" not "PATH" */
if (pathlist == nil)
{
if (atLaunch == YES)
pathlist = [env objectForKey:@"Path"];
}
#if defined(__MINGW__)
patharr = [pathlist componentsSeparatedByString:@";"];
#else
patharr = [pathlist componentsSeparatedByString:@":"];
#endif
/* Add . if not already in path */
if ([patharr indexOfObject: @"."] == NSNotFound)
{
patharr = AUTORELEASE([patharr mutableCopy]);
[patharr addObject: @"."];
}
patharr = [patharr objectEnumerator];
while (nil != (prefix = [patharr nextObject]))
{
if ([prefix isEqual:@"."])
{
prefix = _launchDirectory;
if (atLaunch == YES)
{
prefix = _launchDirectory;
}
else
{
prefix = [mgr currentDirectoryPath];
}
}
prefix = [prefix stringByAppendingPathComponent: path];
if ([mgr isExecutableFileAtPath: prefix])
{
result = [prefix stringByStandardizingPath];
break;
}
#if defined(__WIN32__)
else
{
prefix = [mgr currentDirectoryPath];
}
}
prefix = [prefix stringByAppendingPathComponent: path];
if ([mgr isExecutableFileAtPath: prefix])
{
return [prefix stringByStandardizingPath];
}
#if defined(__WIN32__)
{
NSString *ext = [path pathExtension];
NSString *ext = [path pathExtension];
/* Also add common executable extensions on windows */
if (ext == nil || [ext length] == 0)
{
NSString *wpath;
wpath = [prefix stringByAppendingPathExtension: @"exe"];
if ([mgr isExecutableFileAtPath: wpath])
return [wpath stringByStandardizingPath];
wpath = [prefix stringByAppendingPathExtension: @"com"];
if ([mgr isExecutableFileAtPath: wpath])
return [wpath stringByStandardizingPath];
wpath = [prefix stringByAppendingPathExtension: @"cmd"];
if ([mgr isExecutableFileAtPath: wpath])
return [wpath stringByStandardizingPath];
}
}
/* Also add common executable extensions on windows */
if (ext == nil || [ext length] == 0)
{
NSString *wpath;
wpath = [prefix stringByAppendingPathExtension: @"exe"];
if ([mgr isExecutableFileAtPath: wpath])
{
result = [wpath stringByStandardizingPath];
break;
}
wpath = [prefix stringByAppendingPathExtension: @"com"];
if ([mgr isExecutableFileAtPath: wpath])
{
result = [wpath stringByStandardizingPath];
break;
}
wpath = [prefix stringByAppendingPathExtension: @"cmd"];
if ([mgr isExecutableFileAtPath: wpath])
{
result = [wpath stringByStandardizingPath];
break;
}
}
}
#endif
}
path = result;
}
return nil;
path = [path stringByResolvingSymlinksInPath];
path = [path stringByStandardizingPath];
return path;
}
/*
@ -247,7 +260,7 @@ GSPrivateExecutablePath()
[load_lock lock];
if (beenHere == NO)
{
#ifdef PROCFS_EXE_LINK
#if defined(PROCFS_EXE_LINK)
executablePath = [manager()
pathContentOfSymbolicLinkAtPath:
[NSString stringWithUTF8String: PROCFS_EXE_LINK]];
@ -1310,6 +1323,9 @@ IF_NO_GC(
* so we can manipulate it without having to worry about
* details like that throughout the code.
*/
/* 1. make path absolute.
*/
if ([path isAbsolutePath] == NO)
{
NSWarnMLog(@"NSBundle -initWithPath: requires absolute path names, "
@ -1349,12 +1365,15 @@ IF_NO_GC(
#endif
}
/*
* Standardize the path so we can be sure that cache lookup is consistent.
/* 2. Expand any symbolic links.
*/
path = [path stringByResolvingSymlinksInPath];
/* 3. Standardize so we can be sure that cache lookup is consistent.
*/
path = [path stringByStandardizingPath];
/* Check if we were already initialized for this directory */
/* check if we were already initialized for this directory */
[load_lock lock];
if (_bundles)
{