Overview
| Comment: | ofhttp: Convert a method to a static function |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
608b76a23832e946ad40e5a0dd3f21ac |
| User & Date: | js on 2017-08-14 11:33:08 |
| Other Links: | manifest | tags |
Context
|
2017-08-14
| ||
| 13:33 | Always have assign before nonatomic check-in: 4eab54022e user: js tags: trunk | |
| 11:33 | ofhttp: Convert a method to a static function check-in: 608b76a238 user: js tags: trunk | |
| 00:49 | OFZIPArchive: Set CRC32 to 0, not -1 check-in: 6a474ba752 user: js tags: trunk | |
Changes
Modified utils/ofhttp/OFHTTP.m from [492c8ebbc8] to [729b47a746].
| ︙ | ︙ | |||
108 109 110 111 112 113 114 115 116 117 118 119 120 121 |
@" Verbose mode (print headers)\n "
@" --insecure "
@" Ignore TLS errors")];
}
[OFApplication terminateWithStatus: status];
}
@implementation OFHTTP
- init
{
self = [super init];
@try {
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 |
@" Verbose mode (print headers)\n "
@" --insecure "
@" Ignore TLS errors")];
}
[OFApplication terminateWithStatus: status];
}
static OFString *
fileNameFromContentDisposition(OFString *contentDisposition)
{
void *pool;
const char *UTF8String;
size_t UTF8StringLength;
enum {
DISPOSITION_TYPE,
DISPOSITION_TYPE_SEMICOLON,
DISPOSITION_PARAM_NAME_SKIP_SPACE,
DISPOSITION_PARAM_NAME,
DISPOSITION_PARAM_VALUE,
DISPOSITION_PARAM_QUOTED,
DISPOSITION_EXPECT_SEMICOLON
} state;
size_t last;
OFString *type = nil, *paramName = nil, *paramValue;
OFMutableDictionary *params;
OFString *fileName;
if (contentDisposition == nil)
return nil;
pool = objc_autoreleasePoolPush();
UTF8String = [contentDisposition UTF8String];
UTF8StringLength = [contentDisposition UTF8StringLength];
state = DISPOSITION_TYPE;
params = [OFMutableDictionary dictionary];
last = 0;
for (size_t i = 0; i < UTF8StringLength; i++) {
switch (state) {
case DISPOSITION_TYPE:
if (UTF8String[i] == ';' || UTF8String[i] == ' ') {
type = [OFString
stringWithUTF8String: UTF8String
length: i];
state = (UTF8String[i] == ';'
? DISPOSITION_PARAM_NAME_SKIP_SPACE
: DISPOSITION_TYPE_SEMICOLON);
last = i + 1;
}
break;
case DISPOSITION_TYPE_SEMICOLON:
if (UTF8String[i] == ';') {
state = DISPOSITION_PARAM_NAME_SKIP_SPACE;
last = i + 1;
} else if (UTF8String[i] != ' ') {
objc_autoreleasePoolPop(pool);
return nil;
}
break;
case DISPOSITION_PARAM_NAME_SKIP_SPACE:
if (UTF8String[i] != ' ') {
state = DISPOSITION_PARAM_NAME;
last = i;
i--;
}
break;
case DISPOSITION_PARAM_NAME:
if (UTF8String[i] == '=') {
paramName = [OFString
stringWithUTF8String: UTF8String + last
length: i - last];
state = DISPOSITION_PARAM_VALUE;
}
break;
case DISPOSITION_PARAM_VALUE:
if (UTF8String[i] == '"') {
state = DISPOSITION_PARAM_QUOTED;
last = i + 1;
} else {
objc_autoreleasePoolPop(pool);
return nil;
}
break;
case DISPOSITION_PARAM_QUOTED:
if (UTF8String[i] == '"') {
paramValue = [OFString
stringWithUTF8String: UTF8String + last
length: i - last];
[params setObject: paramValue
forKey: paramName];
state = DISPOSITION_EXPECT_SEMICOLON;
}
break;
case DISPOSITION_EXPECT_SEMICOLON:
if (UTF8String[i] == ';') {
state = DISPOSITION_PARAM_NAME_SKIP_SPACE;
last = i + 1;
} else if (UTF8String[i] != ' ') {
objc_autoreleasePoolPop(pool);
return nil;
}
break;
}
}
if (state != DISPOSITION_EXPECT_SEMICOLON) {
objc_autoreleasePoolPop(pool);
return nil;
}
if (![type isEqual: @"attachment"] ||
(fileName = [params objectForKey: @"filename"]) == nil) {
objc_autoreleasePoolPop(pool);
return nil;
}
fileName = [fileName lastPathComponent];
[fileName retain];
objc_autoreleasePoolPop(pool);
return [fileName autorelease];
}
@implementation OFHTTP
- init
{
self = [super init];
@try {
|
| ︙ | ︙ | |||
502 503 504 505 506 507 508 | if (!_quiet && response != nil) [of_stdout writeFormat: @" ➜ %d\n", [response statusCode]]; return response; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 623 624 625 626 627 628 629 630 631 632 633 634 635 636 |
if (!_quiet && response != nil)
[of_stdout writeFormat: @" ➜ %d\n", [response statusCode]];
return response;
}
- (bool)stream: (OFHTTPResponse *)response
didReadIntoBuffer: (void *)buffer
length: (size_t)length
exception: (OFException *)e
{
if (e != nil) {
OFString *URL;
|
| ︙ | ︙ | |||
741 742 743 744 745 746 747 |
[request setMethod: OF_HTTP_REQUEST_METHOD_HEAD];
if ((response = [self performRequest: request]) == nil) {
_errorCode = 1;
goto next;
}
| | | | 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 |
[request setMethod: OF_HTTP_REQUEST_METHOD_HEAD];
if ((response = [self performRequest: request]) == nil) {
_errorCode = 1;
goto next;
}
fileName = fileNameFromContentDisposition(
[[response headers] objectForKey: @"Content-Disposition"]);
}
if (!_quiet)
[of_stdout writeFormat: @"⇣ %@", [URL string]];
if (_outputPath != nil)
fileName = _outputPath;
|
| ︙ | ︙ |