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

Tidyups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17804 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2003-10-08 16:26:59 +00:00
parent 2c18a5ea43
commit c4b038113d
4 changed files with 127 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

57
Source/Additions/GSMime.m
View file

@ -3481,8 +3481,39 @@ static NSCharacterSet *tokenSet = nil;
- (NSString*) contentSubtype
{
GSMimeHeader *hdr = [self headerNamed: @"content-type"];
NSString *val = nil;
return [hdr objectForKey: @"Subtype"];
if (hdr != nil)
{
val = [hdr objectForKey: @"Subtype"];
if (val == nil)
{
val = [hdr value];
if (val != nil)
{
NSRange r;
r = [val rangeOfString: @"/"];
if (r.length > 0)
{
val = [val substringFromIndex: r.location + 1];
r = [val rangeOfString: @"/"];
if (r.length > 0)
{
val = [val substringToIndex: r.location];
}
val = [val stringByTrimmingSpaces];
[hdr setObject: val forKey: @"Subtype"];
}
else
{
val = nil;
}
}
}
}
return val;
}
/**
@ -3491,8 +3522,30 @@ static NSCharacterSet *tokenSet = nil;
- (NSString*) contentType
{
GSMimeHeader *hdr = [self headerNamed: @"content-type"];
NSString *val = nil;
return [hdr objectForKey: @"Type"];
if (hdr != nil)
{
val = [hdr objectForKey: @"Type"];
if (val == nil)
{
val = [hdr value];
if (val != nil)
{
NSRange r;
r = [val rangeOfString: @"/"];
if (r.length > 0)
{
val = [val substringToIndex: r.location];
val = [val stringByTrimmingSpaces];
}
[hdr setObject: val forKey: @"Type"];
}
}
}
return val;
}
/**