backport check for scheme

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/base-1_13_0@24304 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-01-02 06:53:23 +00:00
parent 6211b40e29
commit 5c4a470260
2 changed files with 21 additions and 14 deletions

View file

@ -1,3 +1,7 @@
2007-01-02 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSURL.m: backport check for scheme in URL.
2006-12-27 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSString.m: backport keyed archiving fix.

View file

@ -700,21 +700,24 @@ static unsigned urlAlign;
/*
* Set up scheme specific parsing options.
*/
if (buf->scheme != 0)
if (buf->scheme == 0)
{
DESTROY(self); // Not a valid URL
NS_VALRETURN(nil);
}
if (strcmp(buf->scheme, "file") == 0)
{
if (strcmp(buf->scheme, "file") == 0)
{
usesFragments = NO;
usesParameters = NO;
usesQueries = NO;
buf->isFile = YES;
}
else if (strcmp(buf->scheme, "mailto") == 0)
{
usesFragments = NO;
usesParameters = NO;
usesQueries = NO;
}
usesFragments = NO;
usesParameters = NO;
usesQueries = NO;
buf->isFile = YES;
}
else if (strcmp(buf->scheme, "mailto") == 0)
{
usesFragments = NO;
usesParameters = NO;
usesQueries = NO;
}
if (canBeGeneric == YES)