gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

add support for data:,xxx style URL

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35568 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2012-09-16 07:39:18 +00:00
parent 30934c87eb
commit ae328505c2
3 changed files with 111 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2012-09-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSURL.m:
* Tests/base/NSURL/basic.m:
Add support for data: URL
2012-09-10 Richard Frith-Macdonald <rfm@gnu.org> 2012-09-10 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSJSONSerialization.m: * Source/NSJSONSerialization.m:

183
Source/NSURL.m
View file

@ -1608,44 +1608,48 @@ static NSUInteger urlAlign;
- (NSString*) _pathWithEscapes: (BOOL)withEscapes - (NSString*) _pathWithEscapes: (BOOL)withEscapes
{ {
NSString *path = nil; NSString *path = nil;
unsigned int len = 3;
if (_baseURL != nil) if (YES == myData->isGeneric || 0 == myData->scheme)
{ {
if (baseData->path && *baseData->path) unsigned int len = 3;
if (_baseURL != nil)
{ {
len += strlen(baseData->path); if (baseData->path && *baseData->path)
} {
else if (baseData->hasNoPath == NO) len += strlen(baseData->path);
{ }
len++; else if (baseData->hasNoPath == NO)
} {
} len++;
if (myData->path && *myData->path) }
{ }
len += strlen(myData->path); if (myData->path && *myData->path)
} {
else if (myData->hasNoPath == NO) len += strlen(myData->path);
{ }
len++; else if (myData->hasNoPath == NO)
} {
if (len > 3) len++;
{ }
char buf[len]; if (len > 3)
char *ptr; {
char *tmp; char buf[len];
char *ptr;
char *tmp;
ptr = [self _path: buf withEscapes: withEscapes]; ptr = [self _path: buf withEscapes: withEscapes];
/* Remove any trailing '/' from the path for MacOS-X compatibility. /* Remove any trailing '/' from the path for MacOS-X compatibility.
*/ */
tmp = ptr + strlen(ptr) - 1; tmp = ptr + strlen(ptr) - 1;
if (tmp > ptr && *tmp == '/') if (tmp > ptr && *tmp == '/')
{ {
*tmp = '\0'; *tmp = '\0';
} }
path = [NSString stringWithUTF8String: ptr]; path = [NSString stringWithUTF8String: ptr];
}
} }
return path; return path;
} }
@ -1751,40 +1755,47 @@ static NSUInteger urlAlign;
- (NSString*) resourceSpecifier - (NSString*) resourceSpecifier
{ {
NSRange range = [_urlString rangeOfString: @"://"]; if (YES == myData->isGeneric)
if (range.length > 0)
{ {
NSString *specifier; NSRange range = [_urlString rangeOfString: @"://"];
/* MacOSX compatibility - in the case where there is no if (range.length > 0)
* host in the URL, just return the path (without the "//"). {
* For all other cases we return the whole specifier. NSString *specifier;
*/
if (nil == [self host]) /* MacOSX compatibility - in the case where there is no
{ * host in the URL, just return the path (without the "//").
specifier = [_urlString substringFromIndex: NSMaxRange(range)]; * For all other cases we return the whole specifier.
} */
if (nil == [self host])
{
specifier = [_urlString substringFromIndex: NSMaxRange(range)];
}
else
{
specifier = [_urlString substringFromIndex: range.location+1];
}
return specifier;
}
else else
{ {
specifier = [_urlString substringFromIndex: range.location+1]; /*
} * Cope with URLs missing net_path info - <scheme>:/<path>...
return specifier; */
range = [_urlString rangeOfString: @":"];
if (range.length > 0)
{
return [_urlString substringFromIndex: range.location + 1];
}
else
{
return _urlString;
}
}
} }
else else
{ {
/* return [NSString stringWithUTF8String: myData->path];
* Cope with URLs missing net_path info - <scheme>:/<path>...
*/
range = [_urlString rangeOfString: @":"];
if (range.length > 0)
{
return [_urlString substringFromIndex: range.location + 1];
}
else
{
return _urlString;
}
} }
} }
@ -2025,34 +2036,38 @@ static NSUInteger urlAlign;
- (NSString*) fullPath - (NSString*) fullPath
{ {
NSString *path = nil; NSString *path = nil;
unsigned int len = 3;
if (_baseURL != nil) if (YES == myData->isGeneric || 0 == myData->scheme)
{ {
if (baseData->path && *baseData->path) unsigned int len = 3;
if (_baseURL != nil)
{ {
len += strlen(baseData->path); if (baseData->path && *baseData->path)
} {
else if (baseData->hasNoPath == NO) len += strlen(baseData->path);
{ }
len++; else if (baseData->hasNoPath == NO)
} {
} len++;
if (myData->path && *myData->path) }
{ }
len += strlen(myData->path); if (myData->path && *myData->path)
} {
else if (myData->hasNoPath == NO) len += strlen(myData->path);
{ }
len++; else if (myData->hasNoPath == NO)
} {
if (len > 3) len++;
{ }
char buf[len]; if (len > 3)
char *ptr; {
char buf[len];
char *ptr;
ptr = [self _path: buf withEscapes: NO]; ptr = [self _path: buf withEscapes: NO];
path = [NSString stringWithUTF8String: ptr]; path = [NSString stringWithUTF8String: ptr];
}
} }
return path; return path;
} }

6
Tests/base/NSURL/basic.m
View file

@ -296,6 +296,12 @@ GSPathHandling("right");
PASS([url resourceDataUsingCache: NO] != nil, PASS([url resourceDataUsingCache: NO] != nil,
"can load file URL with anchor"); "can load file URL with anchor");
url = [NSURL URLWithString: @"data:,a23"];
PASS_EQUAL([url scheme], @"data", "can get scheme of data URL");
PASS_EQUAL([url path], nil, "path of data URL is nil");
PASS_EQUAL([url host], nil, "host of data URL is nil");
PASS_EQUAL([url resourceSpecifier], @",a23", "resourceSpecifier of data URL");
PASS_EQUAL([url absoluteString], @"data:,a23", "can get string of data URL");
[arp release]; arp = nil; [arp release]; arp = nil;
return 0; return 0;