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

Mnor fixes and documentation addition.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12571 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-02-20 09:28:51 +00:00
parent c24c65b21e
commit 1d83e60bff
2 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -15,6 +15,9 @@
* Headers/gnustep/base/GSUnion.h: Enclose types bitmask in brackets
to avoid *all* types being included in the union! Should decrease
memory footprint and increase speed of many classes.
* Source/NSString.m: ([stringByStandardizingPath]) memory leak
fixed and windows path check fixed ... patch by Michael Scheibler.
Also commented/documented the method.
2002-02-13 Richard Frith-Macdonald <rfm@gnu.org>

35
Source/NSString.m
View file

@ -2833,6 +2833,21 @@ handle_printf_atsign (FILE *stream,
#endif /* (__MINGW__) */
}
/**
* Returns a standardised form of the receiver, with unnecessary parts
* removed, tilde characters expanded, and symbolic links resolved
* where possible.<br />
* If the string is an invalid path, the unmodified receiver is returned.<br />
* <p>
* Uses -stringByExpandingTildeInPath to expand tilde expressions.<br />
* Simplifies '//' and '/./' sequences.<br />
* Removes any '/private' prefix.
* </p>
* <p>
* For absolute paths, uses -stringByResolvingSymlinksInPath to resolve
* any links, then gets rid of '/../' sequences.
* </p>
*/
- (NSString*) stringByStandardizingPath
{
NSMutableString *s;
@ -2840,13 +2855,9 @@ handle_printf_atsign (FILE *stream,
unichar (*caiImp)(NSString*, SEL, unsigned);
/* Expand `~' in the path */
s = [[self stringByExpandingTildeInPath] mutableCopy];
s = AUTORELEASE([[self stringByExpandingTildeInPath] mutableCopy]);
caiImp = (unichar (*)())[s methodForSelector: caiSel];
/* Remove `/private' */
if ([s hasPrefix: @"/private"])
[s deleteCharactersInRange: ((NSRange){0,7})];
/* Condense `//' and '/./' */
r = NSMakeRange(0, [s length]);
while ((r = [s rangeOfCharacterFromSet: pathSeps()
@ -2891,6 +2902,12 @@ handle_printf_atsign (FILE *stream,
if ([s isAbsolutePath] == NO)
return s;
/* Remove `/private' */
if ([s hasPrefix: @"/private"])
{
[s deleteCharactersInRange: ((NSRange){0,7})];
}
/*
* For absolute paths, we must resolve symbolic links or (on MINGW)
* remove '/../' sequences and their matching parent directories.
@ -2914,7 +2931,13 @@ handle_printf_atsign (FILE *stream,
options: NSBackwardsSearch
range: r2];
if (r.length == 0)
r = r2;
{
r = r2;
}
else
{
r.length = r2.length - r.location - 1;
}
r.length += 4; /* Add the `/../' */
}
[s deleteCharactersInRange: r];