gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

tweaks for osx compatiblity

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32470 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-03-06 05:58:50 +00:00
parent a34befb2f5
commit f3fca57168
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Source/NSString.m
View file

@ -4088,9 +4088,21 @@ static NSFileManager *fm = nil;
- (NSString*) stringByResolvingSymlinksInPath
{
NSString *s = self;
if (0 == [s length])
{
return @"";
}
if ('~' == [s characterAtIndex: 0])
{
s = [s stringByExpandingTildeInPath];
}
#if defined(__MINGW__)
return IMMUTABLE(self);
#else
return IMMUTABLE(s);
#endif
{
#ifndef PATH_MAX
#define PATH_MAX 1024
/* Don't use realpath unless we know we have the correct path size limit */
@ -4101,12 +4113,12 @@ static NSFileManager *fm = nil;
char newBuf[PATH_MAX];
#ifdef HAVE_REALPATH
if (realpath([self fileSystemRepresentation], newBuf) == 0)
return IMMUTABLE(self);
if (realpath([s fileSystemRepresentation], newBuf) == 0)
return IMMUTABLE(s);
#else
char extra[PATH_MAX];
char *dest;
const char *name = [self fileSystemRepresentation];
const char *name = [s fileSystemRepresentation];
const char *start;
const char *end;
unsigned num_links = 0;
@ -4255,7 +4267,7 @@ static NSFileManager *fm = nil;
}
return [[NSFileManager defaultManager]
stringWithFileSystemRepresentation: newBuf length: strlen(newBuf)];
#endif /* (__MINGW__) */
}
}
- (NSString*) stringByStandardizingPath