gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve path handling under MINGW/MSYS

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13491 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-04-18 07:51:46 +00:00
parent ea3257eefc
commit a4d46f6a67
3 changed files with 85 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

73
Source/NSString.m
View file

@ -2478,7 +2478,7 @@ handle_printf_atsign (FILE *stream,
if (fm == nil)
{
fm = [NSFileManager defaultManager];
fm = RETAIN([NSFileManager defaultManager]);
}
return [fm fileSystemRepresentationWithPath: self];
@ -2507,17 +2507,25 @@ handle_printf_atsign (FILE *stream,
range = [self rangeOfCharacterFromSet: pathSeps() options: NSBackwardsSearch];
if (range.length == 0)
substring = AUTORELEASE([self copy]);
{
substring = AUTORELEASE([self copy]);
}
else if (range.location == ([self length] - 1))
{
if (range.location == 0)
substring = @"";
{
substring = @"";
}
else
substring = [[self substringToIndex: range.location]
lastPathComponent];
{
substring = [[self substringToIndex: range.location]
lastPathComponent];
}
}
else
substring = [self substringFromIndex: range.location + 1];
{
substring = [self substringFromIndex: range.location + 1];
}
return substring;
}
@ -2533,19 +2541,28 @@ handle_printf_atsign (FILE *stream,
range = [self rangeOfString: @"." options: NSBackwardsSearch];
if (range.length == 0)
substring = nil;
{
substring = nil;
}
else
{
NSRange range2 = [self rangeOfCharacterFromSet: pathSeps()
options: NSBackwardsSearch];
if (range2.length > 0 && range.location < range2.location)
substring = nil;
{
substring = nil;
}
else
substring = [self substringFromIndex: range.location + 1];
{
substring = [self substringFromIndex: range.location + 1];
}
}
if (!substring)
substring = @"";
if (substring == nil)
{
substring = @"";
}
return substring;
}
@ -2947,13 +2964,19 @@ handle_printf_atsign (FILE *stream,
r.location++;
}
if ((r.length = [s length]) > r.location)
r.length -= r.location;
{
r.length -= r.location;
}
else
break;
{
break;
}
}
if ([s isAbsolutePath] == NO)
return s;
{
return s;
}
/* Remove `/private' */
if ([s hasPrefix: @"/private"])
@ -2996,11 +3019,18 @@ handle_printf_atsign (FILE *stream,
[s deleteCharactersInRange: r];
}
else
r.location++;
{
r.location++;
}
if ((r.length = [s length]) > r.location)
r.length -= r.location;
{
r.length -= r.location;
}
else
break;
{
break;
}
}
return s;
@ -3040,10 +3070,14 @@ handle_printf_atsign (FILE *stream,
c = [components count];
if (c == 0)
return @"";
{
return @"";
}
s = [components objectAtIndex: 0];
if ([s length] == 0 || [s isEqualToString: pathSepString] == YES)
s = rootPath;
{
s = rootPath;
}
for (i = 1; i < c; i++)
{
s = [s stringByAppendingPathComponent: [components objectAtIndex: i]];
@ -3061,6 +3095,7 @@ handle_printf_atsign (FILE *stream,
if ([self indexOfString: @":"] == NSNotFound)
{
const char *cpath = [self fileSystemRepresentation];
if (isalpha(cpath[0]) && cpath[1] == ':')
{
return YES;