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

Fix #25400

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@27673 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-01-25 00:25:25 +00:00
parent 171ce33276
commit 98fbc66b1c
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2009-01-25 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSString.m: Fix for bug #25400
2009-01-23 Riccardo Mottola <rmottola@users.sf.net>
* Source/NSPointerFunctions.m,

24
Source/NSString.m
View file

@ -4077,13 +4077,25 @@ static NSFileManager *fm = nil;
while ((r = [s rangeOfString: @"." options: 0 range: r]).length == 1)
{
if (r.location > 0
&& pathSepMember((*caiImp)(s, caiSel, r.location-1)) == YES
&& (NSMaxRange(r) == l
|| pathSepMember((*caiImp)(s, caiSel, NSMaxRange(r))) == YES))
&& pathSepMember((*caiImp)(s, caiSel, r.location-1)) == YES)
{
r.length++;
[s deleteCharactersInRange: r];
l -= r.length;
unsigned pos = NSMaxRange(r);
if (pos == l)
{
[s deleteCharactersInRange: r];
l -= r.length;
}
else if (pathSepMember((*caiImp)(s, caiSel, pos)) == YES)
{
r.length++;
[s deleteCharactersInRange: r];
l -= r.length;
}
else
{
r.location++;
}
}
else
{