From 698c42192314bae258d9fabcee39744fc833d13b Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 24 Sep 2009 15:24:24 +0000 Subject: [PATCH] fix error in last mod ... support paths containing only a slash git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28733 72102866-910b-0410-8b05-ffd578937521 --- Source/NSURL.m | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/Source/NSURL.m b/Source/NSURL.m index 6513da162..138842d37 100644 --- a/Source/NSURL.m +++ b/Source/NSURL.m @@ -1323,14 +1323,25 @@ static unsigned urlAlign; NSString *path = nil; unsigned int len = 3; - if (_baseURL != nil && baseData->path != 0) + if (_baseURL != nil) { - len += strlen(baseData->path); + if (baseData->path && *baseData->path) + { + len += strlen(baseData->path); + } + else if (baseData->hasNoPath == NO) + { + len++; + } } - if (myData->path != 0) + if (myData->path && *myData->path) { len += strlen(myData->path); } + else if (myData->hasNoPath == NO) + { + len++; + } if (len > 3) { char buf[len]; @@ -1505,14 +1516,25 @@ static unsigned urlAlign; NSString *path = nil; unsigned int len = 3; - if (_baseURL != nil && baseData->path != 0) + if (_baseURL != nil) { - len += strlen(baseData->path); + if (baseData->path && *baseData->path) + { + len += strlen(baseData->path); + } + else if (baseData->hasNoPath == NO) + { + len++; + } } - if (myData->path != 0) + if (myData->path && *myData->path) { len += strlen(myData->path); } + else if (myData->hasNoPath == NO) + { + len++; + } if (len > 3) { char buf[len];