gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve debug output when initialised with bad string.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25687 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-12-06 10:56:22 +00:00
parent 75f1be5d8a
commit 7fde7c79d9
2 changed files with 66 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-12-06 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSURL.m: Increase detail of information about bad URL string
on initialisation. Only output debug info if --GNU-Debug=dflt
2007-12-06 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSException.m: honour environment variable for displaying

85
Source/NSURL.m
View file

@ -37,18 +37,19 @@ function may be incorrect
* Some functions are not implemented
*/
#import "config.h"
#import "Foundation/NSObject.h"
#import "Foundation/NSCoder.h"
#import "Foundation/NSArray.h"
#import "Foundation/NSCoder.h"
#import "Foundation/NSDebug.h"
#import "Foundation/NSDictionary.h"
#import "Foundation/NSString.h"
#import "Foundation/NSException.h"
#import "Foundation/NSFileManager.h"
#import "Foundation/NSLock.h"
#import "Foundation/NSMapTable.h"
#import "Foundation/NSURLHandle.h"
#import "Foundation/NSURL.h"
#import "Foundation/NSObject.h"
#import "Foundation/NSRunLoop.h"
#import "Foundation/NSString.h"
#import "Foundation/NSURL.h"
#import "Foundation/NSURLHandle.h"
#import "Foundation/NSValue.h"
#import "Foundation/NSZone.h"
@ -689,8 +690,12 @@ static unsigned urlAlign;
if (base != 0 && base->scheme != 0
&& strcmp(base->scheme, buf->scheme) != 0)
{
[NSException raise: NSGenericException format:
@"scheme of base and relative parts does not match"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"scheme of base and relative parts does not match",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
}
}
@ -761,8 +766,12 @@ static unsigned urlAlign;
start = ptr;
if (legal(buf->user, ";:&=+$,") == NO)
{
[NSException raise: NSGenericException format:
@"illegal character in user/password part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal character in user/password part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
ptr = strchr(buf->user, ':');
if (ptr != 0)
@ -824,8 +833,12 @@ static unsigned urlAlign;
}
else
{
[NSException raise: NSGenericException format:
@"illegal port part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal port part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
}
else if (isdigit(*str))
@ -834,16 +847,24 @@ static unsigned urlAlign;
}
else
{
[NSException raise: NSGenericException format:
@"illegal character in port part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal character in port part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
}
}
start = end;
if (legal(buf->host, "-") == NO)
{
[NSException raise: NSGenericException format:
@"illegal character in host part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal character in host part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
/*
@ -885,8 +906,12 @@ static unsigned urlAlign;
buf->fragment = base->fragment;
if (legal(buf->fragment, reserved) == NO)
{
[NSException raise: NSGenericException format:
@"illegal character in fragment part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal character in fragment part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
}
}
@ -910,8 +935,12 @@ static unsigned urlAlign;
buf->query = base->query;
if (legal(buf->query, reserved) == NO)
{
[NSException raise: NSGenericException format:
@"illegal character in query part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal character in query part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
}
}
@ -935,8 +964,12 @@ static unsigned urlAlign;
buf->parameters = base->parameters;
if (legal(buf->parameters, reserved) == NO)
{
[NSException raise: NSGenericException format:
@"illegal character in parameters part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal character in parameters part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
}
}
@ -965,13 +998,17 @@ static unsigned urlAlign;
buf->path = start;
if (legal(buf->path, reserved) == NO)
{
[NSException raise: NSGenericException format:
@"illegal character in path part"];
[NSException raise: NSInvalidArgumentException
format: @"[%@ %@](%@, %@) "
@"illegal character in path part",
NSStringFromClass([self class]),
NSStringFromSelector(_cmd),
aUrlString, aBaseUrl];
}
}
NS_HANDLER
{
NSLog(@"%@", localException);
NSDebugLog(@"%@", localException);
DESTROY(self);
}
NS_ENDHANDLER