Modified generators/library/LibraryGenerator.m
from [2b3f82b5f9]
to [e748483318].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
|
*/
#include "config.h"
#import "OFApplication.h"
#import "OFFile.h"
#import "OFFileManager.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFXMLElement.h"
#import "FuncArrayGenerator.h"
#import "GlueGenerator.h"
#import "LinkLibGenerator.h"
@interface LibraryGenerator: OFObject <OFApplicationDelegate>
@end
OF_APPLICATION_DELEGATE(LibraryGenerator)
@implementation LibraryGenerator
- (void)applicationDidFinishLaunching: (OFNotification *)notification
{
OFURI *sourcesURI = [[OFFileManager defaultManager].currentDirectoryURI
URIByAppendingPathComponent: @"../../src"];
OFURI *runtimeLibraryURI = [sourcesURI
URIByAppendingPathComponent: @"runtime/amiga-library.xml"];
OFURI *runtimeLinkLibURI = [sourcesURI
URIByAppendingPathComponent: @"runtime/linklib/linklib.m"];
OFURI *runtimeGlueHeaderURI = [sourcesURI
URIByAppendingPathComponent: @"runtime/amiga-glue.h"];
OFURI *runtimeGlueURI = [sourcesURI
URIByAppendingPathComponent: @"runtime/amiga-glue.m"];
OFURI *runtimeFuncArrayURI = [sourcesURI
URIByAppendingPathComponent: @"runtime/amiga-funcarray.inc"];
OFIRI *sourcesIRI = [[OFFileManager defaultManager].currentDirectoryIRI
IRIByAppendingPathComponent: @"../../src"];
OFIRI *runtimeLibraryIRI = [sourcesIRI
IRIByAppendingPathComponent: @"runtime/amiga-library.xml"];
OFIRI *runtimeLinkLibIRI = [sourcesIRI
IRIByAppendingPathComponent: @"runtime/linklib/linklib.m"];
OFIRI *runtimeGlueHeaderIRI = [sourcesIRI
IRIByAppendingPathComponent: @"runtime/amiga-glue.h"];
OFIRI *runtimeGlueIRI = [sourcesIRI
IRIByAppendingPathComponent: @"runtime/amiga-glue.m"];
OFIRI *runtimeFuncArrayIRI = [sourcesIRI
IRIByAppendingPathComponent: @"runtime/amiga-funcarray.inc"];
OFXMLElement *runtimeLibrary = [OFXMLElement elementWithStream:
[OFFile fileWithPath: runtimeLibraryURI.fileSystemRepresentation
[OFFile fileWithPath: runtimeLibraryIRI.fileSystemRepresentation
mode: @"r"]];
OFFile *runtimeLinkLib =
[OFFile fileWithPath: runtimeLinkLibURI.fileSystemRepresentation
[OFFile fileWithPath: runtimeLinkLibIRI.fileSystemRepresentation
mode: @"w"];
OFFile *runtimeGlueHeader =
[OFFile fileWithPath: runtimeGlueHeaderURI.fileSystemRepresentation
[OFFile fileWithPath: runtimeGlueHeaderIRI.fileSystemRepresentation
mode: @"w"];
OFFile *runtimeGlue =
[OFFile fileWithPath: runtimeGlueURI.fileSystemRepresentation
[OFFile fileWithPath: runtimeGlueIRI.fileSystemRepresentation
mode: @"w"];
OFFile *runtimeFuncArray =
[OFFile fileWithPath: runtimeFuncArrayURI.fileSystemRepresentation
[OFFile fileWithPath: runtimeFuncArrayIRI.fileSystemRepresentation
mode: @"w"];
LinkLibGenerator *runtimeLinkLibGenerator = [[[LinkLibGenerator alloc]
initWithLibrary: runtimeLibrary
implementation: runtimeLinkLib] autorelease];
GlueGenerator *runtimeGlueGenerator = [[[GlueGenerator alloc]
initWithLibrary: runtimeLibrary
header: runtimeGlueHeader
|
︙ | | |
Modified generators/unicode/TableGenerator.m
from [f18304006d]
to [297ccd8019].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
|
* file.
*/
#include "config.h"
#include <string.h>
#import "OFString.h"
#import "OFApplication.h"
#import "OFArray.h"
#import "OFApplication.h"
#import "OFURI.h"
#import "OFFile.h"
#import "OFHTTPClient.h"
#import "OFHTTPRequest.h"
#import "OFHTTPResponse.h"
#import "OFHTTPClient.h"
#import "OFFile.h"
#import "OFStdIOStream.h"
#import "OFIRI.h"
#import "OFStdIOStream.h"
#import "OFString.h"
#import "OFOutOfRangeException.h"
#import "TableGenerator.h"
#import "copyright.h"
static OFString *const unicodeDataURI =
static OFString *const unicodeDataIRI =
@"http://www.unicode.org/Public/UNIDATA/UnicodeData.txt";
static OFString *const caseFoldingURI =
static OFString *const caseFoldingIRI =
@"http://www.unicode.org/Public/UNIDATA/CaseFolding.txt";
OF_APPLICATION_DELEGATE(TableGenerator)
@implementation TableGenerator
- (instancetype)init
{
|
︙ | | |
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
-
-
+
+
|
- (void)applicationDidFinishLaunching: (OFNotification *)notification
{
OFHTTPRequest *request;
[OFStdOut writeString: @"Downloading UnicodeData.txt…"];
_state = stateUnicodeData;
request = [OFHTTPRequest requestWithURI:
[OFURI URIWithString: unicodeDataURI]];
request = [OFHTTPRequest requestWithIRI:
[OFIRI IRIWithString: unicodeDataIRI]];
[_HTTPClient asyncPerformRequest: request];
}
- (void)client: (OFHTTPClient *)client
didPerformRequest: (OFHTTPRequest *)request
response: (OFHTTPResponse *)response
exception: (id)exception
|
︙ | | |
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
-
-
+
+
|
[self applyDecompositionRecursivelyForTable: _decompositionTable];
[self applyDecompositionRecursivelyForTable: _decompositionCompatTable];
[OFStdOut writeLine: @" done"];
[OFStdOut writeString: @"Downloading CaseFolding.txt…"];
_state = stateCaseFolding;
request = [OFHTTPRequest requestWithURI:
[OFURI URIWithString: caseFoldingURI]];
request = [OFHTTPRequest requestWithIRI:
[OFIRI IRIWithString: caseFoldingIRI]];
[_HTTPClient asyncPerformRequest: request];
}
- (void)parseCaseFolding: (OFHTTPResponse *)response
{
OFString *line;
|
︙ | | |
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
-
+
-
-
+
+
-
-
+
+
|
objc_autoreleasePoolPop(pool);
}
} while (!done);
}
- (void)writeFiles
{
OFURI *URI;
OFIRI *IRI;
[OFStdOut writeString: @"Writing files…"];
URI = [OFURI fileURIWithPath: @"../../src/unicode.m"];
[self writeTablesToFile: URI.fileSystemRepresentation];
IRI = [OFIRI fileIRIWithPath: @"../../src/unicode.m"];
[self writeTablesToFile: IRI.fileSystemRepresentation];
URI = [OFURI fileURIWithPath: @"../../src/unicode.h"];
[self writeHeaderToFile: URI.fileSystemRepresentation];
IRI = [OFIRI fileIRIWithPath: @"../../src/unicode.h"];
[self writeHeaderToFile: IRI.fileSystemRepresentation];
[OFStdOut writeLine: @" done"];
[OFApplication terminate];
}
- (void)writeTablesToFile: (OFString *)path
|
︙ | | |
Modified src/Makefile
from [1e2920ba64]
to [47eeebaf06].
︙ | | |
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
-
+
+
+
+
-
|
OFConstantString.m \
OFCountedSet.m \
OFData.m \
OFData+CryptographicHashing.m \
OFData+MessagePackParsing.m \
OFDate.m \
OFDictionary.m \
OFEmbeddedURIHandler.m \
OFEmbeddedIRIHandler.m \
OFEnumerator.m \
OFFileManager.m \
OFGZIPStream.m \
OFHMAC.m \
OFINICategory.m \
OFINIFile.m \
OFIRI.m \
OFIRIHandler.m \
OFInflate64Stream.m \
OFInflateStream.m \
OFInvocation.m \
OFLHAArchive.m \
OFLHAArchiveEntry.m \
OFList.m \
OFLocale.m \
OFMD5Hash.m \
OFMapTable.m \
OFMemoryStream.m \
OFMessagePackExtension.m \
OFMethodSignature.m \
OFMutableArray.m \
OFMutableData.m \
OFMutableDictionary.m \
OFMutableIRI.m \
OFMutableLHAArchiveEntry.m \
OFMutablePair.m \
OFMutableSet.m \
OFMutableString.m \
OFMutableTarArchiveEntry.m \
OFMutableTriple.m \
OFMutableURI.m \
OFMutableZIPArchiveEntry.m \
OFNotification.m \
OFNotificationCenter.m \
OFNull.m \
OFNumber.m \
OFObject.m \
OFObject+KeyValueCoding.m \
|
︙ | | |
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
-
-
|
OFSettings.m \
OFSystemInfo.m \
OFTarArchive.m \
OFTarArchiveEntry.m \
OFThread.m \
OFTimer.m \
OFTriple.m \
OFURI.m \
OFURIHandler.m \
OFUUID.m \
OFValue.m \
OFXMLAttribute.m \
OFXMLCDATA.m \
OFXMLCharacters.m \
OFXMLComment.m \
OFXMLElement.m \
|
︙ | | |
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
|
-
+
|
objfw-defs.h \
platform.h \
${USE_INCLUDES_ATOMIC}
SRCS += OFASPrintF.m \
OFAdjacentArray.m \
OFAdjacentSubarray.m \
OFArchiveURIHandler.m \
OFArchiveIRIHandler.m \
OFBase64.m \
OFBitSetCharacterSet.m \
OFBytesValue.m \
OFCRC16.m \
OFCRC32.m \
OFCountedMapTableSet.m \
OFHuffmanTree.m \
|
︙ | | |
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
-
+
-
+
|
OFStrPTime.m \
OFSubarray.m \
OFUTF8String.m \
${LIBBASES_M} \
${RUNTIME_AUTORELEASE_M} \
${RUNTIME_INSTANCE_M} \
${UNICODE_M}
SRCS_FILES += OFFileURIHandler.m
SRCS_FILES += OFFileIRIHandler.m
SRCS_SOCKETS += OFAsyncIPSocketConnector.m \
OFDNSResolverSettings.m \
${OF_EPOLL_KERNEL_EVENT_OBSERVER_M} \
OFHTTPURIHandler.m \
OFHTTPIRIHandler.m \
OFHostAddressResolver.m \
OFKernelEventObserver.m \
${OF_KQUEUE_KERNEL_EVENT_OBSERVER_M} \
${OF_POLL_KERNEL_EVENT_OBSERVER_M} \
${OF_SELECT_KERNEL_EVENT_OBSERVER_M} \
OFTCPSocketSOCKS5Connector.m
SRCS_WINDOWS += platform/Windows/OFWin32ConsoleStdIOStream.m \
|
︙ | | |
Renamed and modified
src/OFArchiveURIHandler.h
[7c81cf8db2]
to src/OFArchiveIRIHandler.h
[c73d43b16e].
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
-
+
-
+
-
-
+
+
|
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFURIHandler.h"
#import "OFIRIHandler.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFArchiveURIHandler: OFURIHandler
@interface OFArchiveIRIHandler: OFIRIHandler
@end
#ifdef __cplusplus
extern "C" {
#endif
extern OFURI *OFArchiveURIHandlerURIForFileInArchive(OFString *, OFString *,
OFURI *);
extern OFIRI *OFArchiveIRIHandlerIRIForFileInArchive(OFString *, OFString *,
OFIRI *);
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
|
Renamed and modified
src/OFArchiveURIHandler.m
[010e8050b6]
to src/OFArchiveIRIHandler.m
[81ff699c8e].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
|
-
+
+
-
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* file.
*/
#include "config.h"
#include <errno.h>
#import "OFArchiveURIHandler.h"
#import "OFArchiveIRIHandler.h"
#import "OFCharacterSet.h"
#import "OFGZIPStream.h"
#import "OFIRI.h"
#import "OFLHAArchive.h"
#import "OFStream.h"
#import "OFTarArchive.h"
#import "OFURI.h"
#import "OFZIPArchive.h"
#import "OFInvalidArgumentException.h"
#import "OFOpenItemFailedException.h"
@interface OFArchiveURIHandlerPathAllowedCharacterSet: OFCharacterSet
@interface OFArchiveIRIHandlerPathAllowedCharacterSet: OFCharacterSet
{
OFCharacterSet *_characterSet;
bool (*_characterIsMember)(id, SEL, OFUnichar);
}
@end
static OFCharacterSet *pathAllowedCharacters;
static void
initPathAllowedCharacters(void)
{
pathAllowedCharacters =
[[OFArchiveURIHandlerPathAllowedCharacterSet alloc] init];
[[OFArchiveIRIHandlerPathAllowedCharacterSet alloc] init];
}
@implementation OFArchiveURIHandler
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
@implementation OFArchiveIRIHandler
- (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFString *scheme = URI.scheme;
OFString *scheme = IRI.scheme;
OFString *percentEncodedPath, *path;
size_t pos;
OFURI *archiveURI;
OFIRI *archiveIRI;
OFStream *stream;
if (URI.host != nil || URI.port != nil || URI.user != nil ||
URI.password != nil || URI.query != nil || URI.fragment != nil)
if (IRI.host != nil || IRI.port != nil || IRI.user != nil ||
IRI.password != nil || IRI.query != nil || IRI.fragment != nil)
@throw [OFInvalidArgumentException exception];
if (![mode isEqual: @"r"])
/*
* Writing has some implications that are not decided yet: Will
* it always append to an archive? What happens if the file
* already exists?
*/
@throw [OFInvalidArgumentException exception];
/*
* GZIP only compresses one file and thus has no path inside an
* archive.
*/
if ([scheme isEqual: @"gzip"]) {
stream = [OFURIHandler openItemAtURI: [OFURI URIWithString:
URI.path]
stream = [OFIRIHandler openItemAtIRI: [OFIRI IRIWithString:
IRI.path]
mode: @"r"];
stream = [OFGZIPStream streamWithStream: stream mode: @"r"];
goto end;
}
percentEncodedPath = URI.percentEncodedPath;
percentEncodedPath = IRI.percentEncodedPath;
pos = [percentEncodedPath rangeOfString: @"!"].location;
if (pos == OFNotFound)
@throw [OFInvalidArgumentException exception];
archiveURI = [OFURI URIWithString:
archiveIRI = [OFIRI IRIWithString:
[percentEncodedPath substringWithRange: OFMakeRange(0, pos)]
.stringByRemovingPercentEncoding];
path = [percentEncodedPath substringWithRange:
OFMakeRange(pos + 1, percentEncodedPath.length - pos - 1)]
.stringByRemovingPercentEncoding;
if ([scheme isEqual: @"lha"]) {
OFLHAArchive *archive = [OFLHAArchive archiveWithURI: archiveURI
OFLHAArchive *archive = [OFLHAArchive archiveWithIRI: archiveIRI
mode: @"r"];
OFLHAArchiveEntry *entry;
while ((entry = [archive nextEntry]) != nil) {
if ([entry.fileName isEqual: path]) {
stream = [archive streamForReadingCurrentEntry];
goto end;
}
}
@throw [OFOpenItemFailedException exceptionWithURI: URI
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: mode
errNo: ENOENT];
} else if ([scheme isEqual: @"tar"]) {
OFTarArchive *archive = [OFTarArchive archiveWithURI: archiveURI
OFTarArchive *archive = [OFTarArchive archiveWithIRI: archiveIRI
mode: @"r"];
OFTarArchiveEntry *entry;
while ((entry = [archive nextEntry]) != nil) {
if ([entry.fileName isEqual: path]) {
stream = [archive streamForReadingCurrentEntry];
goto end;
}
}
@throw [OFOpenItemFailedException exceptionWithURI: URI
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: mode
errNo: ENOENT];
} else if ([scheme isEqual: @"zip"]) {
OFZIPArchive *archive = [OFZIPArchive archiveWithURI: archiveURI
OFZIPArchive *archive = [OFZIPArchive archiveWithIRI: archiveIRI
mode: @"r"];
stream = [archive streamForReadingFile: path];
} else
@throw [OFInvalidArgumentException exception];
end:
stream = [stream retain];
objc_autoreleasePoolPop(pool);
return [stream autorelease];
}
@end
@implementation OFArchiveURIHandlerPathAllowedCharacterSet
@implementation OFArchiveIRIHandlerPathAllowedCharacterSet
- (instancetype)init
{
self = [super init];
@try {
_characterSet =
[[OFCharacterSet URIPathAllowedCharacterSet] retain];
[[OFCharacterSet IRIPathAllowedCharacterSet] retain];
_characterIsMember = (bool (*)(id, SEL, OFUnichar))
[_characterSet methodForSelector:
@selector(characterIsMember:)];
} @catch (id e) {
[self release];
@throw e;
}
|
︙ | | |
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
|
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
|
-
-
-
+
+
+
-
+
-
+
-
+
-
+
|
- (bool)characterIsMember: (OFUnichar)character
{
return (character != '!' && _characterIsMember(_characterSet,
@selector(characterIsMember:), character));
}
@end
OFURI *
OFArchiveURIHandlerURIForFileInArchive(OFString *scheme,
OFString *pathInArchive, OFURI *archiveURI)
OFIRI *
OFArchiveIRIHandlerIRIForFileInArchive(OFString *scheme,
OFString *pathInArchive, OFIRI *archiveIRI)
{
static OFOnceControl onceControl = OFOnceControlInitValue;
OFMutableURI *ret = [OFMutableURI URIWithScheme: scheme];
OFMutableIRI *ret = [OFMutableIRI IRIWithScheme: scheme];
void *pool = objc_autoreleasePoolPush();
OFString *archiveURIString;
OFString *archiveIRIString;
OFOnce(&onceControl, initPathAllowedCharacters);
pathInArchive = [pathInArchive
stringByAddingPercentEncodingWithAllowedCharacters:
pathAllowedCharacters];
archiveURIString = [archiveURI.string
archiveIRIString = [archiveIRI.string
stringByAddingPercentEncodingWithAllowedCharacters:
pathAllowedCharacters];
ret.percentEncodedPath = [OFString
stringWithFormat: @"%@!%@", archiveURIString, pathInArchive];
stringWithFormat: @"%@!%@", archiveIRIString, pathInArchive];
[ret makeImmutable];
objc_autoreleasePoolPop(pool);
return ret;
}
|
Modified src/OFConstantString.m
from [3adc07df05]
to [5bcac2af70].
︙ | | |
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
|
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
|
-
+
-
+
-
+
-
+
|
- (void)writeToFile: (OFString *)path encoding: (OFStringEncoding)encoding
{
[self finishInitialization];
[self writeToFile: path encoding: encoding];
}
#endif
- (void)writeToURI: (OFURI *)URI
- (void)writeToIRI: (OFIRI *)IRI
{
[self finishInitialization];
[self writeToURI: URI];
[self writeToIRI: IRI];
}
- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
- (void)writeToIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
{
[self finishInitialization];
[self writeToURI: URI encoding: encoding];
[self writeToIRI: IRI encoding: encoding];
}
#ifdef OF_HAVE_BLOCKS
- (void)enumerateLinesUsingBlock: (OFStringLineEnumerationBlock)block
{
[self finishInitialization];
[self enumerateLinesUsingBlock: block];
}
#endif
@end
|
Modified src/OFData.h
from [750f7eff94]
to [5277b04732].
︙ | | |
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
-
-
+
+
|
#import "OFSerialization.h"
#import "OFMessagePackRepresentation.h"
/*! @file */
OF_ASSUME_NONNULL_BEGIN
@class OFString;
@class OFURI;
@class OFIRI;
@class OFString;
/**
* @brief Options for searching in data.
*
* This is a bit mask.
*/
typedef enum {
|
︙ | | |
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
-
+
-
+
-
+
|
* @return A new autoreleased OFData
*/
+ (instancetype)dataWithContentsOfFile: (OFString *)path;
#endif
/**
* @brief Creates a new OFData with an item size of 1, containing the data of
* the specified URI.
* the specified IRI.
*
* @param URI The URI to the contents for the OFData
* @param IRI The IRI to the contents for the OFData
* @return A new autoreleased OFData
*/
+ (instancetype)dataWithContentsOfURI: (OFURI *)URI;
+ (instancetype)dataWithContentsOfIRI: (OFIRI *)IRI;
/**
* @brief Creates a new OFData with an item size of 1, containing the data of
* the hex string representation.
*
* @param string The hex string representation of the data
* @return A new autoreleased OFData
|
︙ | | |
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
|
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
|
-
+
-
+
-
+
|
* @return An initialized OFData
*/
- (instancetype)initWithContentsOfFile: (OFString *)path;
#endif
/**
* @brief Initializes an already allocated OFData with an item size of 1,
* containing the data of the specified URI.
* containing the data of the specified IRI.
*
* @param URI The URI to the contents for the OFData
* @param IRI The IRI to the contents for the OFData
* @return A new autoreleased OFData
*/
- (instancetype)initWithContentsOfURI: (OFURI *)URI;
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI;
/**
* @brief Initializes an already allocated OFData with an item size of 1,
* containing the data of the hex string representation.
*
* @param string The hex string representation of the data
* @return A new autoreleased OFData
|
︙ | | |
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
|
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
|
-
+
-
+
-
+
|
*
* @param path The path of the file to write to
*/
- (void)writeToFile: (OFString *)path;
#endif
/**
* @brief Writes the OFData to the specified URI.
* @brief Writes the OFData to the specified IRI.
*
* @param URI The URI to write to
* @param IRI The IRI to write to
*/
- (void)writeToURI: (OFURI *)URI;
- (void)writeToIRI: (OFIRI *)IRI;
@end
OF_ASSUME_NONNULL_END
#import "OFMutableData.h"
#import "OFData+CryptographicHashing.h"
#import "OFData+MessagePackParsing.h"
|
Modified src/OFData.m
from [b0fcc38dae]
to [d8b1fa1eb1].
︙ | | |
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
+
+
-
-
|
#import "OFData.h"
#import "OFBase64.h"
#import "OFDictionary.h"
#ifdef OF_HAVE_FILES
# import "OFFile.h"
# import "OFFileManager.h"
#endif
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFStream.h"
#import "OFString.h"
#import "OFSystemInfo.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFXMLElement.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFNotImplementedException.h"
#import "OFOutOfMemoryException.h"
#import "OFOutOfRangeException.h"
|
︙ | | |
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
-
+
-
+
|
#ifdef OF_HAVE_FILES
+ (instancetype)dataWithContentsOfFile: (OFString *)path
{
return [[[self alloc] initWithContentsOfFile: path] autorelease];
}
#endif
+ (instancetype)dataWithContentsOfURI: (OFURI *)URI
+ (instancetype)dataWithContentsOfIRI: (OFIRI *)IRI
{
return [[[self alloc] initWithContentsOfURI: URI] autorelease];
return [[[self alloc] initWithContentsOfIRI: IRI] autorelease];
}
+ (instancetype)dataWithStringRepresentation: (OFString *)string
{
return [[[self alloc]
initWithStringRepresentation: string] autorelease];
}
|
︙ | | |
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
|
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
|
-
+
-
+
|
@throw e;
}
return self;
}
#endif
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
{
self = [super init];
@try {
void *pool = objc_autoreleasePoolPush();
OFStream *stream = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFStream *stream = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
size_t pageSize;
unsigned char *buffer;
_count = 0;
_itemSize = 1;
_freeWhenDone = true;
|
︙ | | |
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
|
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
|
-
+
-
+
|
[file writeBuffer: _items length: _count * _itemSize];
} @finally {
[file release];
}
}
#endif
- (void)writeToURI: (OFURI *)URI
- (void)writeToIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
[[OFURIHandler openItemAtURI: URI mode: @"w"] writeData: self];
[[OFIRIHandler openItemAtIRI: IRI mode: @"w"] writeData: self];
objc_autoreleasePoolPop(pool);
}
- (OFXMLElement *)XMLElementBySerializing
{
void *pool;
|
︙ | | |
Modified src/OFDictionary.m
from [cbf5abac37]
to [90d93ccd42].
︙ | | |
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
-
+
|
#import "OFOutOfRangeException.h"
#import "OFUndefinedKeyException.h"
static struct {
Class isa;
} placeholder;
static OFCharacterSet *URIQueryPartAllowedCharacterSet = nil;
static OFCharacterSet *IRIQueryPartAllowedCharacterSet = nil;
@interface OFDictionary ()
- (OFString *)
of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
depth: (size_t)depth;
@end
|
︙ | | |
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
-
-
+
+
|
OFEnumerator *_keyEnumerator;
}
- (instancetype)initWithDictionary: (OFDictionary *)dictionary;
@end
OF_DIRECT_MEMBERS
@interface OFURIQueryPartAllowedCharacterSet: OFCharacterSet
+ (OFCharacterSet *)URIQueryPartAllowedCharacterSet;
@interface OFIRIQueryPartAllowedCharacterSet: OFCharacterSet
+ (OFCharacterSet *)IRIQueryPartAllowedCharacterSet;
@end
@implementation OFDictionaryPlaceholder
- (instancetype)init
{
return (id)[[OFMapTableDictionary alloc] init];
}
|
︙ | | |
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
|
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
|
-
+
-
+
-
-
+
+
-
+
-
+
|
- (void)dealloc
{
OF_DEALLOC_UNSUPPORTED
}
@end
@implementation OFURIQueryPartAllowedCharacterSet
@implementation OFIRIQueryPartAllowedCharacterSet
+ (void)initialize
{
if (self != [OFURIQueryPartAllowedCharacterSet class])
if (self != [OFIRIQueryPartAllowedCharacterSet class])
return;
URIQueryPartAllowedCharacterSet =
[[OFURIQueryPartAllowedCharacterSet alloc] init];
IRIQueryPartAllowedCharacterSet =
[[OFIRIQueryPartAllowedCharacterSet alloc] init];
}
+ (OFCharacterSet *)URIQueryPartAllowedCharacterSet
+ (OFCharacterSet *)IRIQueryPartAllowedCharacterSet
{
return URIQueryPartAllowedCharacterSet;
return IRIQueryPartAllowedCharacterSet;
}
- (instancetype)autorelease
{
return self;
}
|
︙ | | |
Renamed and modified
src/OFEmbeddedURIHandler.h
[c72607aa86]
to src/OFEmbeddedIRIHandler.h
[dc6282dd1d].
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
-
+
-
+
-
+
|
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFURIHandler.h"
#import "OFIRIHandler.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFEmbeddedURIHandler: OFURIHandler
@interface OFEmbeddedIRIHandler: OFIRIHandler
@end
#ifdef __cplusplus
extern "C" {
#endif
/**
* @brief Register a file for the `embedded:` URI scheme.
* @brief Register a file for the `embedded:` IRI scheme.
*
* Usually, you should not use the directly, but rather generate a source file
* for a file to be embedded using the `objfw-embed` tool.
*
* @param path The path to the file under the `embedded:` scheme. This is not
* retained, so you must either pass a constant string or pass a
* string that is already retained!
|
︙ | | |
Renamed and modified
src/OFEmbeddedURIHandler.m
[1976c624c2]
to src/OFEmbeddedIRIHandler.m
[ba984847f3].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
-
-
-
+
+
+
|
#include "config.h"
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#import "OFEmbeddedURIHandler.h"
#import "OFMemoryStream.h"
#import "OFURI.h"
#import "OFEmbeddedIRIHandler.h"
#import "OFIRI.h"
#import "OFMemoryStream.h"
#import "OFInvalidArgumentException.h"
#import "OFOpenItemFailedException.h"
#ifdef OF_HAVE_THREADS
# import "OFOnce.h"
# import "OFPlainMutex.h"
|
︙ | | |
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
-
-
+
+
-
-
-
+
+
+
-
+
-
+
|
numEmbeddedFiles++;
#ifdef OF_HAVE_THREADS
OFEnsure(OFPlainMutexUnlock(&mutex) == 0);
#endif
}
@implementation OFEmbeddedURIHandler
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
@implementation OFEmbeddedIRIHandler
- (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode
{
OFString *path;
if (![URI.scheme isEqual: @"embedded"] || URI.host.length > 0 ||
URI.port != nil || URI.user != nil || URI.password != nil ||
URI.query != nil || URI.fragment != nil)
if (![IRI.scheme isEqual: @"embedded"] || IRI.host.length > 0 ||
IRI.port != nil || IRI.user != nil || IRI.password != nil ||
IRI.query != nil || IRI.fragment != nil)
@throw [OFInvalidArgumentException exception];
if (![mode isEqual: @"r"])
@throw [OFOpenItemFailedException exceptionWithURI: URI
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: mode
errNo: EROFS];
if ((path = URI.path) == nil) {
if ((path = IRI.path) == nil) {
@throw [OFInvalidArgumentException exception];
}
#ifdef OF_HAVE_THREADS
OFEnsure(OFPlainMutexLock(&mutex) == 0);
@try {
#endif
|
︙ | | |
106
107
108
109
110
111
112
113
114
115
116
117
|
106
107
108
109
110
111
112
113
114
115
116
117
|
-
+
|
}
#ifdef OF_HAVE_THREADS
} @finally {
OFEnsure(OFPlainMutexUnlock(&mutex) == 0);
}
#endif
@throw [OFOpenItemFailedException exceptionWithURI: URI
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: mode
errNo: ENOENT];
}
@end
|
Modified src/OFFile.h
from [b56cdf66da]
to [1539aa82ae].
︙ | | |
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
-
-
|
#else
typedef struct _OFFileHandle *OFFileHandle;
static const OFFileHandle OFInvalidFileHandle = NULL;
#endif
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
/**
* @class OFFile OFFile.h ObjFW/OFFile.h
*
* @brief A class which provides methods to read and write files.
*/
OF_SUBCLASSING_RESTRICTED
@interface OFFile: OFSeekableStream
|
︙ | | |
Modified src/OFFile.m
from [c784d31e2e]
to [e8312c2cba].
︙ | | |
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
-
|
# include <sys/stat.h>
#endif
#import "OFFile.h"
#import "OFLocale.h"
#import "OFString.h"
#import "OFSystemInfo.h"
#import "OFURI.h"
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFNotOpenException.h"
#import "OFOpenItemFailedException.h"
#import "OFOutOfMemoryException.h"
#import "OFOutOfRangeException.h"
|
︙ | | |
Renamed and modified
src/OFFileURIHandler.h
[24ec18a27d]
to src/OFFileIRIHandler.h
[99d21b02c9].
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
-
+
-
+
|
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFURIHandler.h"
#import "OFIRIHandler.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFFileURIHandler: OFURIHandler
@interface OFFileIRIHandler: OFIRIHandler
+ (bool)of_directoryExistsAtPath: (OFString *)path OF_DIRECT;
@end
OF_ASSUME_NONNULL_END
|
Renamed and modified
src/OFFileURIHandler.m
[d74cbf6f89]
to src/OFFileIRIHandler.m
[b47c34a475].
︙ | | |
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
-
+
+
-
|
#ifdef HAVE_PWD_H
# include <pwd.h>
#endif
#ifdef HAVE_GRP_H
# include <grp.h>
#endif
#import "OFFileURIHandler.h"
#import "OFFileIRIHandler.h"
#import "OFArray.h"
#import "OFDate.h"
#import "OFFile.h"
#import "OFFileManager.h"
#import "OFIRI.h"
#import "OFLocale.h"
#import "OFNumber.h"
#import "OFSystemInfo.h"
#import "OFURI.h"
#ifdef OF_HAVE_THREADS
# import "OFMutex.h"
#endif
#import "OFCreateDirectoryFailedException.h"
#import "OFCreateSymbolicLinkFailedException.h"
|
︙ | | |
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
|
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
|
-
+
-
+
-
+
-
+
-
+
-
+
|
# endif
#endif
}
#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
static void
setSymbolicLinkDestinationAttribute(OFMutableFileAttributes attributes,
OFURI *URI)
OFIRI *IRI)
{
OFString *path = URI.fileSystemRepresentation;
OFString *path = IRI.fileSystemRepresentation;
# ifndef OF_WINDOWS
OFStringEncoding encoding = [OFLocale encoding];
char destinationC[PATH_MAX];
ssize_t length;
OFString *destination;
length = readlink([path cStringWithEncoding: encoding], destinationC,
PATH_MAX);
if (length < 0)
@throw [OFGetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: errno];
destination = [OFString stringWithCString: destinationC
encoding: encoding
length: length];
[attributes setObject: destination
forKey: OFFileSymbolicLinkDestination];
# else
HANDLE handle;
OFString *destination;
if (createSymbolicLinkWFuncPtr == NULL)
return;
if ((handle = CreateFileW(path.UTF16String, 0, (FILE_SHARE_READ |
FILE_SHARE_WRITE), NULL, OPEN_EXISTING,
FILE_FLAG_OPEN_REPARSE_POINT, NULL)) == INVALID_HANDLE_VALUE)
@throw [OFGetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: lastError()];
@try {
union {
char bytes[MAXIMUM_REPARSE_DATA_BUFFER_SIZE];
REPARSE_DATA_BUFFER data;
} buffer;
DWORD size;
wchar_t *tmp;
if (!DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, NULL, 0,
buffer.bytes, MAXIMUM_REPARSE_DATA_BUFFER_SIZE, &size,
NULL))
@throw [OFGetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: lastError()];
if (buffer.data.ReparseTag != IO_REPARSE_TAG_SYMLINK)
@throw [OFGetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: lastError()];
# define slrb buffer.data.SymbolicLinkReparseBuffer
tmp = slrb.PathBuffer +
(slrb.SubstituteNameOffset / sizeof(wchar_t));
destination = [OFString
|
︙ | | |
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
|
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
|
-
+
-
+
|
} @finally {
CloseHandle(handle);
}
# endif
}
#endif
@implementation OFFileURIHandler
@implementation OFFileIRIHandler
+ (void)initialize
{
#ifdef OF_WINDOWS
HMODULE module;
#endif
if (self != [OFFileURIHandler class])
if (self != [OFFileIRIHandler class])
return;
#if defined(OF_FILE_MANAGER_SUPPORTS_OWNER) && defined(OF_HAVE_THREADS)
passwdMutex = [[OFMutex alloc] init];
atexit(releasePasswdMutex);
#endif
#if !defined(HAVE_READDIR_R) && !defined(OF_WINDOWS) && defined(OF_HAVE_THREADS)
|
︙ | | |
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
|
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
if (statWrapper(path, &s) != 0)
return false;
return S_ISDIR(s.st_mode);
}
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
- (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFFile *file = [[OFFile alloc]
initWithPath: URI.fileSystemRepresentation
initWithPath: IRI.fileSystemRepresentation
mode: mode];
objc_autoreleasePoolPop(pool);
return [file autorelease];
}
- (OFFileAttributes)attributesOfItemAtURI: (OFURI *)URI
- (OFFileAttributes)attributesOfItemAtIRI: (OFIRI *)IRI
{
OFMutableFileAttributes ret = [OFMutableDictionary dictionary];
void *pool = objc_autoreleasePoolPush();
OFString *path;
int error;
Stat s;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (![[URI scheme] isEqual: _scheme])
if (![[IRI scheme] isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
path = URI.fileSystemRepresentation;
path = IRI.fileSystemRepresentation;
if ((error = lstatWrapper(path, &s)) != 0)
@throw [OFGetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: error];
if (s.st_size < 0)
@throw [OFOutOfRangeException exception];
[ret setObject: [NSNumber numberWithUnsignedLongLong: s.st_size]
forKey: OFFileSize];
setTypeAttribute(ret, &s);
[ret setObject: [NSNumber numberWithUnsignedLong: s.st_mode]
forKey: OFFilePOSIXPermissions];
setOwnerAndGroupAttributes(ret, &s);
setDateAttributes(ret, &s);
#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
if (S_ISLNK(s.st_mode))
setSymbolicLinkDestinationAttribute(ret, URI);
setSymbolicLinkDestinationAttribute(ret, IRI);
#endif
objc_autoreleasePoolPop(pool);
return ret;
}
- (void)of_setLastAccessDate: (OFDate *)lastAccessDate
andModificationDate: (OFDate *)modificationDate
ofItemAtURI: (OFURI *)URI
ofItemAtIRI: (OFIRI *)IRI
attributes: (OFFileAttributes)attributes OF_DIRECT
{
OFString *path = URI.fileSystemRepresentation;
OFString *path = IRI.fileSystemRepresentation;
OFFileAttributeKey attributeKey = (modificationDate != nil
? OFFileModificationDate : OFFileLastAccessDate);
if (lastAccessDate == nil)
lastAccessDate = modificationDate;
if (modificationDate == nil)
modificationDate = lastAccessDate;
#if defined(OF_WINDOWS)
if (_wutime64FuncPtr != NULL) {
struct __utimbuf64 times = {
.actime =
(__time64_t)lastAccessDate.timeIntervalSince1970,
.modtime =
(__time64_t)modificationDate.timeIntervalSince1970
};
if (_wutime64FuncPtr([path UTF16String], ×) != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
} else {
struct _utimbuf times = {
.actime = (time_t)lastAccessDate.timeIntervalSince1970,
.modtime =
(time_t)modificationDate.timeIntervalSince1970
};
int status;
if ([OFSystemInfo isWindowsNT])
status = _wutime([path UTF16String], ×);
else
status = _utime(
[path cStringWithEncoding: [OFLocale encoding]],
×);
if (status != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
}
#elif defined(OF_AMIGAOS)
/* AmigaOS does not support access time. */
OFTimeInterval modificationTime =
|
︙ | | |
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
|
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
|
-
+
|
if (!SetDate([path cStringWithEncoding: [OFLocale encoding]],
&date) != 0)
# else
if (!SetFileDate([path cStringWithEncoding: [OFLocale encoding]],
&date) != 0)
# endif
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: attributeKey
errNo: lastError()];
#else
OFTimeInterval lastAccessTime = lastAccessDate.timeIntervalSince1970;
OFTimeInterval modificationTime =
modificationDate.timeIntervalSince1970;
|
︙ | | |
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
|
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
|
.tv_usec = (int)((modificationTime - times[1].tv_sec) *
1000000)
},
};
if (utimes([path cStringWithEncoding: [OFLocale encoding]], times) != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
#endif
}
- (void)of_setPOSIXPermissions: (OFNumber *)permissions
ofItemAtURI: (OFURI *)URI
ofItemAtIRI: (OFIRI *)IRI
attributes: (OFFileAttributes)attributes OF_DIRECT
{
#ifdef OF_FILE_MANAGER_SUPPORTS_PERMISSIONS
mode_t mode = (mode_t)permissions.unsignedLongValue;
OFString *path = URI.fileSystemRepresentation;
OFString *path = IRI.fileSystemRepresentation;
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wchmod(path.UTF16String, mode);
else
# endif
status = chmod(
[path cStringWithEncoding: [OFLocale encoding]], mode);
if (status != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: OFFilePOSIXPermissions
errNo: errno];
#else
OF_UNRECOGNIZED_SELECTOR
#endif
}
- (void)of_setOwnerAccountName: (OFString *)owner
andGroupOwnerAccountName: (OFString *)group
ofItemAtURI: (OFURI *)URI
ofItemAtIRI: (OFIRI *)IRI
attributeKey: (OFFileAttributeKey)attributeKey
attributes: (OFFileAttributes)attributes OF_DIRECT
{
#ifdef OF_FILE_MANAGER_SUPPORTS_OWNER
OFString *path = URI.fileSystemRepresentation;
OFString *path = IRI.fileSystemRepresentation;
uid_t uid = -1;
gid_t gid = -1;
OFStringEncoding encoding;
if (owner == nil && group == nil)
@throw [OFInvalidArgumentException exception];
encoding = [OFLocale encoding];
# ifdef OF_HAVE_THREADS
[passwdMutex lock];
@try {
# endif
if (owner != nil) {
struct passwd *passwd;
if ((passwd = getpwnam([owner
cStringWithEncoding: encoding])) == NULL)
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
uid = passwd->pw_uid;
}
if (group != nil) {
struct group *group_;
if ((group_ = getgrnam([group
cStringWithEncoding: encoding])) == NULL)
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
gid = group_->gr_gid;
}
# ifdef OF_HAVE_THREADS
} @finally {
[passwdMutex unlock];
}
# endif
if (chown([path cStringWithEncoding: encoding], uid, gid) != 0)
@throw [OFSetItemAttributesFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
attributes: attributes
failedAttribute: attributeKey
errNo: errno];
#else
OF_UNRECOGNIZED_SELECTOR
#endif
}
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURI: (OFURI *)URI
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
OFEnumerator OF_GENERIC(OFFileAttributeKey) *keyEnumerator;
OFEnumerator *objectEnumerator;
OFFileAttributeKey key;
id object;
OFDate *lastAccessDate, *modificationDate;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (![URI.scheme isEqual: _scheme])
if (![IRI.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
keyEnumerator = [attributes keyEnumerator];
objectEnumerator = [attributes objectEnumerator];
while ((key = [keyEnumerator nextObject]) != nil &&
(object = [objectEnumerator nextObject]) != nil) {
if ([key isEqual: OFFileModificationDate] ||
[key isEqual: OFFileLastAccessDate])
continue;
else if ([key isEqual: OFFilePOSIXPermissions])
[self of_setPOSIXPermissions: object
ofItemAtURI: URI
ofItemAtIRI: IRI
attributes: attributes];
else if ([key isEqual: OFFileOwnerAccountName])
[self of_setOwnerAccountName: object
andGroupOwnerAccountName: nil
ofItemAtURI: URI
ofItemAtIRI: IRI
attributeKey: key
attributes: attributes];
else if ([key isEqual: OFFileGroupOwnerAccountName])
[self of_setOwnerAccountName: nil
andGroupOwnerAccountName: object
ofItemAtURI: URI
ofItemAtIRI: IRI
attributeKey: key
attributes: attributes];
else
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
}
lastAccessDate = [attributes objectForKey: OFFileLastAccessDate];
modificationDate = [attributes objectForKey: OFFileModificationDate];
if (lastAccessDate != nil || modificationDate != nil)
[self of_setLastAccessDate: lastAccessDate
andModificationDate: modificationDate
ofItemAtURI: URI
ofItemAtIRI: IRI
attributes: attributes];
objc_autoreleasePoolPop(pool);
}
- (bool)fileExistsAtURI: (OFURI *)URI
- (bool)fileExistsAtIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
Stat s;
bool ret;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (![URI.scheme isEqual: _scheme])
if (![IRI.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
if (statWrapper(URI.fileSystemRepresentation, &s) != 0) {
if (statWrapper(IRI.fileSystemRepresentation, &s) != 0) {
objc_autoreleasePoolPop(pool);
return false;
}
ret = S_ISREG(s.st_mode);
objc_autoreleasePoolPop(pool);
return ret;
}
- (bool)directoryExistsAtURI: (OFURI *)URI
- (bool)directoryExistsAtIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
Stat s;
bool ret;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (![URI.scheme isEqual: _scheme])
if (![IRI.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
if (statWrapper(URI.fileSystemRepresentation, &s) != 0) {
if (statWrapper(IRI.fileSystemRepresentation, &s) != 0) {
objc_autoreleasePoolPop(pool);
return false;
}
ret = S_ISDIR(s.st_mode);
objc_autoreleasePoolPop(pool);
return ret;
}
- (void)createDirectoryAtURI: (OFURI *)URI
- (void)createDirectoryAtIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
OFString *path;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (![URI.scheme isEqual: _scheme])
if (![IRI.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
path = URI.fileSystemRepresentation;
path = IRI.fileSystemRepresentation;
#if defined(OF_WINDOWS)
int status;
if ([OFSystemInfo isWindowsNT])
status = _wmkdir(path.UTF16String);
else
status = _mkdir(
[path cStringWithEncoding: [OFLocale encoding]]);
if (status != 0)
@throw [OFCreateDirectoryFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: errno];
#elif defined(OF_AMIGAOS)
BPTR lock;
if ((lock = CreateDir(
[path cStringWithEncoding: [OFLocale encoding]])) == 0)
@throw [OFCreateDirectoryFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: lastError()];
UnLock(lock);
#else
if (mkdir([path cStringWithEncoding: [OFLocale encoding]], 0777) != 0)
@throw [OFCreateDirectoryFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: errno];
#endif
objc_autoreleasePoolPop(pool);
}
- (OFArray OF_GENERIC(OFURI *) *)contentsOfDirectoryAtURI: (OFURI *)URI
- (OFArray OF_GENERIC(OFIRI *) *)contentsOfDirectoryAtIRI: (OFIRI *)IRI
{
OFMutableArray *URIs = [OFMutableArray array];
OFMutableArray *IRIs = [OFMutableArray array];
void *pool = objc_autoreleasePoolPush();
OFString *path;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (![URI.scheme isEqual: _scheme])
if (![IRI.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
path = URI.fileSystemRepresentation;
path = IRI.fileSystemRepresentation;
#if defined(OF_WINDOWS)
HANDLE handle;
path = [path stringByAppendingString: @"\\*"];
if ([OFSystemInfo isWindowsNT]) {
WIN32_FIND_DATAW fd;
if ((handle = FindFirstFileW(path.UTF16String,
&fd)) == INVALID_HANDLE_VALUE)
@throw [OFOpenItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
mode: nil
errNo: lastError()];
@try {
do {
OFString *file;
if (wcscmp(fd.cFileName, L".") == 0 ||
wcscmp(fd.cFileName, L"..") == 0)
continue;
file = [[OFString alloc]
initWithUTF16String: fd.cFileName];
@try {
[URIs addObject: [URI
URIByAppendingPathComponent: file]];
[IRIs addObject: [IRI
IRIByAppendingPathComponent: file]];
} @finally {
[file release];
}
} while (FindNextFileW(handle, &fd));
if (GetLastError() != ERROR_NO_MORE_FILES)
@throw [OFReadFailedException
|
︙ | | |
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
|
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
|
-
+
-
-
+
+
|
OFStringEncoding encoding = [OFLocale encoding];
WIN32_FIND_DATA fd;
if ((handle = FindFirstFileA(
[path cStringWithEncoding: encoding], &fd)) ==
INVALID_HANDLE_VALUE)
@throw [OFOpenItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
mode: nil
errNo: lastError()];
@try {
do {
OFString *file;
if (strcmp(fd.cFileName, ".") == 0 ||
strcmp(fd.cFileName, "..") == 0)
continue;
file = [[OFString alloc]
initWithCString: fd.cFileName
encoding: encoding];
@try {
[URIs addObject: [URI
URIByAppendingPathComponent: file]];
[IRIs addObject: [IRI
IRIByAppendingPathComponent: file]];
} @finally {
[file release];
}
} while (FindNextFileA(handle, &fd));
if (GetLastError() != ERROR_NO_MORE_FILES)
@throw [OFReadFailedException
|
︙ | | |
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
|
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
|
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
|
#elif defined(OF_AMIGAOS)
OFStringEncoding encoding = [OFLocale encoding];
BPTR lock;
if ((lock = Lock([path cStringWithEncoding: encoding],
SHARED_LOCK)) == 0)
@throw [OFOpenItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
mode: nil
errNo: lastError()];
@try {
# ifdef OF_AMIGAOS4
struct ExamineData *ed;
APTR context;
if ((context = ObtainDirContextTags(EX_FileLockInput, lock,
EX_DoCurrentDir, TRUE, EX_DataFields, EXF_NAME,
TAG_END)) == NULL)
@throw [OFOpenItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
mode: nil
errNo: lastError()];
@try {
while ((ed = ExamineDir(context)) != NULL) {
OFString *file = [[OFString alloc]
initWithCString: ed->Name
encoding: encoding];
@try {
[URIs addObject: [URI
URIByAppendingPathComponent: file]];
[IRIs addObject: [IRI
IRIByAppendingPathComponent: file]];
} @finally {
[file release];
}
}
} @finally {
ReleaseDirContext(context);
}
# else
struct FileInfoBlock fib;
if (!Examine(lock, &fib))
@throw [OFOpenItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
mode: nil
errNo: lastError()];
while (ExNext(lock, &fib)) {
OFString *file = [[OFString alloc]
initWithCString: fib.fib_FileName
encoding: encoding];
@try {
[URIs addObject:
[URI URIByAppendingPathComponent: file]];
[IRIs addObject:
[IRI IRIByAppendingPathComponent: file]];
} @finally {
[file release];
}
}
# endif
if (IoErr() != ERROR_NO_MORE_ENTRIES)
@throw [OFReadFailedException
exceptionWithObject: self
requestedLength: 0
errNo: lastError()];
} @finally {
UnLock(lock);
}
#else
OFStringEncoding encoding = [OFLocale encoding];
DIR *dir;
if ((dir = opendir([path cStringWithEncoding: encoding])) == NULL)
@throw [OFOpenItemFailedException exceptionWithURI: URI
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: nil
errNo: errno];
# if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS)
@try {
[readdirMutex lock];
} @catch (id e) {
|
︙ | | |
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
|
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
|
if (strcmp(dirent->d_name, ".") == 0 ||
strcmp(dirent->d_name, "..") == 0)
continue;
file = [[OFString alloc] initWithCString: dirent->d_name
encoding: encoding];
@try {
[URIs addObject:
[URI URIByAppendingPathComponent: file]];
[IRIs addObject:
[IRI IRIByAppendingPathComponent: file]];
} @finally {
[file release];
}
}
} @finally {
closedir(dir);
# if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS)
[readdirMutex unlock];
# endif
}
#endif
[URIs makeImmutable];
[IRIs makeImmutable];
objc_autoreleasePoolPop(pool);
return URIs;
return IRIs;
}
- (void)removeItemAtURI: (OFURI *)URI
- (void)removeItemAtIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
OFString *path;
int error;
Stat s;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (![URI.scheme isEqual: _scheme])
if (![IRI.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
path = URI.fileSystemRepresentation;
path = IRI.fileSystemRepresentation;
if ((error = lstatWrapper(path, &s)) != 0)
@throw [OFRemoveItemFailedException exceptionWithURI: URI
@throw [OFRemoveItemFailedException exceptionWithIRI: IRI
errNo: error];
if (S_ISDIR(s.st_mode)) {
OFArray OF_GENERIC(OFURI *) *contents;
OFArray OF_GENERIC(OFIRI *) *contents;
@try {
contents = [self contentsOfDirectoryAtURI: URI];
contents = [self contentsOfDirectoryAtIRI: IRI];
} @catch (id e) {
/*
* Only convert exceptions to
* OFRemoveItemFailedException that have an errNo
* property. This covers all I/O related exceptions
* from the operations used to remove an item, all
* others should be left as is.
*/
if ([e respondsToSelector: @selector(errNo)])
@throw [OFRemoveItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: [e errNo]];
@throw e;
}
for (OFURI *item in contents) {
for (OFIRI *item in contents) {
void *pool2 = objc_autoreleasePoolPush();
[self removeItemAtURI: item];
[self removeItemAtIRI: item];
objc_autoreleasePoolPop(pool2);
}
#ifndef OF_AMIGAOS
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wrmdir(path.UTF16String);
else
# endif
status = rmdir(
[path cStringWithEncoding: [OFLocale encoding]]);
if (status != 0)
@throw [OFRemoveItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: errno];
} else {
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wunlink(path.UTF16String);
else
# endif
status = unlink(
[path cStringWithEncoding: [OFLocale encoding]]);
if (status != 0)
@throw [OFRemoveItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: errno];
#endif
}
#ifdef OF_AMIGAOS
if (!DeleteFile([path cStringWithEncoding: [OFLocale encoding]]))
@throw [OFRemoveItemFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
errNo: lastError()];
#endif
objc_autoreleasePoolPop(pool);
}
#ifdef OF_FILE_MANAGER_SUPPORTS_LINKS
- (void)linkItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (void)linkItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
void *pool = objc_autoreleasePoolPush();
OFString *sourcePath, *destinationPath;
if (source == nil || destination == nil)
@throw [OFInvalidArgumentException exception];
if (![source.scheme isEqual: _scheme] ||
![destination.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
sourcePath = source.fileSystemRepresentation;
destinationPath = destination.fileSystemRepresentation;
# ifndef OF_WINDOWS
OFStringEncoding encoding = [OFLocale encoding];
if (link([sourcePath cStringWithEncoding: encoding],
[destinationPath cStringWithEncoding: encoding]) != 0)
@throw [OFLinkItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: errno];
# else
if (createHardLinkWFuncPtr == NULL)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
if (!createHardLinkWFuncPtr(destinationPath.UTF16String,
sourcePath.UTF16String, NULL))
@throw [OFLinkItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: lastError()];
# endif
objc_autoreleasePoolPop(pool);
}
#endif
#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
- (void)createSymbolicLinkAtURI: (OFURI *)URI
- (void)createSymbolicLinkAtIRI: (OFIRI *)IRI
withDestinationPath: (OFString *)target
{
void *pool = objc_autoreleasePoolPush();
OFString *path;
if (URI == nil || target == nil)
if (IRI == nil || target == nil)
@throw [OFInvalidArgumentException exception];
if (![URI.scheme isEqual: _scheme])
if (![IRI.scheme isEqual: _scheme])
@throw [OFInvalidArgumentException exception];
path = URI.fileSystemRepresentation;
path = IRI.fileSystemRepresentation;
# ifndef OF_WINDOWS
OFStringEncoding encoding = [OFLocale encoding];
if (symlink([target cStringWithEncoding: encoding],
[path cStringWithEncoding: encoding]) != 0)
@throw [OFCreateSymbolicLinkFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
target: target
errNo: errno];
# else
if (createSymbolicLinkWFuncPtr == NULL)
@throw [OFNotImplementedException exceptionWithSelector: _cmd
object: self];
if (!createSymbolicLinkWFuncPtr(path.UTF16String, target.UTF16String,
0))
@throw [OFCreateSymbolicLinkFailedException
exceptionWithURI: URI
exceptionWithIRI: IRI
target: target
errNo: lastError()];
# endif
objc_autoreleasePoolPop(pool);
}
#endif
- (bool)moveItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (bool)moveItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
void *pool;
if (![source.scheme isEqual: _scheme] ||
![destination.scheme isEqual: _scheme])
return false;
if ([self fileExistsAtURI: destination])
if ([self fileExistsAtIRI: destination])
@throw [OFMoveItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: EEXIST];
pool = objc_autoreleasePoolPush();
#ifdef OF_AMIGAOS
OFStringEncoding encoding = [OFLocale encoding];
if (!Rename([source.fileSystemRepresentation
cStringWithEncoding: encoding],
[destination.fileSystemRepresentation
cStringWithEncoding: encoding]))
@throw [OFMoveItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: lastError()];
#else
int status;
# ifdef OF_WINDOWS
if ([OFSystemInfo isWindowsNT])
status = _wrename(source.fileSystemRepresentation.UTF16String,
|
︙ | | |
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
|
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
|
-
-
+
+
|
cStringWithEncoding: encoding]);
# ifdef OF_WINDOWS
}
# endif
if (status != 0)
@throw [OFMoveItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: errno];
#endif
objc_autoreleasePoolPop(pool);
return true;
}
@end
|
Modified src/OFFileManager.h
from [1cfc8cfdf6]
to [e8ff0011c7].
︙ | | |
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
-
-
+
+
-
+
-
+
-
+
-
+
|
# define OF_FILE_MANAGER_SUPPORTS_SYMLINKS
# endif
#endif
@class OFArray OF_GENERIC(ObjectType);
@class OFConstantString;
@class OFDate;
@class OFString;
@class OFURI;
@class OFIRI;
@class OFString;
/**
* @brief A key for a file attribute in the file attributes dictionary.
*
* Possible keys for file URIs are:
* Possible keys for file IRIs are:
*
* * @ref OFFileSize
* * @ref OFFileType
* * @ref OFFilePOSIXPermissions
* * @ref OFFileOwnerAccountID
* * @ref OFFileGroupOwnerAccountID
* * @ref OFFileOwnerAccountName
* * @ref OFFileGroupOwnerAccountName
* * @ref OFFileLastAccessDate
* * @ref OFFileModificationDate
* * @ref OFFileStatusChangeDate
* * @ref OFFileCreationDate
* * @ref OFFileSymbolicLinkDestination
*
* Other URI schemes might not have all keys and might have keys not listed.
* Other IRI schemes might not have all keys and might have keys not listed.
*/
typedef OFConstantString *OFFileAttributeKey;
/**
* @brief The type of a file.
*
* Possibles values for file URIs are:
* Possibles values for file IRIs are:
*
* * @ref OFFileTypeRegular
* * @ref OFFileTypeDirectory
* * @ref OFFileTypeSymbolicLink
* * @ref OFFileTypeFIFO
* * @ref OFFileTypeCharacterSpecial
* * @ref OFFileTypeBlockSpecial
* * @ref OFFileTypeSocket
* * @ref OFFileTypeUnknown
*
* Other URI schemes might not have all types and might have types not listed.
* Other IRI schemes might not have all types and might have types not listed.
*/
typedef OFConstantString *OFFileAttributeType;
/**
* @brief A dictionary mapping keys of type @ref OFFileAttributeKey to their
* attribute values.
*/
|
︙ | | |
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
|
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
|
-
+
-
+
|
* @brief The path of the current working directory.
*
* @throw OFGetCurrentDirectoryFailedException Couldn't get current directory
*/
@property (readonly, nonatomic) OFString *currentDirectoryPath;
/**
* @brief The URI of the current working directory.
* @brief The IRI of the current working directory.
*
* @throw OFGetCurrentDirectoryFailedException Couldn't get current directory
*/
@property (readonly, nonatomic) OFURI *currentDirectoryURI;
@property (readonly, nonatomic) OFIRI *currentDirectoryIRI;
#endif
/**
* @brief Returns the default file manager.
*/
+ (OFFileManager *)defaultManager;
|
︙ | | |
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
|
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
|
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
|
* @throw OFGetItemAttributesFailedException Failed to get the attributes of
* the item
*/
- (OFFileAttributes)attributesOfItemAtPath: (OFString *)path;
#endif
/**
* @brief Returns the attributes for the item at the specified URI.
* @brief Returns the attributes for the item at the specified IRI.
*
* @param URI The URI to return the attributes for
* @return A dictionary of attributes for the specified URI, with the keys of
* @param IRI The IRI to return the attributes for
* @return A dictionary of attributes for the specified IRI, with the keys of
* type @ref OFFileAttributeKey
* @throw OFGetItemAttributesFailedException Failed to get the attributes of
* the item
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (OFFileAttributes)attributesOfItemAtURI: (OFURI *)URI;
- (OFFileAttributes)attributesOfItemAtIRI: (OFIRI *)IRI;
#ifdef OF_HAVE_FILES
/**
* @brief Sets the attributes for the item at the specified path.
*
* All attributes not part of the dictionary are left unchanged.
*
* @param attributes The attributes to set for the specified path
* @param path The path of the item to set the attributes for
* @throw OFSetItemAttributesFailedException Failed to set the attributes of
* the item
* @throw OFNotImplementedException Setting one or more of the specified
* attributes is not implemented for the
* specified item
*/
- (void)setAttributes: (OFFileAttributes)attributes
ofItemAtPath: (OFString *)path;
#endif
/**
* @brief Sets the attributes for the item at the specified URI.
* @brief Sets the attributes for the item at the specified IRI.
*
* All attributes not part of the dictionary are left unchanged.
*
* @param attributes The attributes to set for the specified URI
* @param URI The URI of the item to set the attributes for
* @param attributes The attributes to set for the specified IRI
* @param IRI The IRI of the item to set the attributes for
* @throw OFSetItemAttributesFailedException Failed to set the attributes of
* the item
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
* @throw OFNotImplementedException Setting one or more of the specified
* attributes is not implemented for the
* specified item
*/
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURI: (OFURI *)URI;
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtIRI: (OFIRI *)IRI;
#ifdef OF_HAVE_FILES
/**
* @brief Checks whether a file exists at the specified path.
*
* @param path The path to check
* @return A boolean whether there is a file at the specified path
*/
- (bool)fileExistsAtPath: (OFString *)path;
#endif
/**
* @brief Checks whether a file exists at the specified URI.
* @brief Checks whether a file exists at the specified IRI.
*
* @param URI The URI to check
* @return A boolean whether there is a file at the specified URI
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @param IRI The IRI to check
* @return A boolean whether there is a file at the specified IRI
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (bool)fileExistsAtURI: (OFURI *)URI;
- (bool)fileExistsAtIRI: (OFIRI *)IRI;
#ifdef OF_HAVE_FILES
/**
* @brief Checks whether a directory exists at the specified path.
*
* @param path The path to check
* @return A boolean whether there is a directory at the specified path
*/
- (bool)directoryExistsAtPath: (OFString *)path;
#endif
/**
* @brief Checks whether a directory exists at the specified URI.
* @brief Checks whether a directory exists at the specified IRI.
*
* @param URI The URI to check
* @return A boolean whether there is a directory at the specified URI
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @param IRI The IRI to check
* @return A boolean whether there is a directory at the specified IRI
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (bool)directoryExistsAtURI: (OFURI *)URI;
- (bool)directoryExistsAtIRI: (OFIRI *)IRI;
#ifdef OF_HAVE_FILES
/**
* @brief Creates a directory at the specified path.
*
* @param path The path of the directory to create
* @throw OFCreateDirectoryFailedException Creating the directory failed
|
︙ | | |
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
|
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
|
* parents failed
*/
- (void)createDirectoryAtPath: (OFString *)path
createParents: (bool)createParents;
#endif
/**
* @brief Creates a directory at the specified URI.
* @brief Creates a directory at the specified IRI.
*
* @param URI The URI of the directory to create
* @param IRI The IRI of the directory to create
* @throw OFCreateDirectoryFailedException Creating the directory failed
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (void)createDirectoryAtURI: (OFURI *)URI;
- (void)createDirectoryAtIRI: (OFIRI *)IRI;
/**
* @brief Creates a directory at the specified URI.
* @brief Creates a directory at the specified IRI.
*
* @param URI The URI of the directory to create
* @param IRI The IRI of the directory to create
* @param createParents Whether to create the parents of the directory
* @throw OFCreateDirectoryFailedException Creating the directory or one of its
* parents failed
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (void)createDirectoryAtURI: (OFURI *)URI createParents: (bool)createParents;
- (void)createDirectoryAtIRI: (OFIRI *)IRI createParents: (bool)createParents;
#ifdef OF_HAVE_FILES
/**
* @brief Returns an array with the items in the specified directory.
*
* @note `.` and `..` are not part of the returned array.
*
* @param path The path to the directory whose items should be returned
* @return An array of OFString with the items in the specified directory
* @throw OFOpenItemFailedException Opening the directory failed
* @throw OFReadFailedException Reading from the directory failed
*/
- (OFArray OF_GENERIC(OFString *) *)contentsOfDirectoryAtPath: (OFString *)path;
#endif
/**
* @brief Returns an array with the URIs of the items in the specified
* @brief Returns an array with the IRIs of the items in the specified
* directory.
*
* @note `.` and `..` are not part of the returned array.
*
* @param URI The URI to the directory whose items should be returned
* @return An array with the URIs of the items in the specified directory
* @param IRI The IRI to the directory whose items should be returned
* @return An array with the IRIs of the items in the specified directory
* @throw OFOpenItemFailedException Opening the directory failed
* @throw OFReadFailedException Reading from the directory failed
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (OFArray OF_GENERIC(OFURI *) *)contentsOfDirectoryAtURI: (OFURI *)URI;
- (OFArray OF_GENERIC(OFIRI *) *)contentsOfDirectoryAtIRI: (OFIRI *)IRI;
#ifdef OF_HAVE_FILES
/**
* @brief Returns an array with all subpaths of the specified directory.
*
* @note `.` and `..` (of the directory itself or any subdirectory) are not
* part of the returned array.
|
︙ | | |
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
|
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
|
-
+
-
+
|
* directory failed
*/
- (void)changeCurrentDirectoryPath: (OFString *)path;
/**
* @brief Changes the current working directory.
*
* @param URI The new directory to change to
* @param IRI The new directory to change to
* @throw OFChangeCurrentDirectoryFailedException Changing the current working
* directory failed
*/
- (void)changeCurrentDirectoryURI: (OFURI *)URI;
- (void)changeCurrentDirectoryIRI: (OFIRI *)IRI;
/**
* @brief Copies a file, directory or symbolic link (if supported by the OS).
*
* The destination path must be a full path, which means it must include the
* name of the item.
*
|
︙ | | |
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
|
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
|
-
+
-
+
-
+
-
+
|
*/
- (void)copyItemAtPath: (OFString *)source toPath: (OFString *)destination;
#endif
/**
* @brief Copies a file, directory or symbolic link (if supported by the OS).
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* If an item already exists, the copy operation fails. This is also the case
* if a directory is copied and an item already exists in the destination
* directory.
*
* @param source The file, directory or symbolic link to copy
* @param destination The destination URI
* @param destination The destination IRI
* @throw OFCopyItemFailedException Copying failed
* @throw OFCreateDirectoryFailedException Creating a destination directory
* failed
* @throw OFUnsupportedProtocolException No handler is registered for either of
* the URI's scheme
* the IRI's scheme
*/
- (void)copyItemAtURI: (OFURI *)source toURI: (OFURI *)destination;
- (void)copyItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination;
#ifdef OF_HAVE_FILES
/**
* @brief Moves an item.
*
* The destination path must be a full path, which means it must include the
* name of the item.
|
︙ | | |
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
|
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
*/
- (void)moveItemAtPath: (OFString *)source toPath: (OFString *)destination;
#endif
/**
* @brief Moves an item.
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* If the destination is on a different logical device or uses a different
* scheme, the source will be copied to the destination using
* @ref copyItemAtURI:toURI: and the source removed using @ref removeItemAtURI:.
* @ref copyItemAtIRI:toIRI: and the source removed using @ref removeItemAtIRI:.
*
* @param source The item to rename
* @param destination The new name for the item
* @throw OFMoveItemFailedException Moving failed
* @throw OFCopyItemFailedException Copying (to move between different devices)
* failed
* @throw OFRemoveItemFailedException Removing the source after copying to the
* destination (to move between different
* devices) failed
* @throw OFCreateDirectoryFailedException Creating a destination directory
* failed
* @throw OFUnsupportedProtocolException No handler is registered for either of
* the URI's scheme
* the IRI's scheme
*/
- (void)moveItemAtURI: (OFURI *)source toURI: (OFURI *)destination;
- (void)moveItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination;
#ifdef OF_HAVE_FILES
/**
* @brief Removes the item at the specified path.
*
* If the item at the specified path is a directory, it is removed recursively.
*
* @param path The path to the item which should be removed
* @throw OFRemoveItemFailedException Removing the item failed
*/
- (void)removeItemAtPath: (OFString *)path;
#endif
/**
* @brief Removes the item at the specified URI.
* @brief Removes the item at the specified IRI.
*
* If the item at the specified URI is a directory, it is removed recursively.
* If the item at the specified IRI is a directory, it is removed recursively.
*
* @param URI The URI to the item which should be removed
* @param IRI The IRI to the item which should be removed
* @throw OFRemoveItemFailedException Removing the item failed
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (void)removeItemAtURI: (OFURI *)URI;
- (void)removeItemAtIRI: (OFIRI *)IRI;
#ifdef OF_FILE_MANAGER_SUPPORTS_LINKS
/**
* @brief Creates a hard link for the specified item.
*
* The destination path must be a full path, which means it must include the
* name of the item.
*
* This method is not available on some systems.
*
* @param source The path to the item for which a link should be created
* @param destination The path to the item which should link to the source
* @throw OFLinkItemFailedException Linking the item failed
* @throw OFNotImplementedException Hardlinks are not implemented for the
* specified URI
* specified IRI
*/
- (void)linkItemAtPath: (OFString *)source toPath: (OFString *)destination;
#endif
/**
* @brief Creates a hard link for the specified item.
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* This method is not available for all URIs.
* This method is not available for all IRIs.
*
* @param source The URI to the item for which a link should be created
* @param destination The URI to the item which should link to the source
* @param source The IRI to the item for which a link should be created
* @param destination The IRI to the item which should link to the source
* @throw OFLinkItemFailedException Linking the item failed
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
* @throw OFNotImplementedException Hardlinks are not implemented for the
* specified URI
* specified IRI
*/
- (void)linkItemAtURI: (OFURI *)source toURI: (OFURI *)destination;
- (void)linkItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination;
#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
/**
* @brief Creates a symbolic link for an item.
*
* The destination path must be a full path, which means it must include the
* name of the item.
*
* This method is not available on some systems.
*
* @note On Windows, this requires at least Windows Vista and administrator
* privileges!
*
* @param path The path to the item which should symbolically link to the target
* @param target The target of the symbolic link
* @throw OFCreateSymbolicLinkFailedException Creating the symbolic link failed
* @throw OFNotImplementedException Symbolic links are not implemented for the
* specified URI
* specified IRI
*/
- (void)createSymbolicLinkAtPath: (OFString *)path
withDestinationPath: (OFString *)target;
#endif
/**
* @brief Creates a symbolic link for an item.
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* This method is not available for all URIs.
* This method is not available for all IRIs.
*
* @note On Windows, this requires at least Windows Vista and administrator
* privileges!
*
* @param URI The URI to the item which should symbolically link to the target
* @param IRI The IRI to the item which should symbolically link to the target
* @param target The target of the symbolic link
* @throw OFUnsupportedProtocolException No handler is registered for the URI's
* @throw OFUnsupportedProtocolException No handler is registered for the IRI's
* scheme
*/
- (void)createSymbolicLinkAtURI: (OFURI *)URI
- (void)createSymbolicLinkAtIRI: (OFIRI *)IRI
withDestinationPath: (OFString *)target;
@end
@interface OFDictionary (FileAttributes)
/**
* @brief The @ref OFFileSize key from the dictionary.
*
|
︙ | | |
Modified src/OFFileManager.m
from [5dfeac045a]
to [8e0e4b6a5f].
︙ | | |
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
+
+
-
-
|
#import "OFArray.h"
#import "OFDate.h"
#import "OFDictionary.h"
#ifdef OF_HAVE_FILES
# import "OFFile.h"
#endif
#import "OFFileManager.h"
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFLocale.h"
#import "OFNumber.h"
#import "OFStream.h"
#import "OFString.h"
#import "OFSystemInfo.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFChangeCurrentDirectoryFailedException.h"
#import "OFCopyItemFailedException.h"
#import "OFCreateDirectoryFailedException.h"
#import "OFGetCurrentDirectoryFailedException.h"
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
|
︙ | | |
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
|
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
|
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
|
# endif
return [OFString stringWithCString: buffer
encoding: [OFLocale encoding]];
# endif
}
- (OFURI *)currentDirectoryURI
- (OFIRI *)currentDirectoryIRI
{
void *pool = objc_autoreleasePoolPush();
OFURI *ret;
OFIRI *ret;
ret = [OFURI fileURIWithPath: self.currentDirectoryPath];
ret = [OFIRI fileIRIWithPath: self.currentDirectoryPath];
[ret retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
#endif
- (OFFileAttributes)attributesOfItemAtURI: (OFURI *)URI
- (OFFileAttributes)attributesOfItemAtIRI: (OFIRI *)IRI
{
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if ((URIHandler = [OFURIHandler handlerForURI: URI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
return [URIHandler attributesOfItemAtURI: URI];
return [IRIHandler attributesOfItemAtIRI: IRI];
}
#ifdef OF_HAVE_FILES
- (OFFileAttributes)attributesOfItemAtPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
OFFileAttributes ret;
ret = [self attributesOfItemAtURI: [OFURI fileURIWithPath: path]];
ret = [self attributesOfItemAtIRI: [OFIRI fileIRIWithPath: path]];
[ret retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
#endif
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURI: (OFURI *)URI
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtIRI: (OFIRI *)IRI
{
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if ((URIHandler = [OFURIHandler handlerForURI: URI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
[URIHandler setAttributes: attributes ofItemAtURI: URI];
[IRIHandler setAttributes: attributes ofItemAtIRI: IRI];
}
#ifdef OF_HAVE_FILES
- (void)setAttributes: (OFFileAttributes)attributes
ofItemAtPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
[self setAttributes: attributes
ofItemAtURI: [OFURI fileURIWithPath: path]];
ofItemAtIRI: [OFIRI fileIRIWithPath: path]];
objc_autoreleasePoolPop(pool);
}
#endif
- (bool)fileExistsAtURI: (OFURI *)URI
- (bool)fileExistsAtIRI: (OFIRI *)IRI
{
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if ((URIHandler = [OFURIHandler handlerForURI: URI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
return [URIHandler fileExistsAtURI: URI];
return [IRIHandler fileExistsAtIRI: IRI];
}
#ifdef OF_HAVE_FILES
- (bool)fileExistsAtPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
bool ret;
ret = [self fileExistsAtURI: [OFURI fileURIWithPath: path]];
ret = [self fileExistsAtIRI: [OFIRI fileIRIWithPath: path]];
objc_autoreleasePoolPop(pool);
return ret;
}
#endif
- (bool)directoryExistsAtURI: (OFURI *)URI
- (bool)directoryExistsAtIRI: (OFIRI *)IRI
{
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if ((URIHandler = [OFURIHandler handlerForURI: URI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
return [URIHandler directoryExistsAtURI: URI];
return [IRIHandler directoryExistsAtIRI: IRI];
}
#ifdef OF_HAVE_FILES
- (bool)directoryExistsAtPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
bool ret;
ret = [self directoryExistsAtURI: [OFURI fileURIWithPath: path]];
ret = [self directoryExistsAtIRI: [OFIRI fileIRIWithPath: path]];
objc_autoreleasePoolPop(pool);
return ret;
}
#endif
- (void)createDirectoryAtURI: (OFURI *)URI
- (void)createDirectoryAtIRI: (OFIRI *)IRI
{
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if ((URIHandler = [OFURIHandler handlerForURI: URI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
[URIHandler createDirectoryAtURI: URI];
[IRIHandler createDirectoryAtIRI: IRI];
}
- (void)createDirectoryAtURI: (OFURI *)URI createParents: (bool)createParents
- (void)createDirectoryAtIRI: (OFIRI *)IRI createParents: (bool)createParents
{
void *pool = objc_autoreleasePoolPush();
OFMutableURI *mutableURI;
OFMutableIRI *mutableIRI;
OFArray OF_GENERIC(OFString *) *components;
OFMutableArray OF_GENERIC(OFURI *) *componentURIs;
size_t componentURIsCount;
OFMutableArray OF_GENERIC(OFIRI *) *componentIRIs;
size_t componentIRIsCount;
ssize_t i;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if (!createParents) {
[self createDirectoryAtURI: URI];
[self createDirectoryAtIRI: IRI];
return;
}
/*
* Try blindly creating the directory first.
*
* The reason for this is that we might be sandboxed, so attempting to
* create any of the parent directories will fail, while creating the
* directory itself will work.
*/
if ([self directoryExistsAtURI: URI])
if ([self directoryExistsAtIRI: IRI])
return;
@try {
[self createDirectoryAtURI: URI];
[self createDirectoryAtIRI: IRI];
return;
} @catch (OFCreateDirectoryFailedException *e) {
/*
* If we didn't fail because any of the parents is missing,
* there is no point in trying to create the parents.
*/
if (e.errNo != ENOENT)
@throw e;
}
/*
* Because we might be sandboxed (and for remote URIs don't even know
* anything at all), we generate the URI for every component. We then
* Because we might be sandboxed (and for remote IRIs don't even know
* anything at all), we generate the IRI for every component. We then
* iterate them in reverse order until we find the first existing
* directory, and then create subdirectories from there.
*/
mutableURI = [[URI mutableCopy] autorelease];
mutableURI.percentEncodedPath = @"/";
components = URI.pathComponents;
componentURIs = [OFMutableArray arrayWithCapacity: components.count];
mutableIRI = [[IRI mutableCopy] autorelease];
mutableIRI.percentEncodedPath = @"/";
components = IRI.pathComponents;
componentIRIs = [OFMutableArray arrayWithCapacity: components.count];
for (OFString *component in components) {
[mutableURI appendPathComponent: component];
[mutableIRI appendPathComponent: component];
if (![mutableURI.percentEncodedPath isEqual: @"/"])
[componentURIs addObject:
[[mutableURI copy] autorelease]];
if (![mutableIRI.percentEncodedPath isEqual: @"/"])
[componentIRIs addObject:
[[mutableIRI copy] autorelease]];
}
componentURIsCount = componentURIs.count;
for (i = componentURIsCount - 1; i > 0; i--) {
if ([self directoryExistsAtURI:
[componentURIs objectAtIndex: i]])
componentIRIsCount = componentIRIs.count;
for (i = componentIRIsCount - 1; i > 0; i--) {
if ([self directoryExistsAtIRI:
[componentIRIs objectAtIndex: i]])
break;
}
if (++i == (ssize_t)componentURIsCount) {
if (++i == (ssize_t)componentIRIsCount) {
/*
* The URI exists, even though before we made sure it did not.
* The IRI exists, even though before we made sure it did not.
* That means it was created in the meantime by something else,
* so we're done here.
*/
objc_autoreleasePoolPop(pool);
return;
}
for (; i < (ssize_t)componentURIsCount; i++)
[self createDirectoryAtURI: [componentURIs objectAtIndex: i]];
for (; i < (ssize_t)componentIRIsCount; i++)
[self createDirectoryAtIRI: [componentIRIs objectAtIndex: i]];
objc_autoreleasePoolPop(pool);
}
#ifdef OF_HAVE_FILES
- (void)createDirectoryAtPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
[self createDirectoryAtURI: [OFURI fileURIWithPath: path]];
[self createDirectoryAtIRI: [OFIRI fileIRIWithPath: path]];
objc_autoreleasePoolPop(pool);
}
- (void)createDirectoryAtPath: (OFString *)path
createParents: (bool)createParents
{
void *pool = objc_autoreleasePoolPush();
[self createDirectoryAtURI: [OFURI fileURIWithPath: path]
[self createDirectoryAtIRI: [OFIRI fileIRIWithPath: path]
createParents: createParents];
objc_autoreleasePoolPop(pool);
}
#endif
- (OFArray OF_GENERIC(OFURI *) *)contentsOfDirectoryAtURI: (OFURI *)URI
- (OFArray OF_GENERIC(OFIRI *) *)contentsOfDirectoryAtIRI: (OFIRI *)IRI
{
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if ((URIHandler = [OFURIHandler handlerForURI: URI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
return [URIHandler contentsOfDirectoryAtURI: URI];
return [IRIHandler contentsOfDirectoryAtIRI: IRI];
}
#ifdef OF_HAVE_FILES
- (OFArray OF_GENERIC(OFString *) *)contentsOfDirectoryAtPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
OFArray OF_GENERIC(OFURI *) *URIs;
OFArray OF_GENERIC(OFIRI *) *IRIs;
OFMutableArray OF_GENERIC(OFString *) *ret;
URIs = [self contentsOfDirectoryAtURI: [OFURI fileURIWithPath: path]];
ret = [OFMutableArray arrayWithCapacity: URIs.count];
IRIs = [self contentsOfDirectoryAtIRI: [OFIRI fileIRIWithPath: path]];
ret = [OFMutableArray arrayWithCapacity: IRIs.count];
for (OFURI *URI in URIs)
[ret addObject: URI.lastPathComponent];
for (OFIRI *IRI in IRIs)
[ret addObject: IRI.lastPathComponent];
[ret makeImmutable];
[ret retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
|
︙ | | |
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
|
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
|
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
|
if (status != 0)
@throw [OFChangeCurrentDirectoryFailedException
exceptionWithPath: path
errNo: errno];
# endif
}
- (void)changeCurrentDirectoryURI: (OFURI *)URI
- (void)changeCurrentDirectoryIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
[self changeCurrentDirectoryPath: URI.fileSystemRepresentation];
[self changeCurrentDirectoryPath: IRI.fileSystemRepresentation];
objc_autoreleasePoolPop(pool);
}
- (void)copyItemAtPath: (OFString *)source toPath: (OFString *)destination
{
void *pool = objc_autoreleasePoolPush();
[self copyItemAtURI: [OFURI fileURIWithPath: source]
toURI: [OFURI fileURIWithPath: destination]];
[self copyItemAtIRI: [OFIRI fileIRIWithPath: source]
toIRI: [OFIRI fileIRIWithPath: destination]];
objc_autoreleasePoolPop(pool);
}
#endif
- (void)copyItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (void)copyItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
void *pool;
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
OFFileAttributes attributes;
OFFileAttributeType type;
if (source == nil || destination == nil)
@throw [OFInvalidArgumentException exception];
pool = objc_autoreleasePoolPush();
if ((URIHandler = [OFURIHandler handlerForURI: source]) == nil)
if ((IRIHandler = [OFIRIHandler handlerForIRI: source]) == nil)
@throw [OFUnsupportedProtocolException
exceptionWithURI: source];
exceptionWithIRI: source];
if ([URIHandler copyItemAtURI: source toURI: destination])
if ([IRIHandler copyItemAtIRI: source toIRI: destination])
return;
if ([self fileExistsAtURI: destination])
if ([self fileExistsAtIRI: destination])
@throw [OFCopyItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: EEXIST];
@try {
attributes = [self attributesOfItemAtURI: source];
attributes = [self attributesOfItemAtIRI: source];
} @catch (OFGetItemAttributesFailedException *e) {
@throw [OFCopyItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: e.errNo];
}
type = attributes.fileType;
if ([type isEqual: OFFileTypeDirectory]) {
OFArray OF_GENERIC(OFURI *) *contents;
OFArray OF_GENERIC(OFIRI *) *contents;
@try {
[self createDirectoryAtURI: destination];
[self createDirectoryAtIRI: destination];
@try {
OFFileAttributeKey key = OFFilePOSIXPermissions;
OFNumber *permissions =
[attributes objectForKey: key];
OFFileAttributes destinationAttributes;
if (permissions != nil) {
destinationAttributes = [OFDictionary
dictionaryWithObject: permissions
forKey: key];
[self
setAttributes: destinationAttributes
ofItemAtURI: destination];
ofItemAtIRI: destination];
}
} @catch (OFNotImplementedException *e) {
}
contents = [self contentsOfDirectoryAtURI: source];
contents = [self contentsOfDirectoryAtIRI: source];
} @catch (id e) {
/*
* Only convert exceptions to OFCopyItemFailedException
* that have an errNo property. This covers all I/O
* related exceptions from the operations used to copy
* an item, all others should be left as is.
*/
if ([e respondsToSelector: @selector(errNo)])
@throw [OFCopyItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: [e errNo]];
@throw e;
}
for (OFURI *item in contents) {
for (OFIRI *item in contents) {
void *pool2 = objc_autoreleasePoolPush();
OFURI *destinationURI = [destination
URIByAppendingPathComponent:
OFIRI *destinationIRI = [destination
IRIByAppendingPathComponent:
item.lastPathComponent];
[self copyItemAtURI: item toURI: destinationURI];
[self copyItemAtIRI: item toIRI: destinationIRI];
objc_autoreleasePoolPop(pool2);
}
} else if ([type isEqual: OFFileTypeRegular]) {
size_t pageSize = [OFSystemInfo pageSize];
OFStream *sourceStream = nil;
OFStream *destinationStream = nil;
char *buffer;
buffer = OFAllocMemory(1, pageSize);
@try {
sourceStream = [OFURIHandler openItemAtURI: source
sourceStream = [OFIRIHandler openItemAtIRI: source
mode: @"r"];
destinationStream = [OFURIHandler
openItemAtURI: destination
destinationStream = [OFIRIHandler
openItemAtIRI: destination
mode: @"w"];
while (!sourceStream.atEndOfStream) {
size_t length;
length = [sourceStream
readIntoBuffer: buffer
|
︙ | | |
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
|
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
|
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
|
if (permissions != nil) {
destinationAttributes = [OFDictionary
dictionaryWithObject: permissions
forKey: key];
[self
setAttributes: destinationAttributes
ofItemAtURI: destination];
ofItemAtIRI: destination];
}
} @catch (OFNotImplementedException *e) {
}
} @catch (id e) {
/*
* Only convert exceptions to OFCopyItemFailedException
* that have an errNo property. This covers all I/O
* related exceptions from the operations used to copy
* an item, all others should be left as is.
*/
if ([e respondsToSelector: @selector(errNo)])
@throw [OFCopyItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: [e errNo]];
@throw e;
} @finally {
[sourceStream close];
[destinationStream close];
OFFreeMemory(buffer);
}
} else if ([type isEqual: OFFileTypeSymbolicLink]) {
@try {
OFString *linkDestination =
attributes.fileSymbolicLinkDestination;
[self createSymbolicLinkAtURI: destination
[self createSymbolicLinkAtIRI: destination
withDestinationPath: linkDestination];
} @catch (id e) {
/*
* Only convert exceptions to OFCopyItemFailedException
* that have an errNo property. This covers all I/O
* related exceptions from the operations used to copy
* an item, all others should be left as is.
*/
if ([e respondsToSelector: @selector(errNo)])
@throw [OFCopyItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: [e errNo]];
@throw e;
}
} else
@throw [OFCopyItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: EINVAL];
objc_autoreleasePoolPop(pool);
}
#ifdef OF_HAVE_FILES
- (void)moveItemAtPath: (OFString *)source toPath: (OFString *)destination
{
void *pool = objc_autoreleasePoolPush();
[self moveItemAtURI: [OFURI fileURIWithPath: source]
toURI: [OFURI fileURIWithPath: destination]];
[self moveItemAtIRI: [OFIRI fileIRIWithPath: source]
toIRI: [OFIRI fileIRIWithPath: destination]];
objc_autoreleasePoolPop(pool);
}
#endif
- (void)moveItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (void)moveItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
void *pool;
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (source == nil || destination == nil)
@throw [OFInvalidArgumentException exception];
pool = objc_autoreleasePoolPush();
if ((URIHandler = [OFURIHandler handlerForURI: source]) == nil)
if ((IRIHandler = [OFIRIHandler handlerForIRI: source]) == nil)
@throw [OFUnsupportedProtocolException
exceptionWithURI: source];
exceptionWithIRI: source];
@try {
if ([URIHandler moveItemAtURI: source toURI: destination])
if ([IRIHandler moveItemAtIRI: source toIRI: destination])
return;
} @catch (OFMoveItemFailedException *e) {
if (e.errNo != EXDEV)
@throw e;
}
if ([self fileExistsAtURI: destination])
if ([self fileExistsAtIRI: destination])
@throw [OFMoveItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: EEXIST];
@try {
[self copyItemAtURI: source toURI: destination];
[self copyItemAtIRI: source toIRI: destination];
} @catch (OFCopyItemFailedException *e) {
[self removeItemAtURI: destination];
[self removeItemAtIRI: destination];
@throw [OFMoveItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: e.errNo];
}
@try {
[self removeItemAtURI: source];
[self removeItemAtIRI: source];
} @catch (OFRemoveItemFailedException *e) {
@throw [OFMoveItemFailedException
exceptionWithSourceURI: source
destinationURI: destination
exceptionWithSourceIRI: source
destinationIRI: destination
errNo: e.errNo];
}
objc_autoreleasePoolPop(pool);
}
- (void)removeItemAtURI: (OFURI *)URI
- (void)removeItemAtIRI: (OFIRI *)IRI
{
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil)
if (IRI == nil)
@throw [OFInvalidArgumentException exception];
if ((URIHandler = [OFURIHandler handlerForURI: URI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if ((IRIHandler = [OFIRIHandler handlerForIRI: IRI]) == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
[URIHandler removeItemAtURI: URI];
[IRIHandler removeItemAtIRI: IRI];
}
#ifdef OF_HAVE_FILES
- (void)removeItemAtPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
[self removeItemAtURI: [OFURI fileURIWithPath: path]];
[self removeItemAtIRI: [OFIRI fileIRIWithPath: path]];
objc_autoreleasePoolPop(pool);
}
#endif
- (void)linkItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (void)linkItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
void *pool = objc_autoreleasePoolPush();
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (source == nil || destination == nil)
@throw [OFInvalidArgumentException exception];
if (![destination.scheme isEqual: source.scheme])
@throw [OFInvalidArgumentException exception];
URIHandler = [OFURIHandler handlerForURI: source];
IRIHandler = [OFIRIHandler handlerForIRI: source];
if (URIHandler == nil)
if (IRIHandler == nil)
@throw [OFUnsupportedProtocolException
exceptionWithURI: source];
exceptionWithIRI: source];
[URIHandler linkItemAtURI: source toURI: destination];
[IRIHandler linkItemAtIRI: source toIRI: destination];
objc_autoreleasePoolPop(pool);
}
#ifdef OF_FILE_MANAGER_SUPPORTS_LINKS
- (void)linkItemAtPath: (OFString *)source toPath: (OFString *)destination
{
void *pool = objc_autoreleasePoolPush();
[self linkItemAtURI: [OFURI fileURIWithPath: source]
toURI: [OFURI fileURIWithPath: destination]];
[self linkItemAtIRI: [OFIRI fileIRIWithPath: source]
toIRI: [OFIRI fileIRIWithPath: destination]];
objc_autoreleasePoolPop(pool);
}
#endif
- (void)createSymbolicLinkAtURI: (OFURI *)URI
- (void)createSymbolicLinkAtIRI: (OFIRI *)IRI
withDestinationPath: (OFString *)target
{
void *pool = objc_autoreleasePoolPush();
OFURIHandler *URIHandler;
OFIRIHandler *IRIHandler;
if (URI == nil || target == nil)
if (IRI == nil || target == nil)
@throw [OFInvalidArgumentException exception];
URIHandler = [OFURIHandler handlerForURI: URI];
IRIHandler = [OFIRIHandler handlerForIRI: IRI];
if (URIHandler == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
if (IRIHandler == nil)
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
[URIHandler createSymbolicLinkAtURI: URI withDestinationPath: target];
[IRIHandler createSymbolicLinkAtIRI: IRI withDestinationPath: target];
objc_autoreleasePoolPop(pool);
}
#ifdef OF_FILE_MANAGER_SUPPORTS_SYMLINKS
- (void)createSymbolicLinkAtPath: (OFString *)path
withDestinationPath: (OFString *)target
{
void *pool = objc_autoreleasePoolPush();
[self createSymbolicLinkAtURI: [OFURI fileURIWithPath: path]
[self createSymbolicLinkAtIRI: [OFIRI fileIRIWithPath: path]
withDestinationPath: target];
objc_autoreleasePoolPop(pool);
}
#endif
@end
@implementation OFDefaultFileManager
|
︙ | | |
Modified src/OFHTTPClient.h
from [d5da950339]
to [03e878758b].
︙ | | |
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
+
-
|
OF_ASSUME_NONNULL_BEGIN
@class OFDictionary OF_GENERIC(KeyType, ObjectType);
@class OFHTTPClient;
@class OFHTTPRequest;
@class OFHTTPResponse;
@class OFIRI;
@class OFStream;
@class OFTCPSocket;
@class OFTLSStream;
@class OFURI;
/**
* @protocol OFHTTPClientDelegate OFHTTPClient.h ObjFW/OFHTTPClient.h
*
* @brief A delegate for OFHTTPClient.
*/
@protocol OFHTTPClientDelegate <OFObject>
|
︙ | | |
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
|
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
|
-
+
-
+
-
+
-
+
|
* to detect a redirect.
*
* This callback will only be called if the OFHTTPClient will follow a
* redirect. If the maximum number of redirects has been reached already, this
* callback will not be called.
*
* @param client The OFHTTPClient which wants to follow a redirect
* @param URI The URI to which it will follow a redirect
* @param IRI The IRI to which it will follow a redirect
* @param statusCode The status code for the redirection
* @param request The request for which the OFHTTPClient wants to redirect.
* You are allowed to change the request's headers from this
* callback and they will be used when following the redirect
* (e.g. to set the cookies for the new URI), however, keep in
* (e.g. to set the cookies for the new IRI), however, keep in
* mind that this will change the request you originally passed.
* @param response The response indicating the redirect
* @return A boolean whether the OFHTTPClient should follow the redirect
*/
- (bool)client: (OFHTTPClient *)client
shouldFollowRedirectToURI: (OFURI *)URI
shouldFollowRedirectToIRI: (OFIRI *)IRI
statusCode: (short)statusCode
request: (OFHTTPRequest *)request
response: (OFHTTPResponse *)response;
@end
/**
* @class OFHTTPClient OFHTTPClient.h ObjFW/OFHTTPClient.h
*
* @brief A class for performing HTTP requests.
*/
OF_SUBCLASSING_RESTRICTED
@interface OFHTTPClient: OFObject
{
#ifdef OF_HTTP_CLIENT_M
@public
#endif
OFObject <OFHTTPClientDelegate> *_Nullable _delegate;
bool _allowsInsecureRedirects, _inProgress;
OFStream *_Nullable _stream;
OFURI *_Nullable _lastURI;
OFIRI *_Nullable _lastIRI;
bool _lastWasHEAD;
OFHTTPResponse *_Nullable _lastResponse;
}
/**
* @brief The delegate of the HTTP request.
*/
|
︙ | | |
Modified src/OFHTTPClient.m
from [e887f99bf5]
to [1c25c3f26c].
︙ | | |
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
+
-
|
#include <string.h>
#import "OFHTTPClient.h"
#import "OFData.h"
#import "OFDictionary.h"
#import "OFHTTPRequest.h"
#import "OFHTTPResponse.h"
#import "OFIRI.h"
#import "OFKernelEventObserver.h"
#import "OFNumber.h"
#import "OFRunLoop.h"
#import "OFString.h"
#import "OFTCPSocket.h"
#import "OFTLSStream.h"
#import "OFURI.h"
#import "OFAlreadyConnectedException.h"
#import "OFHTTPRequestFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidEncodingException.h"
#import "OFInvalidFormatException.h"
#import "OFInvalidServerResponseException.h"
|
︙ | | |
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
|
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
|
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
|
@end
static OFString *
constructRequestString(OFHTTPRequest *request)
{
void *pool = objc_autoreleasePoolPush();
OFHTTPRequestMethod method = request.method;
OFURI *URI = request.URI;
OFIRI *IRI = request.IRI;
OFString *path;
OFString *user = URI.user, *password = URI.password;
OFString *user = IRI.user, *password = IRI.password;
OFMutableString *requestString;
OFMutableDictionary OF_GENERIC(OFString *, OFString *) *headers;
bool hasContentLength, chunked;
OFEnumerator OF_GENERIC(OFString *) *keyEnumerator, *objectEnumerator;
OFString *key, *object;
if (URI.path.length > 0)
path = URI.percentEncodedPath;
if (IRI.path.length > 0)
path = IRI.percentEncodedPath;
else
path = @"/";
requestString = [OFMutableString stringWithFormat:
@"%s %@", OFHTTPRequestMethodName(method), path];
if (URI.query != nil) {
if (IRI.query != nil) {
[requestString appendString: @"?"];
[requestString appendString: URI.percentEncodedQuery];
[requestString appendString: IRI.percentEncodedQuery];
}
[requestString appendString: @" HTTP/"];
[requestString appendString: request.protocolVersionString];
[requestString appendString: @"\r\n"];
headers = [[request.headers mutableCopy] autorelease];
if (headers == nil)
headers = [OFMutableDictionary dictionary];
if ([headers objectForKey: @"Host"] == nil) {
OFNumber *port = URI.port;
OFNumber *port = IRI.port;
if (port != nil) {
OFString *host = [OFString stringWithFormat:
@"%@:%@", URI.percentEncodedHost, port];
@"%@:%@", IRI.percentEncodedHost, port];
[headers setObject: host forKey: @"Host"];
} else
[headers setObject: URI.percentEncodedHost
[headers setObject: IRI.percentEncodedHost
forKey: @"Host"];
}
if ((user.length > 0 || password.length > 0) &&
[headers objectForKey: @"Authorization"] == nil) {
OFMutableData *authorizationData = [OFMutableData data];
OFString *authorization;
|
︙ | | |
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
|
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
|
-
+
|
didPerformRequest: _request
response: nil
exception: exception];
}
- (void)createResponseWithStreamOrThrow: (OFStream *)stream
{
OFURI *URI = _request.URI;
OFIRI *IRI = _request.IRI;
OFHTTPClientResponse *response;
OFString *connectionHeader;
bool keepAlive;
OFString *location;
id exception;
response = [[[OFHTTPClientResponse alloc] initWithStream: stream]
|
︙ | | |
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
|
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
|
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
keepAlive = false;
}
if (keepAlive) {
response.of_keepAlive = true;
_client->_stream = [stream retain];
_client->_lastURI = [URI copy];
_client->_lastIRI = [IRI copy];
_client->_lastWasHEAD =
(_request.method == OFHTTPRequestMethodHead);
_client->_lastResponse = [response retain];
}
if (_redirects > 0 && (_status == 301 || _status == 302 ||
_status == 303 || _status == 307) &&
(location = [_serverHeaders objectForKey: @"Location"]) != nil) {
bool follow = true;
OFURI *newURI;
OFString *newURIScheme;
OFIRI *newIRI;
OFString *newIRIScheme;
newURI = [OFURI URIWithString: location relativeToURI: URI];
newURIScheme = newURI.scheme;
newIRI = [OFIRI IRIWithString: location relativeToIRI: IRI];
newIRIScheme = newIRI.scheme;
if ([newURIScheme caseInsensitiveCompare: @"http"] !=
if ([newIRIScheme caseInsensitiveCompare: @"http"] !=
OFOrderedSame &&
[newURIScheme caseInsensitiveCompare: @"https"] !=
[newIRIScheme caseInsensitiveCompare: @"https"] !=
OFOrderedSame)
follow = false;
if (!_client->_allowsInsecureRedirects &&
[URI.scheme caseInsensitiveCompare: @"https"] ==
[IRI.scheme caseInsensitiveCompare: @"https"] ==
OFOrderedSame &&
[newURIScheme caseInsensitiveCompare: @"http"] ==
[newIRIScheme caseInsensitiveCompare: @"http"] ==
OFOrderedSame)
follow = false;
if (follow && [_client->_delegate respondsToSelector:
@selector(client:shouldFollowRedirectToURI:statusCode:
@selector(client:shouldFollowRedirectToIRI:statusCode:
request:response:)])
follow = [_client->_delegate client: _client
shouldFollowRedirectToURI: newURI
shouldFollowRedirectToIRI: newIRI
statusCode: _status
request: _request
response: response];
else if (follow)
follow = defaultShouldFollow(_request.method, _status);
if (follow) {
OFDictionary OF_GENERIC(OFString *, OFString *)
*headers = _request.headers;
OFHTTPRequest *newRequest =
[[_request copy] autorelease];
OFMutableDictionary *newHeaders =
[[headers mutableCopy] autorelease];
if (![newURI.host isEqual: URI.host])
if (![newIRI.host isEqual: IRI.host])
[newHeaders removeObjectForKey: @"Host"];
/*
* 303 means the request should be converted to a GET
* request before redirection. This also means stripping
* the entity of the request.
*/
|
︙ | | |
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
|
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
|
-
+
|
[key hasPrefix: @"Transfer-"])
[newHeaders
removeObjectForKey: key];
newRequest.method = OFHTTPRequestMethodGet;
}
newRequest.URI = newURI;
newRequest.IRI = newIRI;
newRequest.headers = newHeaders;
_client->_inProgress = false;
[_client asyncPerformRequest: newRequest
redirects: _redirects - 1];
return;
|
︙ | | |
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
|
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
|
-
+
-
+
-
+
|
if ([_client->_delegate respondsToSelector:
@selector(client:didCreateTCPSocket:request:)])
[_client->_delegate client: _client
didCreateTCPSocket: sock
request: _request];
if ([_request.URI.scheme caseInsensitiveCompare: @"https"] ==
if ([_request.IRI.scheme caseInsensitiveCompare: @"https"] ==
OFOrderedSame) {
OFTLSStream *stream;
@try {
stream = [OFTLSStream streamWithStream: sock];
} @catch (OFNotImplementedException *e) {
[self raiseException:
[OFUnsupportedProtocolException
exceptionWithURI: _request.URI]];
exceptionWithIRI: _request.IRI]];
return;
}
if ([_client->_delegate respondsToSelector:
@selector(client:didCreateTLSStream:request:)])
[_client->_delegate client: _client
didCreateTLSStream: stream
request: _request];
stream.delegate = self;
[stream asyncPerformClientHandshakeWithHost: _request.URI.host];
[stream asyncPerformClientHandshakeWithHost: _request.IRI.host];
} else {
sock.delegate = self;
[self performSelector: @selector(handleStream:)
withObject: sock
afterDelay: 0];
}
}
|
︙ | | |
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
|
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
|
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
|
[self performSelector: @selector(handleStream:)
withObject: stream
afterDelay: 0];
}
- (void)start
{
OFURI *URI = _request.URI;
OFIRI *IRI = _request.IRI;
OFStream *stream;
/* Can we reuse the last socket? */
if (_client->_stream != nil && !_client->_stream.atEndOfStream &&
[_client->_lastURI.scheme isEqual: URI.scheme] &&
[_client->_lastURI.host isEqual: URI.host] &&
(_client->_lastURI.port == URI.port ||
[_client->_lastURI.port isEqual: URI.port]) &&
[_client->_lastIRI.scheme isEqual: IRI.scheme] &&
[_client->_lastIRI.host isEqual: IRI.host] &&
(_client->_lastIRI.port == IRI.port ||
[_client->_lastIRI.port isEqual: IRI.port]) &&
(_client->_lastWasHEAD || _client->_lastResponse.atEndOfStream)) {
/*
* Set _stream to nil, so that in case of an error it won't be
* reused. If everything is successful, we set _stream again
* at the end.
*/
stream = [_client->_stream autorelease];
_client->_stream = nil;
[_client->_lastURI release];
_client->_lastURI = nil;
[_client->_lastIRI release];
_client->_lastIRI = nil;
[_client->_lastResponse release];
_client->_lastResponse = nil;
stream.delegate = self;
[self performSelector: @selector(handleStream:)
withObject: stream
afterDelay: 0];
} else
[self closeAndReconnect];
}
- (void)closeAndReconnect
{
@try {
OFURI *URI = _request.URI;
OFIRI *IRI = _request.IRI;
OFTCPSocket *sock;
uint16_t port;
OFNumber *URIPort;
OFNumber *IRIPort;
[_client close];
sock = [OFTCPSocket socket];
if ([URI.scheme caseInsensitiveCompare: @"https"] ==
if ([IRI.scheme caseInsensitiveCompare: @"https"] ==
OFOrderedSame)
port = 443;
else
port = 80;
URIPort = URI.port;
if (URIPort != nil)
port = URIPort.unsignedShortValue;
IRIPort = IRI.port;
if (IRIPort != nil)
port = IRIPort.unsignedShortValue;
sock.delegate = self;
[sock asyncConnectToHost: URI.host port: port];
[sock asyncConnectToHost: IRI.host port: port];
} @catch (id e) {
[self raiseException: e];
}
}
@end
@implementation OFHTTPClientRequestBodyStream
|
︙ | | |
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
|
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
|
-
+
-
+
-
+
|
[_delegate client: client
didReceiveHeaders: headers
statusCode: statusCode
request: request];
}
- (bool)client: (OFHTTPClient *)client
shouldFollowRedirectToURI: (OFURI *)URI
shouldFollowRedirectToIRI: (OFIRI *)IRI
statusCode: (short)statusCode
request: (OFHTTPRequest *)request
response: (OFHTTPResponse *)response
{
if ([_delegate respondsToSelector: @selector(
client:shouldFollowRedirectToURI:statusCode:request:response:)])
client:shouldFollowRedirectToIRI:statusCode:request:response:)])
return [_delegate client: client
shouldFollowRedirectToURI: URI
shouldFollowRedirectToIRI: IRI
statusCode: statusCode
request: request
response: response];
else
return defaultShouldFollow(request.method, statusCode);
}
@end
|
︙ | | |
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
|
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
|
-
-
+
+
-
+
-
-
+
+
|
[self asyncPerformRequest: request redirects: defaultRedirects];
}
- (void)asyncPerformRequest: (OFHTTPRequest *)request
redirects: (unsigned int)redirects
{
void *pool = objc_autoreleasePoolPush();
OFURI *URI = request.URI;
OFString *scheme = URI.scheme;
OFIRI *IRI = request.IRI;
OFString *scheme = IRI.scheme;
if ([scheme caseInsensitiveCompare: @"http"] != OFOrderedSame &&
[scheme caseInsensitiveCompare: @"https"] != OFOrderedSame)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
if (_inProgress)
@throw [OFAlreadyConnectedException exception];
_inProgress = true;
[[[[OFHTTPClientRequestHandler alloc]
initWithClient: self
request: request
redirects: redirects] autorelease] start];
objc_autoreleasePoolPop(pool);
}
- (void)close
{
[_stream release];
_stream = nil;
[_lastURI release];
_lastURI = nil;
[_lastIRI release];
_lastIRI = nil;
[_lastResponse release];
_lastResponse = nil;
}
@end
|
Modified src/OFHTTPCookie.h
from [ff53970b1e]
to [1a38e704ff].
︙ | | |
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
+
-
|
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFArray OF_GENERIC(ObjectType);
@class OFDate;
@class OFDictionary OF_GENERIC(KeyType, ObjectType);
@class OFIRI;
@class OFMutableArray OF_GENERIC(ObjectType);
@class OFURI;
/**
* @class OFHTTPCookie OFHTTPCookie.h ObjFW/OFHTTPCookie.h
*
* @brief A class for storing and manipulating HTTP cookies.
*/
OF_SUBCLASSING_RESTRICTED
|
︙ | | |
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
-
+
-
+
-
+
|
/**
* @brief An array of other attributes.
*/
@property (readonly, nonatomic)
OFMutableArray OF_GENERIC(OFString *) *extensions;
/**
* @brief Parses the specified response header fields for the specified URI and
* @brief Parses the specified response header fields for the specified IRI and
* returns an array of cookies.
*
* @param headerFields The response header fields to parse
* @param URI The URI for the response header fields to parse
* @param IRI The IRI for the response header fields to parse
* @return An array of cookies
* @throw OFInvalidFormatException The specified response header has an invalid
* format
*/
+ (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesWithResponseHeaderFields:
(OFDictionary OF_GENERIC(OFString *, OFString *) *)headerFields
forURI: (OFURI *)URI;
forIRI: (OFIRI *)IRI;
/**
* @brief Returns the request header fields for the specified cookies.
*
* @param cookies The cookies to return the request header fields for
* @return The request header fields for the specified cookies
*/
|
︙ | | |
Modified src/OFHTTPCookie.m
from [a7d6a07918]
to [28c10d1209].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
-
+
|
#include "config.h"
#import "OFHTTPCookie.h"
#import "OFArray.h"
#import "OFDate.h"
#import "OFDictionary.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFInvalidFormatException.h"
static void
handleAttribute(OFHTTPCookie *cookie, OFString *name, OFString *value)
{
OFString *lowercaseName = name.lowercaseString;
|
︙ | | |
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
-
+
-
+
|
@implementation OFHTTPCookie
@synthesize name = _name, value = _value, domain = _domain, path = _path;
@synthesize expires = _expires, secure = _secure, HTTPOnly = _HTTPOnly;
@synthesize extensions = _extensions;
+ (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesWithResponseHeaderFields:
(OFDictionary OF_GENERIC(OFString *, OFString *) *)headerFields
forURI: (OFURI *)URI
forIRI: (OFIRI *)IRI
{
OFMutableArray OF_GENERIC(OFHTTPCookie *) *ret = [OFMutableArray array];
void *pool = objc_autoreleasePoolPush();
OFString *string = [headerFields objectForKey: @"Set-Cookie"];
OFString *domain = URI.host;
OFString *domain = IRI.host;
const OFUnichar *characters = string.characters;
size_t length = string.length, last = 0;
enum {
statePreName,
stateName,
stateExpectValue,
stateValue,
|
︙ | | |
Modified src/OFHTTPCookieManager.h
from [3cc0432376]
to [ade0fe6ddd].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
+
-
|
#import "OFObject.h"
OF_ASSUME_NONNULL_BEGIN
@class OFArray OF_GENERIC(ObjectType);
@class OFHTTPCookie;
@class OFIRI;
@class OFMutableArray OF_GENERIC(ObjectType);
@class OFURI;
/**
* @class OFHTTPCookieManager OFHTTPCookieManager.h ObjFW/OFHTTPCookieManager.h
*
* @brief A class for managing cookies for multiple domains.
*/
OF_SUBCLASSING_RESTRICTED
|
︙ | | |
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
|
* @brief Create a new cookie manager.
*
* @return A new, autoreleased OFHTTPCookieManager
*/
+ (instancetype)manager;
/**
* @brief Adds the specified cookie for the specified URI.
* @brief Adds the specified cookie for the specified IRI.
*
* @warning This modifies the cookie (e.g. it sets the domain if it is unset)!
* If you do not want this, pass a copy!
*
* @param cookie The cookie to add to the manager
* @param URI The URI for which the cookie should be added
* @param IRI The IRI for which the cookie should be added
*/
- (void)addCookie: (OFHTTPCookie *)cookie forURI: (OFURI *)URI;
- (void)addCookie: (OFHTTPCookie *)cookie forIRI: (OFIRI *)IRI;
/**
* @brief Adds the specified cookies for the specified URI.
* @brief Adds the specified cookies for the specified IRI.
*
* @warning This modifies the cookies (e.g. it sets the domain if it is unset)!
* If you do not want this, pass copies!
*
* @param cookies An array of cookies to add to the manager
* @param URI The URI for which the cookies should be added
* @param IRI The IRI for which the cookies should be added
*/
- (void)addCookies: (OFArray OF_GENERIC(OFHTTPCookie *) *)cookies
forURI: (OFURI *)URI;
forIRI: (OFIRI *)IRI;
/**
* @brief Returns the cookies for the specified URI.
* @brief Returns the cookies for the specified IRI.
*
* @param URI The URI for which the cookies should be returned
* @return The cookies for the specified URI
* @param IRI The IRI for which the cookies should be returned
* @return The cookies for the specified IRI
*/
- (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesForURI: (OFURI *)URI;
- (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesForIRI: (OFIRI *)IRI;
/**
* @brief Purges all expired cookies.
*/
- (void)purgeExpiredCookies;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFHTTPCookieManager.m
from [1dd74fe07e]
to [2066a81feb].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
-
+
|
#include "config.h"
#import "OFHTTPCookieManager.h"
#import "OFArray.h"
#import "OFDate.h"
#import "OFHTTPCookie.h"
#import "OFURI.h"
#import "OFIRI.h"
@implementation OFHTTPCookieManager
+ (instancetype)manager
{
return [[[self alloc] init] autorelease];
}
|
︙ | | |
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
-
+
-
+
-
+
-
-
-
+
+
+
-
+
|
}
- (OFArray OF_GENERIC(OFHTTPCookie *) *)cookies
{
return [[_cookies copy] autorelease];
}
- (void)addCookie: (OFHTTPCookie *)cookie forURI: (OFURI *)URI
- (void)addCookie: (OFHTTPCookie *)cookie forIRI: (OFIRI *)IRI
{
void *pool = objc_autoreleasePoolPush();
OFString *cookieDomain, *URIHost;
OFString *cookieDomain, *IRIHost;
size_t i;
if (![cookie.path hasPrefix: @"/"])
cookie.path = @"/";
if (cookie.secure &&
[URI.scheme caseInsensitiveCompare: @"https"] != OFOrderedSame) {
[IRI.scheme caseInsensitiveCompare: @"https"] != OFOrderedSame) {
objc_autoreleasePoolPop(pool);
return;
}
cookieDomain = cookie.domain.lowercaseString;
cookie.domain = cookieDomain;
URIHost = URI.host.lowercaseString;
if (![cookieDomain isEqual: URIHost]) {
URIHost = [@"." stringByAppendingString: URIHost];
IRIHost = IRI.host.lowercaseString;
if (![cookieDomain isEqual: IRIHost]) {
IRIHost = [@"." stringByAppendingString: IRIHost];
if (![cookieDomain hasSuffix: URIHost]) {
if (![cookieDomain hasSuffix: IRIHost]) {
objc_autoreleasePoolPop(pool);
return;
}
}
i = 0;
for (OFHTTPCookie *iter in _cookies) {
|
︙ | | |
96
97
98
99
100
101
102
103
104
105
106
107
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
|
96
97
98
99
100
101
102
103
104
105
106
107
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
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
[_cookies addObject: cookie];
objc_autoreleasePoolPop(pool);
}
- (void)addCookies: (OFArray OF_GENERIC(OFHTTPCookie *) *)cookies
forURI: (OFURI *)URI
forIRI: (OFIRI *)IRI
{
for (OFHTTPCookie *cookie in cookies)
[self addCookie: cookie forURI: URI];
[self addCookie: cookie forIRI: IRI];
}
- (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesForURI: (OFURI *)URI
- (OFArray OF_GENERIC(OFHTTPCookie *) *)cookiesForIRI: (OFIRI *)IRI
{
OFMutableArray *ret = [OFMutableArray array];
for (OFHTTPCookie *cookie in _cookies) {
void *pool;
OFDate *expires;
OFString *cookieDomain, *URIHost, *cookiePath, *URIPath;
OFString *cookieDomain, *IRIHost, *cookiePath, *IRIPath;
bool match;
expires = cookie.expires;
if (expires != nil && expires.timeIntervalSinceNow <= 0)
continue;
if (cookie.secure && [URI.scheme caseInsensitiveCompare:
if (cookie.secure && [IRI.scheme caseInsensitiveCompare:
@"https"] != OFOrderedSame)
continue;
pool = objc_autoreleasePoolPush();
cookieDomain = cookie.domain.lowercaseString;
URIHost = URI.host.lowercaseString;
IRIHost = IRI.host.lowercaseString;
if ([cookieDomain hasPrefix: @"."]) {
if ([URIHost hasSuffix: cookieDomain])
if ([IRIHost hasSuffix: cookieDomain])
match = true;
else {
cookieDomain =
[cookieDomain substringFromIndex: 1];
match = [cookieDomain isEqual: URIHost];
match = [cookieDomain isEqual: IRIHost];
}
} else
match = [cookieDomain isEqual: URIHost];
match = [cookieDomain isEqual: IRIHost];
if (!match) {
objc_autoreleasePoolPop(pool);
continue;
}
cookiePath = cookie.path;
URIPath = URI.path;
IRIPath = IRI.path;
if (![cookiePath isEqual: @"/"]) {
if ([cookiePath isEqual: URIPath])
if ([cookiePath isEqual: IRIPath])
match = true;
else {
if (![cookiePath hasSuffix: @"/"])
cookiePath = [cookiePath
stringByAppendingString: @"/"];
match = [URIPath hasPrefix: cookiePath];
match = [IRIPath hasPrefix: cookiePath];
}
if (!match) {
objc_autoreleasePoolPop(pool);
continue;
}
}
|
︙ | | |
Renamed and modified
src/OFHTTPURIHandler.h
[1fbd933246]
to src/OFHTTPIRIHandler.h
[66114ba25b].
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
-
+
-
+
|
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFURIHandler.h"
#import "OFIRIHandler.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFHTTPURIHandler: OFURIHandler
@interface OFHTTPIRIHandler: OFIRIHandler
@end
OF_ASSUME_NONNULL_END
|
Renamed and modified
src/OFHTTPURIHandler.m
[9e6fa9d3fe]
to src/OFHTTPIRIHandler.m
[fd9a68dff2].
︙ | | |
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
-
+
-
-
+
+
-
+
|
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFHTTPURIHandler.h"
#import "OFHTTPIRIHandler.h"
#import "OFHTTPClient.h"
#import "OFHTTPRequest.h"
#import "OFHTTPResponse.h"
@implementation OFHTTPURIHandler
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
@implementation OFHTTPIRIHandler
- (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFHTTPClient *client = [OFHTTPClient client];
OFHTTPRequest *request = [OFHTTPRequest requestWithURI: URI];
OFHTTPRequest *request = [OFHTTPRequest requestWithIRI: IRI];
OFHTTPResponse *response = [client performRequest: request];
[response retain];
objc_autoreleasePoolPop(pool);
return [response autorelease];
}
@end
|
Modified src/OFHTTPRequest.h
from [1278addd47]
to [6abdebee2e].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
-
+
-
+
|
#import "OFObject.h"
#import "OFSocket.h"
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFData;
@class OFDictionary OF_GENERIC(KeyType, ObjectType);
@class OFData;
@class OFIRI;
@class OFString;
/** @file */
/**
* @brief The type of an HTTP request.
*/
|
︙ | | |
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
-
+
-
+
-
+
|
* @class OFHTTPRequest OFHTTPRequest.h ObjFW/OFHTTPRequest.h
*
* @brief A class for storing HTTP requests.
*/
OF_SUBCLASSING_RESTRICTED
@interface OFHTTPRequest: OFObject <OFCopying>
{
OFURI *_URI;
OFIRI *_IRI;
OFHTTPRequestMethod _method;
OFHTTPRequestProtocolVersion _protocolVersion;
OFDictionary OF_GENERIC(OFString *, OFString *) *_Nullable _headers;
OFSocketAddress _remoteAddress;
bool _hasRemoteAddress;
}
/**
* @brief The URI of the HTTP request.
* @brief The IRI of the HTTP request.
*/
@property (copy, nonatomic) OFURI *URI;
@property (copy, nonatomic) OFIRI *IRI;
/**
* @brief The protocol version of the HTTP request.
*
* @throw OFUnsupportedVersionException The specified version cannot be set
* because it is not supported
*/
|
︙ | | |
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
|
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
|
-
+
-
+
-
+
-
+
-
+
-
+
|
* @brief The remote address from which the request originates.
*
* @note The setter creates a copy of the remote address.
*/
@property OF_NULLABLE_PROPERTY (nonatomic) const OFSocketAddress *remoteAddress;
/**
* @brief Creates a new OFHTTPRequest with the specified URI.
* @brief Creates a new OFHTTPRequest with the specified IRI.
*
* @param URI The URI for the request
* @param IRI The IRI for the request
* @return A new, autoreleased OFHTTPRequest
*/
+ (instancetype)requestWithURI: (OFURI *)URI;
+ (instancetype)requestWithIRI: (OFIRI *)IRI;
/**
* @brief Initializes an already allocated OFHTTPRequest with the specified URI.
* @brief Initializes an already allocated OFHTTPRequest with the specified IRI.
*
* @param URI The URI for the request
* @param IRI The IRI for the request
* @return An initialized OFHTTPRequest
*/
- (instancetype)initWithURI: (OFURI *)URI;
- (instancetype)initWithIRI: (OFIRI *)IRI;
- (instancetype)init OF_UNAVAILABLE;
@end
#ifdef __cplusplus
extern "C" {
#endif
|
︙ | | |
Modified src/OFHTTPRequest.m
from [c85955ea02]
to [05069741cd].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
-
-
+
+
-
-
+
+
|
*/
#include "config.h"
#include <string.h>
#import "OFHTTPRequest.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFArray.h"
#import "OFData.h"
#import "OFDictionary.h"
#import "OFData.h"
#import "OFArray.h"
#import "OFIRI.h"
#import "OFString.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"
#import "OFUnsupportedVersionException.h"
const char *
|
︙ | | |
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
-
+
-
+
-
+
-
+
-
+
-
+
|
if ([string isEqual: @"CONNECT"])
return OFHTTPRequestMethodConnect;
@throw [OFInvalidFormatException exception];
}
@implementation OFHTTPRequest
@synthesize URI = _URI, method = _method, headers = _headers;
@synthesize IRI = _IRI, method = _method, headers = _headers;
+ (instancetype)requestWithURI: (OFURI *)URI
+ (instancetype)requestWithIRI: (OFIRI *)IRI
{
return [[[self alloc] initWithURI: URI] autorelease];
return [[[self alloc] initWithIRI: IRI] autorelease];
}
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
{
self = [super init];
@try {
_URI = [URI copy];
_IRI = [IRI copy];
_method = OFHTTPRequestMethodGet;
_protocolVersion.major = 1;
_protocolVersion.minor = 1;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[_headers release];
[super dealloc];
}
- (void)setRemoteAddress: (const OFSocketAddress *)remoteAddress
{
|
︙ | | |
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
-
+
|
return &_remoteAddress;
return NULL;
}
- (id)copy
{
OFHTTPRequest *copy = [[OFHTTPRequest alloc] initWithURI: _URI];
OFHTTPRequest *copy = [[OFHTTPRequest alloc] initWithIRI: _IRI];
@try {
copy->_method = _method;
copy->_protocolVersion = _protocolVersion;
copy.headers = _headers;
copy.remoteAddress = self.remoteAddress;
} @catch (id e) {
|
︙ | | |
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
|
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
|
-
+
-
+
|
return false;
request = object;
if (request->_method != _method ||
request->_protocolVersion.major != _protocolVersion.major ||
request->_protocolVersion.minor != _protocolVersion.minor ||
![request->_URI isEqual: _URI] ||
![request->_IRI isEqual: _IRI] ||
![request->_headers isEqual: _headers])
return false;
if (request.remoteAddress != self.remoteAddress &&
!OFSocketAddressEqual(request.remoteAddress, self.remoteAddress))
return false;
return true;
}
- (unsigned long)hash
{
unsigned long hash;
OFHashInit(&hash);
OFHashAddByte(&hash, _method);
OFHashAddByte(&hash, _protocolVersion.major);
OFHashAddByte(&hash, _protocolVersion.minor);
OFHashAddHash(&hash, _URI.hash);
OFHashAddHash(&hash, _IRI.hash);
OFHashAddHash(&hash, _headers.hash);
if (_hasRemoteAddress)
OFHashAddHash(&hash, OFSocketAddressHash(&_remoteAddress));
OFHashFinalize(&hash);
return hash;
|
︙ | | |
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
|
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
|
-
+
-
+
|
if (_hasRemoteAddress)
remoteAddress = OFSocketAddressString(&_remoteAddress);
else
remoteAddress = nil;
ret = [[OFString alloc] initWithFormat:
@"<%@:\n\tURI = %@\n"
@"<%@:\n\tIRI = %@\n"
@"\tMethod = %s\n"
@"\tHeaders = %@\n"
@"\tRemote address = %@\n"
@">",
self.class, _URI, method, indentedHeaders, remoteAddress];
self.class, _IRI, method, indentedHeaders, remoteAddress];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
@end
|
Modified src/OFHTTPServer.m
from [e75cf57b42]
to [cee3752fc6].
︙ | | |
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
+
-
|
#import "OFHTTPServer.h"
#import "OFArray.h"
#import "OFData.h"
#import "OFDate.h"
#import "OFDictionary.h"
#import "OFHTTPRequest.h"
#import "OFHTTPResponse.h"
#import "OFIRI.h"
#import "OFNumber.h"
#import "OFSocket+Private.h"
#import "OFTCPSocket.h"
#import "OFThread.h"
#import "OFTimer.h"
#import "OFURI.h"
#import "OFAlreadyConnectedException.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidEncodingException.h"
#import "OFInvalidFormatException.h"
#import "OFNotOpenException.h"
#import "OFOutOfMemoryException.h"
|
︙ | | |
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
|
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
|
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
|
date, _server.name];
return false;
}
- (void)createResponse
{
void *pool = objc_autoreleasePoolPush();
OFMutableURI *URI;
OFMutableIRI *IRI;
OFHTTPRequest *request;
OFHTTPServerResponse *response;
size_t pos;
[_timer invalidate];
[_timer release];
_timer = nil;
if (_host == nil || _port == 0) {
if (_HTTPMinorVersion > 0) {
[self sendErrorAndClose: 400];
return;
}
[_host release];
_host = [_server.host copy];
_port = [_server port];
}
URI = [OFMutableURI URIWithScheme: @"http"];
URI.host = _host;
IRI = [OFMutableIRI IRIWithScheme: @"http"];
IRI.host = _host;
if (_port != 80)
URI.port = [OFNumber numberWithUnsignedShort: _port];
IRI.port = [OFNumber numberWithUnsignedShort: _port];
@try {
if ((pos = [_path rangeOfString: @"?"].location) !=
OFNotFound) {
OFString *path, *query;
path = [_path substringToIndex: pos];
query = [_path substringFromIndex: pos + 1];
URI.percentEncodedPath = path;
URI.percentEncodedQuery = query;
IRI.percentEncodedPath = path;
IRI.percentEncodedQuery = query;
} else
URI.percentEncodedPath = _path;
IRI.percentEncodedPath = _path;
} @catch (OFInvalidFormatException *e) {
objc_autoreleasePoolPop(pool);
[self sendErrorAndClose: 400];
return;
}
[URI makeImmutable];
[IRI makeImmutable];
request = [OFHTTPRequest requestWithURI: URI];
request = [OFHTTPRequest requestWithIRI: IRI];
request.method = _method;
request.protocolVersion =
(OFHTTPRequestProtocolVersion){ 1, _HTTPMinorVersion };
request.headers = _headers;
request.remoteAddress = _socket.remoteAddress;
response = [[[OFHTTPServerResponse alloc]
|
︙ | | |
Modified src/OFINIFile.h
from [f35fd21473]
to [8921a991d2].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
+
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
#import "OFObject.h"
#import "OFString.h"
#import "OFINICategory.h"
OF_ASSUME_NONNULL_BEGIN
@class OFIRI;
@class OFMutableArray OF_GENERIC(ObjectType);
@class OFURI;
/**
* @class OFINIFile OFINIFile.h ObjFW/OFINIFile.h
*
* @brief A class for reading, creating and modifying INI files.
*/
OF_SUBCLASSING_RESTRICTED
@interface OFINIFile: OFObject
{
OFMutableArray OF_GENERIC(OFINICategory *) *_categories;
}
/**
* @brief All categories in the INI file.
*/
@property (readonly, nonatomic) OFArray OF_GENERIC(OFINICategory *) *categories;
/**
* @brief Creates a new OFINIFile with the contents of the specified file.
*
* @param URI The URI to the file whose contents the OFINIFile should contain
* @param IRI The IRI to the file whose contents the OFINIFile should contain
*
* @return A new, autoreleased OFINIFile with the contents of the specified file
* @throw OFInvalidFormatException The format of the specified INI file is
* invalid
* @throw OFInvalidEncodingException The INI file is not in the specified
* encoding
*/
+ (instancetype)fileWithURI: (OFURI *)URI;
+ (instancetype)fileWithIRI: (OFIRI *)IRI;
/**
* @brief Creates a new OFINIFile with the contents of the specified file in
* the specified encoding.
*
* @param URI The URI to the file whose contents the OFINIFile should contain
* @param IRI The IRI to the file whose contents the OFINIFile should contain
* @param encoding The encoding of the specified file
* @return A new, autoreleased OFINIFile with the contents of the specified file
* @throw OFInvalidFormatException The format of the specified INI file is
* invalid
* @throw OFInvalidEncodingException The INI file is not in the specified
* encoding
*/
+ (instancetype)fileWithURI: (OFURI *)URI encoding: (OFStringEncoding)encoding;
+ (instancetype)fileWithIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding;
- (instancetype)init OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated OFINIFile with the contents of the
* specified file.
*
* @param URI The URI to the file whose contents the OFINIFile should contain
* @param IRI The IRI to the file whose contents the OFINIFile should contain
*
* @return An initialized OFINIFile with the contents of the specified file
* @throw OFInvalidFormatException The format of the specified INI file is
* invalid
* @throw OFInvalidEncodingException The INI file is not in the specified
* encoding
*/
- (instancetype)initWithURI: (OFURI *)URI;
- (instancetype)initWithIRI: (OFIRI *)IRI;
/**
* @brief Initializes an already allocated OFINIFile with the contents of the
* specified file in the specified encoding.
*
* @param URI The URI to the file whose contents the OFINIFile should contain
* @param IRI The IRI to the file whose contents the OFINIFile should contain
* @param encoding The encoding of the specified file
* @return An initialized OFINIFile with the contents of the specified file
* @throw OFInvalidFormatException The format of the specified INI file is
* invalid
* @throw OFInvalidEncodingException The INI file is not in the specified
* encoding
*/
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
encoding: (OFStringEncoding)encoding
OF_DESIGNATED_INITIALIZER;
/**
* @brief Returns an @ref OFINICategory for the category with the specified
* name.
*
* @param name The name of the category for which an @ref OFINICategory should
* be returned
*
* @return An @ref OFINICategory for the category with the specified name
*/
- (OFINICategory *)categoryForName: (OFString *)name;
/**
* @brief Writes the contents of the OFINIFile to a file.
*
* @param URI The URI of the file to write to
* @param IRI The IRI of the file to write to
*/
- (void)writeToURI: (OFURI *)URI;
- (void)writeToIRI: (OFIRI *)IRI;
/**
* @brief Writes the contents of the OFINIFile to a file in the specified
* encoding.
*
* @param URI The URI of the file to write to
* @param IRI The IRI of the file to write to
* @param encoding The encoding to use
*/
- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding;
- (void)writeToIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFINIFile.m
from [7850530cf1]
to [13a67814d9].
︙ | | |
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
#include <errno.h>
#import "OFINIFile.h"
#import "OFArray.h"
#import "OFINICategory+Private.h"
#import "OFINICategory.h"
#import "OFStream.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFStream.h"
#import "OFString.h"
#import "OFInvalidFormatException.h"
#import "OFOpenItemFailedException.h"
OF_DIRECT_MEMBERS
@interface OFINIFile ()
- (void)of_parseURI: (OFURI *)URI encoding: (OFStringEncoding)encoding;
- (void)of_parseIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding;
@end
static bool
isWhitespaceLine(OFString *line)
{
const char *cString = line.UTF8String;
size_t length = line.UTF8StringLength;
for (size_t i = 0; i < length; i++)
if (!OFASCIIIsSpace(cString[i]))
return false;
return true;
}
@implementation OFINIFile
@synthesize categories = _categories;
+ (instancetype)fileWithURI: (OFURI *)URI
+ (instancetype)fileWithIRI: (OFIRI *)IRI
{
return [[[self alloc] initWithURI: URI] autorelease];
return [[[self alloc] initWithIRI: IRI] autorelease];
}
+ (instancetype)fileWithURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
+ (instancetype)fileWithIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
{
return [[[self alloc] initWithURI: URI encoding: encoding] autorelease];
return [[[self alloc] initWithIRI: IRI encoding: encoding] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
{
return [self initWithURI: URI encoding: OFStringEncodingAutodetect];
return [self initWithIRI: IRI encoding: OFStringEncodingAutodetect];
}
- (instancetype)initWithURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
- (instancetype)initWithIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
{
self = [super init];
@try {
_categories = [[OFMutableArray alloc] init];
[self of_parseURI: URI encoding: encoding];
[self of_parseIRI: IRI encoding: encoding];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
|
︙ | | |
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
-
+
-
+
|
[_categories addObject: category];
objc_autoreleasePoolPop(pool);
return category;
}
- (void)of_parseURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
- (void)of_parseIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
{
void *pool = objc_autoreleasePoolPush();
OFStream *file;
OFINICategory *category = nil;
OFString *line;
if (encoding == OFStringEncodingAutodetect)
encoding = OFStringEncodingUTF8;
@try {
file = [OFURIHandler openItemAtURI: URI mode: @"r"];
file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
} @catch (OFOpenItemFailedException *e) {
/* Handle missing file like an empty file */
if (e.errNo == ENOENT)
return;
@throw e;
}
|
︙ | | |
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
-
+
-
+
-
+
-
+
|
[category of_parseLine: line];
}
}
objc_autoreleasePoolPop(pool);
}
- (void)writeToURI: (OFURI *)URI
- (void)writeToIRI: (OFIRI *)IRI
{
[self writeToURI: URI encoding: OFStringEncodingUTF8];
[self writeToIRI: IRI encoding: OFStringEncodingUTF8];
}
- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
- (void)writeToIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
{
void *pool = objc_autoreleasePoolPush();
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"w"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"w"];
bool first = true;
for (OFINICategory *category in _categories)
if ([category of_writeToStream: file
encoding: encoding
first: first])
first = false;
|
︙ | | |
Modified src/OFINIFileSettings.h
from [125e92a3e8]
to [16dd11b5fd].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
-
-
+
+
-
+
|
*/
#import "OFSettings.h"
OF_ASSUME_NONNULL_BEGIN
@class OFINIFile;
@class OFString;
@class OFURI;
@class OFIRI;
@class OFString;
@interface OFINIFileSettings: OFSettings
{
OFURI *_fileURI;
OFIRI *_fileIRI;
OFINIFile *_INIFile;
}
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFINIFileSettings.m
from [b3d1a39e2b]
to [eb953af840].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
-
-
-
+
+
+
-
-
-
+
+
+
-
+
|
*/
#include "config.h"
#import "OFINIFileSettings.h"
#import "OFArray.h"
#import "OFINIFile.h"
#import "OFString.h"
#import "OFSystemInfo.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
#import "OFSystemInfo.h"
@implementation OFINIFileSettings
- (instancetype)initWithApplicationName: (OFString *)applicationName
{
self = [super initWithApplicationName: applicationName];
@try {
void *pool = objc_autoreleasePoolPush();
OFString *fileName;
fileName = [applicationName stringByAppendingString: @".ini"];
_fileURI = [[[OFSystemInfo userConfigURI]
URIByAppendingPathComponent: fileName] copy];
_INIFile = [[OFINIFile alloc] initWithURI: _fileURI];
_fileIRI = [[[OFSystemInfo userConfigIRI]
IRIByAppendingPathComponent: fileName] copy];
_INIFile = [[OFINIFile alloc] initWithIRI: _fileIRI];
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_fileURI release];
[_fileIRI release];
[_INIFile release];
[super dealloc];
}
- (void)of_getCategory: (OFString **)category
andKey: (OFString **)key
|
︙ | | |
239
240
241
242
243
244
245
246
247
248
|
239
240
241
242
243
244
245
246
247
248
|
-
+
|
[[_INIFile categoryForName: category] removeValueForKey: key];
objc_autoreleasePoolPop(pool);
}
- (void)save
{
[_INIFile writeToURI: _fileURI];
[_INIFile writeToIRI: _fileIRI];
}
@end
|
Renamed and modified
src/OFURI+Private.h
[c5dc8bc44b]
to src/OFIRI+Private.h
[739c3df5da].
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
-
+
-
+
|
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFURI.h"
#import "OFIRI.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFURI ()
@interface OFIRI ()
- (instancetype)of_init OF_METHOD_FAMILY(init);
@end
OF_ASSUME_NONNULL_END
|
Renamed and modified
src/OFURI.h
[90c837e175]
to src/OFIRI.h
[4e3a03862f].
︙ | | |
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
|
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
|
@class OFArray OF_GENERIC(ObjectType);
@class OFDictionary OF_GENERIC(KeyType, ObjectType);
@class OFNumber;
@class OFPair OF_GENERIC(FirstType, SecondType);
@class OFString;
/**
* @class OFURI OFURI.h ObjFW/OFURI.h
* @class OFIRI OFIRI.h ObjFW/OFIRI.h
*
* @brief A class for parsing URIs as per RFC 3986 and accessing parts of it.
* @brief A class for parsing IRIs as per RFC 3987 and accessing parts of it.
*/
@interface OFURI: OFObject <OFCopying, OFMutableCopying, OFSerialization>
@interface OFIRI: OFObject <OFCopying, OFMutableCopying, OFSerialization>
{
OFString *_scheme;
OFString *_Nullable _percentEncodedHost;
OFNumber *_Nullable _port;
OFString *_Nullable _percentEncodedUser;
OFString *_Nullable _percentEncodedPassword;
OFString *_percentEncodedPath;
OFString *_Nullable _percentEncodedQuery;
OFString *_Nullable _percentEncodedFragment;
OF_RESERVE_IVARS(OFURI, 4)
OF_RESERVE_IVARS(OFIRI, 4)
}
/**
* @brief The scheme part of the URI.
* @brief The scheme part of the IRI.
*/
@property (readonly, copy, nonatomic) OFString *scheme;
/**
* @brief The host part of the URI.
* @brief The host part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *host;
/**
* @brief The host part of the URI in percent-encoded form.
* @brief The host part of the IRI in percent-encoded form.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
OFString *percentEncodedHost;
/**
* @brief The port part of the URI.
* @brief The port part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFNumber *port;
/**
* @brief The user part of the URI.
* @brief The user part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *user;
/**
* @brief The user part of the URI in percent-encoded form.
* @brief The user part of the IRI in percent-encoded form.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
OFString *percentEncodedUser;
/**
* @brief The password part of the URI.
* @brief The password part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *password;
/**
* @brief The password part of the URI in percent-encoded form.
* @brief The password part of the IRI in percent-encoded form.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
OFString *percentEncodedPassword;
/**
* @brief The path part of the URI.
* @brief The path part of the IRI.
*/
@property (readonly, copy, nonatomic) OFString *path;
/**
* @brief The path part of the URI in percent-encoded form.
* @brief The path part of the IRI in percent-encoded form.
*/
@property (readonly, copy, nonatomic) OFString *percentEncodedPath;
/**
* @brief The path of the URI split into components.
* @brief The path of the IRI split into components.
*
* The first component must always be `/` to designate the root.
*/
@property (readonly, copy, nonatomic)
OFArray OF_GENERIC(OFString *) *pathComponents;
/**
* @brief The last path component of the URI.
* @brief The last path component of the IRI.
*
* Returns the empty string if the path is the root.
*/
@property (readonly, copy, nonatomic) OFString *lastPathComponent;
/**
* @brief The query part of the URI.
* @brief The query part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *query;
/**
* @brief The query part of the URI in percent-encoded form.
* @brief The query part of the IRI in percent-encoded form.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
OFString *percentEncodedQuery;
/**
* @brief The query part of the URI as an array.
* @brief The query part of the IRI as an array.
*
* For example, a query like `key1=value1&key2=value2` would correspond to the
* following array:
*
* @[
* [OFPair pairWithFirstObject: @"key1" secondObject: @"value1"],
* [OFPair pairWithFirstObject: @"key2" secondObject: @"value2"],
* ]
*
* @throw OFInvalidFormatException The query is not in the correct format
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
OFArray OF_GENERIC(OFPair OF_GENERIC(OFString *, OFString *) *) *queryItems;
/**
* @brief The fragment part of the URI.
* @brief The fragment part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *fragment;
/**
* @brief The fragment part of the URI in URI-encoded form.
* @brief The fragment part of the IRI in percent-encoded form.
*/
@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
OFString *percentEncodedFragment;
/**
* @brief The URI as a string.
* @brief The IRI as a string.
*/
@property (readonly, nonatomic) OFString *string;
/**
* @brief The URI with relative subpaths resolved.
* @brief The IRI with relative subpaths resolved.
*/
@property (readonly, nonatomic) OFURI *URIByStandardizingPath;
@property (readonly, nonatomic) OFIRI *IRIByStandardizingPath;
#ifdef OF_HAVE_FILES
/**
* @brief The local file system representation for a file URI.
* @brief The local file system representation for a file IRI.
*
* @note This only exists for URIs with the file scheme and throws an exception
* @note This only exists for IRIs with the file scheme and throws an exception
* otherwise.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic)
OFString *fileSystemRepresentation;
#endif
/**
* @brief Creates a new URI with the specified string.
* @brief Creates a new IRI with the specified string.
*
* @param string A string describing a URI
* @return A new, autoreleased OFURI
* @throw OFInvalidFormatException The specified string is not a valid URI
* @param string A string describing an IRI
* @return A new, autoreleased OFIRI
* @throw OFInvalidFormatException The specified string is not a valid IRI
* string
*/
+ (instancetype)URIWithString: (OFString *)string;
+ (instancetype)IRIWithString: (OFString *)string;
/**
* @brief Creates a new URI with the specified string relative to the
* specified URI.
* @brief Creates a new IRI with the specified string relative to the
* specified IRI.
*
* @param string A string describing a relative or absolute URI
* @param URI An URI to which the string is relative
* @return A new, autoreleased OFURI
* @throw OFInvalidFormatException The specified string is not a valid URI
* @param string A string describing a relative or absolute IRI
* @param IRI An IRI to which the string is relative
* @return A new, autoreleased OFIRI
* @throw OFInvalidFormatException The specified string is not a valid IRI
* string
*/
+ (instancetype)URIWithString: (OFString *)string relativeToURI: (OFURI *)URI;
+ (instancetype)IRIWithString: (OFString *)string relativeToIRI: (OFIRI *)IRI;
#ifdef OF_HAVE_FILES
/**
* @brief Creates a new URI with the specified local file path.
* @brief Creates a new IRI with the specified local file path.
*
* If a directory exists at the specified path, a slash is appended if there is
* no slash yet.
*
* @param path The local file path
* @return A new, autoreleased OFURI
* @return A new, autoreleased OFIRI
* @throw OFInvalidFormatException The specified path is not a valid path
*/
+ (instancetype)fileURIWithPath: (OFString *)path;
+ (instancetype)fileIRIWithPath: (OFString *)path;
/**
* @brief Creates a new URI with the specified local file path.
* @brief Creates a new IRI with the specified local file path.
*
* @param path The local file path
* @param isDirectory Whether the path is a directory, in which case a slash is
* appened if there is no slash yet
* @return An initialized OFURI
* @return An initialized OFIRI
*/
+ (instancetype)fileURIWithPath: (OFString *)path
+ (instancetype)fileIRIWithPath: (OFString *)path
isDirectory: (bool)isDirectory;
#endif
/**
* @brief Initializes an already allocated OFURI with the specified string.
* @brief Initializes an already allocated OFIRI with the specified string.
*
* @param string A string describing a URI
* @return An initialized OFURI
* @throw OFInvalidFormatException The specified string is not a valid URI
* @param string A string describing an IRI
* @return An initialized OFIRI
* @throw OFInvalidFormatException The specified string is not a valid IRI
* string
*/
- (instancetype)initWithString: (OFString *)string;
/**
* @brief Initializes an already allocated OFURI with the specified string and
* relative URI.
* @brief Initializes an already allocated OFIRI with the specified string and
* relative IRI.
*
* @param string A string describing a relative or absolute URI
* @param URI A URI to which the string is relative
* @return An initialized OFURI
* @throw OFInvalidFormatException The specified string is not a valid URI
* @param string A string describing a relative or absolute IRI
* @param IRI An IRI to which the string is relative
* @return An initialized OFIRI
* @throw OFInvalidFormatException The specified string is not a valid IRI
* string
*/
- (instancetype)initWithString: (OFString *)string relativeToURI: (OFURI *)URI;
- (instancetype)initWithString: (OFString *)string relativeToIRI: (OFIRI *)IRI;
#ifdef OF_HAVE_FILES
/**
* @brief Initializes an already allocated OFURI with the specified local file
* @brief Initializes an already allocated OFIRI with the specified local file
* path.
*
* If a directory exists at the specified path, a slash is appended if there is
* no slash yet.
*
* @param path The local file path
* @return An initialized OFURI
* @return An initialized OFIRI
* @throw OFInvalidFormatException The specified path is not a valid path
*/
- (instancetype)initFileURIWithPath: (OFString *)path;
- (instancetype)initFileIRIWithPath: (OFString *)path;
/**
* @brief Initializes an already allocated OFURI with the specified local file
* @brief Initializes an already allocated OFIRI with the specified local file
* path.
*
* @param path The local file path
* @param isDirectory Whether the path is a directory, in which case a slash is
* appened if there is no slash yet
* @return An initialized OFURI
* @return An initialized OFIRI
*/
- (instancetype)initFileURIWithPath: (OFString *)path
- (instancetype)initFileIRIWithPath: (OFString *)path
isDirectory: (bool)isDirectory;
#endif
- (instancetype)init OF_UNAVAILABLE;
/**
* @brief Returns a new URI with the specified path component appended.
* @brief Returns a new IRI with the specified path component appended.
*
* If the URI is a file URI, the file system is queried whether the appended
* If the IRI is a file IRI, the file system is queried whether the appended
* component is a directory.
*
* @param component The path component to append. If it starts with the slash,
* the component is not appended, but replaces the path
* instead.
* @return A new URI with the specified path component appended
* @return A new IRI with the specified path component appended
*/
- (OFURI *)URIByAppendingPathComponent: (OFString *)component;
- (OFIRI *)IRIByAppendingPathComponent: (OFString *)component;
/**
* @brief Returns a new URI with the specified path component appended.
* @brief Returns a new IRI with the specified path component appended.
*
* @param component The path component to append. If it starts with the slash,
* the component is not appended, but replaces the path
* instead.
* @param isDirectory Whether the appended component is a directory, meaning
* that the URI path should have a trailing slash
* @return A new URI with the specified path component appended
* that the IRI path should have a trailing slash
* @return A new IRI with the specified path component appended
*/
- (OFURI *)URIByAppendingPathComponent: (OFString *)component
- (OFIRI *)IRIByAppendingPathComponent: (OFString *)component
isDirectory: (bool)isDirectory;
@end
@interface OFCharacterSet (URICharacterSets)
@interface OFCharacterSet (IRICharacterSets)
#ifdef OF_HAVE_CLASS_PROPERTIES
@property (class, readonly, nonatomic)
OFCharacterSet *URISchemeAllowedCharacterSet;
OFCharacterSet *IRISchemeAllowedCharacterSet;
@property (class, readonly, nonatomic)
OFCharacterSet *URIHostAllowedCharacterSet;
OFCharacterSet *IRIHostAllowedCharacterSet;
@property (class, readonly, nonatomic)
OFCharacterSet *URIUserAllowedCharacterSet;
OFCharacterSet *IRIUserAllowedCharacterSet;
@property (class, readonly, nonatomic)
OFCharacterSet *URIPasswordAllowedCharacterSet;
OFCharacterSet *IRIPasswordAllowedCharacterSet;
@property (class, readonly, nonatomic)
OFCharacterSet *URIPathAllowedCharacterSet;
OFCharacterSet *IRIPathAllowedCharacterSet;
@property (class, readonly, nonatomic)
OFCharacterSet *URIQueryAllowedCharacterSet;
OFCharacterSet *IRIQueryAllowedCharacterSet;
@property (class, readonly, nonatomic)
OFCharacterSet *URIQueryKeyValueAllowedCharacterSet;
OFCharacterSet *IRIQueryKeyValueAllowedCharacterSet;
@property (class, readonly, nonatomic)
OFCharacterSet *URIFragmentAllowedCharacterSet;
OFCharacterSet *IRIFragmentAllowedCharacterSet;
#endif
/**
* @brief Returns the characters allowed in the scheme part of a URI.
* @brief Returns the characters allowed in the scheme part of an IRI.
*
* @return The characters allowed in the scheme part of a URI.
* @return The characters allowed in the scheme part of an IRI.
*/
+ (OFCharacterSet *)URISchemeAllowedCharacterSet;
+ (OFCharacterSet *)IRISchemeAllowedCharacterSet;
/**
* @brief Returns the characters allowed in the host part of a URI.
* @brief Returns the characters allowed in the host part of an IRI.
*
* @return The characters allowed in the host part of a URI.
* @return The characters allowed in the host part of an IRI.
*/
+ (OFCharacterSet *)URIHostAllowedCharacterSet;
+ (OFCharacterSet *)IRIHostAllowedCharacterSet;
/**
* @brief Returns the characters allowed in the user part of a URI.
* @brief Returns the characters allowed in the user part of an IRI.
*
* @return The characters allowed in the user part of a URI.
* @return The characters allowed in the user part of an IRI.
*/
+ (OFCharacterSet *)URIUserAllowedCharacterSet;
+ (OFCharacterSet *)IRIUserAllowedCharacterSet;
/**
* @brief Returns the characters allowed in the password part of a URI.
* @brief Returns the characters allowed in the password part of an IRI.
*
* @return The characters allowed in the password part of a URI.
* @return The characters allowed in the password part of an IRI.
*/
+ (OFCharacterSet *)URIPasswordAllowedCharacterSet;
+ (OFCharacterSet *)IRIPasswordAllowedCharacterSet;
/**
* @brief Returns the characters allowed in the path part of a URI.
* @brief Returns the characters allowed in the path part of an IRI.
*
* @return The characters allowed in the path part of a URI.
* @return The characters allowed in the path part of an IRI.
*/
+ (OFCharacterSet *)URIPathAllowedCharacterSet;
+ (OFCharacterSet *)IRIPathAllowedCharacterSet;
/**
* @brief Returns the characters allowed in the query part of a URI.
* @brief Returns the characters allowed in the query part of an IRI.
*
* @return The characters allowed in the query part of a URI.
* @return The characters allowed in the query part of an IRI.
*/
+ (OFCharacterSet *)URIQueryAllowedCharacterSet;
+ (OFCharacterSet *)IRIQueryAllowedCharacterSet;
/**
* @brief Returns the characters allowed in a key/value in the query part of a
* URI.
* IRI.
*
* @return The characters allowed in a key/value in the query part of a URI.
* @return The characters allowed in a key/value in the query part of an IRI.
*/
+ (OFCharacterSet *)URIQueryKeyValueAllowedCharacterSet;
+ (OFCharacterSet *)IRIQueryKeyValueAllowedCharacterSet;
/**
* @brief Returns the characters allowed in the fragment part of a URI.
* @brief Returns the characters allowed in the fragment part of an IRI.
*
* @return The characters allowed in the fragment part of a URI.
* @return The characters allowed in the fragment part of an IRI.
*/
+ (OFCharacterSet *)URIFragmentAllowedCharacterSet;
+ (OFCharacterSet *)IRIFragmentAllowedCharacterSet;
@end
#ifdef __cplusplus
extern "C" {
#endif
extern bool OFURIIsIPv6Host(OFString *host);
extern void OFURIVerifyIsEscaped(OFString *, OFCharacterSet *, bool);
extern bool OFIRIIsIPv6Host(OFString *host);
extern void OFIRIVerifyIsEscaped(OFString *, OFCharacterSet *, bool);
#ifdef __cplusplus
}
#endif
OF_ASSUME_NONNULL_END
#import "OFMutableURI.h"
#import "OFMutableIRI.h"
|
Renamed and modified
src/OFURI.m
[55c91c5cfd]
to src/OFIRI.m
[24180b8108].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
|
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
#import "OFURI.h"
#import "OFIRI.h"
#import "OFArray.h"
#import "OFDictionary.h"
#ifdef OF_HAVE_FILES
# import "OFFileManager.h"
# import "OFFileURIHandler.h"
# import "OFFileIRIHandler.h"
#endif
#import "OFNumber.h"
#import "OFOnce.h"
#import "OFPair.h"
#import "OFString.h"
#import "OFXMLElement.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfMemoryException.h"
@interface OFURIAllowedCharacterSetBase: OFCharacterSet
@interface OFIRIAllowedCharacterSetBase: OFCharacterSet
@end
@interface OFURIAllowedCharacterSet: OFURIAllowedCharacterSetBase
@interface OFIRIAllowedCharacterSet: OFIRIAllowedCharacterSetBase
@end
@interface OFURISchemeAllowedCharacterSet: OFURIAllowedCharacterSetBase
@interface OFIRISchemeAllowedCharacterSet: OFIRIAllowedCharacterSetBase
@end
@interface OFURIPathAllowedCharacterSet: OFURIAllowedCharacterSetBase
@interface OFIRIPathAllowedCharacterSet: OFIRIAllowedCharacterSetBase
@end
@interface OFURIQueryAllowedCharacterSet: OFURIAllowedCharacterSetBase
@interface OFIRIQueryAllowedCharacterSet: OFIRIAllowedCharacterSetBase
@end
@interface OFURIQueryKeyValueAllowedCharacterSet: OFURIAllowedCharacterSetBase
@interface OFIRIQueryKeyValueAllowedCharacterSet: OFIRIAllowedCharacterSetBase
@end
@interface OFURIFragmentAllowedCharacterSet: OFURIAllowedCharacterSetBase
@interface OFIRIFragmentAllowedCharacterSet: OFIRIAllowedCharacterSetBase
@end
OF_DIRECT_MEMBERS
@interface OFInvertedCharacterSetWithoutPercent: OFCharacterSet
{
OFCharacterSet *_characterSet;
bool (*_characterIsMember)(id, SEL, OFUnichar);
}
- (instancetype)initWithCharacterSet: (OFCharacterSet *)characterSet;
@end
static OFCharacterSet *URIAllowedCharacterSet = nil;
static OFCharacterSet *URISchemeAllowedCharacterSet = nil;
static OFCharacterSet *URIPathAllowedCharacterSet = nil;
static OFCharacterSet *URIQueryAllowedCharacterSet = nil;
static OFCharacterSet *URIQueryKeyValueAllowedCharacterSet = nil;
static OFCharacterSet *URIFragmentAllowedCharacterSet = nil;
static OFCharacterSet *IRIAllowedCharacterSet = nil;
static OFCharacterSet *IRISchemeAllowedCharacterSet = nil;
static OFCharacterSet *IRIPathAllowedCharacterSet = nil;
static OFCharacterSet *IRIQueryAllowedCharacterSet = nil;
static OFCharacterSet *IRIQueryKeyValueAllowedCharacterSet = nil;
static OFCharacterSet *IRIFragmentAllowedCharacterSet = nil;
static OFOnceControl URIAllowedCharacterSetOnce = OFOnceControlInitValue;
static OFOnceControl IRIAllowedCharacterSetOnce = OFOnceControlInitValue;
static void
initURIAllowedCharacterSet(void)
initIRIAllowedCharacterSet(void)
{
URIAllowedCharacterSet = [[OFURIAllowedCharacterSet alloc] init];
IRIAllowedCharacterSet = [[OFIRIAllowedCharacterSet alloc] init];
}
static void
initURISchemeAllowedCharacterSet(void)
initIRISchemeAllowedCharacterSet(void)
{
URISchemeAllowedCharacterSet =
[[OFURISchemeAllowedCharacterSet alloc] init];
IRISchemeAllowedCharacterSet =
[[OFIRISchemeAllowedCharacterSet alloc] init];
}
static void
initURIPathAllowedCharacterSet(void)
initIRIPathAllowedCharacterSet(void)
{
URIPathAllowedCharacterSet =
[[OFURIPathAllowedCharacterSet alloc] init];
IRIPathAllowedCharacterSet =
[[OFIRIPathAllowedCharacterSet alloc] init];
}
static void
initURIQueryAllowedCharacterSet(void)
initIRIQueryAllowedCharacterSet(void)
{
URIQueryAllowedCharacterSet =
[[OFURIQueryAllowedCharacterSet alloc] init];
IRIQueryAllowedCharacterSet =
[[OFIRIQueryAllowedCharacterSet alloc] init];
}
static void
initURIQueryKeyValueAllowedCharacterSet(void)
initIRIQueryKeyValueAllowedCharacterSet(void)
{
URIQueryKeyValueAllowedCharacterSet =
[[OFURIQueryKeyValueAllowedCharacterSet alloc] init];
IRIQueryKeyValueAllowedCharacterSet =
[[OFIRIQueryKeyValueAllowedCharacterSet alloc] init];
}
static void
initURIFragmentAllowedCharacterSet(void)
initIRIFragmentAllowedCharacterSet(void)
{
URIFragmentAllowedCharacterSet =
[[OFURIFragmentAllowedCharacterSet alloc] init];
IRIFragmentAllowedCharacterSet =
[[OFIRIFragmentAllowedCharacterSet alloc] init];
}
bool
OFURIIsIPv6Host(OFString *host)
OFIRIIsIPv6Host(OFString *host)
{
const char *UTF8String = host.UTF8String;
bool hasColon = false;
while (*UTF8String != '\0') {
if (!OFASCIIIsDigit(*UTF8String) && *UTF8String != ':' &&
(*UTF8String < 'a' || *UTF8String > 'f') &&
|
︙ | | |
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
|
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
|
-
+
-
+
|
return true;
if (character >= 0x100000 && character <= 0x10FFFD)
return true;
return false;
}
@implementation OFURIAllowedCharacterSetBase
@implementation OFIRIAllowedCharacterSetBase
- (instancetype)autorelease
{
return self;
}
- (instancetype)retain
{
return self;
}
- (void)release
{
}
- (unsigned int)retainCount
{
return OFMaxRetainCount;
}
@end
@implementation OFURIAllowedCharacterSet
@implementation OFIRIAllowedCharacterSet
- (bool)characterIsMember: (OFUnichar)character
{
if (character < CHAR_MAX && OFASCIIIsAlnum(character))
return true;
if (character > 0x7F)
return !isUnicodePrivate(character);
|
︙ | | |
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
|
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
|
-
+
-
+
|
return true;
default:
return false;
}
}
@end
@implementation OFURISchemeAllowedCharacterSet
@implementation OFIRISchemeAllowedCharacterSet
- (bool)characterIsMember: (OFUnichar)character
{
if (character < CHAR_MAX && OFASCIIIsAlnum(character))
return true;
switch (character) {
case '+':
case '-':
case '.':
return true;
default:
return false;
}
}
@end
@implementation OFURIPathAllowedCharacterSet
@implementation OFIRIPathAllowedCharacterSet
- (bool)characterIsMember: (OFUnichar)character
{
if (character < CHAR_MAX && OFASCIIIsAlnum(character))
return true;
if (character > 0x7F)
return !isUnicodePrivate(character);
|
︙ | | |
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
|
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
|
-
+
|
return true;
default:
return false;
}
}
@end
@implementation OFURIQueryAllowedCharacterSet
@implementation OFIRIQueryAllowedCharacterSet
- (bool)characterIsMember: (OFUnichar)character
{
if (character < CHAR_MAX && OFASCIIIsAlnum(character))
return true;
if (character > 0x7F)
return true;
|
︙ | | |
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
|
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
|
-
+
|
return true;
default:
return false;
}
}
@end
@implementation OFURIQueryKeyValueAllowedCharacterSet
@implementation OFIRIQueryKeyValueAllowedCharacterSet
- (bool)characterIsMember: (OFUnichar)character
{
if (character < CHAR_MAX && OFASCIIIsAlnum(character))
return true;
if (character > 0x7F)
return true;
|
︙ | | |
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
|
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
|
-
+
|
return true;
default:
return false;
}
}
@end
@implementation OFURIFragmentAllowedCharacterSet
@implementation OFIRIFragmentAllowedCharacterSet
- (bool)characterIsMember: (OFUnichar)character
{
if (character < CHAR_MAX && OFASCIIIsAlnum(character))
return true;
if (character > 0x7F)
return !isUnicodePrivate(character);
|
︙ | | |
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
|
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
|
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
-
+
-
+
-
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
|
{
return (character != '%' && !_characterIsMember(_characterSet,
@selector(characterIsMember:), character));
}
@end
void
OFURIVerifyIsEscaped(OFString *string, OFCharacterSet *characterSet,
OFIRIVerifyIsEscaped(OFString *string, OFCharacterSet *characterSet,
bool allowPercent)
{
void *pool = objc_autoreleasePoolPush();
if (allowPercent)
characterSet = [[[OFInvertedCharacterSetWithoutPercent alloc]
initWithCharacterSet: characterSet] autorelease];
else
characterSet = characterSet.invertedSet;
if ([string indexOfCharacterFromSet: characterSet] != OFNotFound)
@throw [OFInvalidFormatException exception];
objc_autoreleasePoolPop(pool);
}
@implementation OFCharacterSet (URICharacterSets)
+ (OFCharacterSet *)URISchemeAllowedCharacterSet
@implementation OFCharacterSet (IRICharacterSets)
+ (OFCharacterSet *)IRISchemeAllowedCharacterSet
{
static OFOnceControl onceControl = OFOnceControlInitValue;
OFOnce(&onceControl, initURISchemeAllowedCharacterSet);
OFOnce(&onceControl, initIRISchemeAllowedCharacterSet);
return URISchemeAllowedCharacterSet;
return IRISchemeAllowedCharacterSet;
}
+ (OFCharacterSet *)URIHostAllowedCharacterSet
+ (OFCharacterSet *)IRIHostAllowedCharacterSet
{
OFOnce(&URIAllowedCharacterSetOnce, initURIAllowedCharacterSet);
OFOnce(&IRIAllowedCharacterSetOnce, initIRIAllowedCharacterSet);
return URIAllowedCharacterSet;
return IRIAllowedCharacterSet;
}
+ (OFCharacterSet *)URIUserAllowedCharacterSet
+ (OFCharacterSet *)IRIUserAllowedCharacterSet
{
OFOnce(&URIAllowedCharacterSetOnce, initURIAllowedCharacterSet);
OFOnce(&IRIAllowedCharacterSetOnce, initIRIAllowedCharacterSet);
return URIAllowedCharacterSet;
return IRIAllowedCharacterSet;
}
+ (OFCharacterSet *)URIPasswordAllowedCharacterSet
+ (OFCharacterSet *)IRIPasswordAllowedCharacterSet
{
OFOnce(&URIAllowedCharacterSetOnce, initURIAllowedCharacterSet);
OFOnce(&IRIAllowedCharacterSetOnce, initIRIAllowedCharacterSet);
return URIAllowedCharacterSet;
return IRIAllowedCharacterSet;
}
+ (OFCharacterSet *)URIPathAllowedCharacterSet
+ (OFCharacterSet *)IRIPathAllowedCharacterSet
{
static OFOnceControl onceControl = OFOnceControlInitValue;
OFOnce(&onceControl, initURIPathAllowedCharacterSet);
OFOnce(&onceControl, initIRIPathAllowedCharacterSet);
return URIPathAllowedCharacterSet;
return IRIPathAllowedCharacterSet;
}
+ (OFCharacterSet *)URIQueryAllowedCharacterSet
+ (OFCharacterSet *)IRIQueryAllowedCharacterSet
{
static OFOnceControl onceControl = OFOnceControlInitValue;
OFOnce(&onceControl, initURIQueryAllowedCharacterSet);
OFOnce(&onceControl, initIRIQueryAllowedCharacterSet);
return URIQueryAllowedCharacterSet;
return IRIQueryAllowedCharacterSet;
}
+ (OFCharacterSet *)URIQueryKeyValueAllowedCharacterSet
+ (OFCharacterSet *)IRIQueryKeyValueAllowedCharacterSet
{
static OFOnceControl onceControl = OFOnceControlInitValue;
OFOnce(&onceControl, initURIQueryKeyValueAllowedCharacterSet);
OFOnce(&onceControl, initIRIQueryKeyValueAllowedCharacterSet);
return URIQueryKeyValueAllowedCharacterSet;
return IRIQueryKeyValueAllowedCharacterSet;
}
+ (OFCharacterSet *)URIFragmentAllowedCharacterSet
+ (OFCharacterSet *)IRIFragmentAllowedCharacterSet
{
static OFOnceControl onceControl = OFOnceControlInitValue;
OFOnce(&onceControl, initURIFragmentAllowedCharacterSet);
OFOnce(&onceControl, initIRIFragmentAllowedCharacterSet);
return URIFragmentAllowedCharacterSet;
return IRIFragmentAllowedCharacterSet;
}
@end
@implementation OFURI
+ (instancetype)URI
@implementation OFIRI
+ (instancetype)IRI
{
return [[[self alloc] init] autorelease];
}
+ (instancetype)URIWithString: (OFString *)string
+ (instancetype)IRIWithString: (OFString *)string
{
return [[[self alloc] initWithString: string] autorelease];
}
+ (instancetype)URIWithString: (OFString *)string
+ (instancetype)IRIWithString: (OFString *)string relativeToIRI: (OFIRI *)IRI
relativeToURI: (OFURI *)URI
{
return [[[self alloc] initWithString: string
relativeToURI: URI] autorelease];
relativeToIRI: IRI] autorelease];
}
#ifdef OF_HAVE_FILES
+ (instancetype)fileURIWithPath: (OFString *)path
+ (instancetype)fileIRIWithPath: (OFString *)path
{
return [[[self alloc] initFileURIWithPath: path] autorelease];
return [[[self alloc] initFileIRIWithPath: path] autorelease];
}
+ (instancetype)fileURIWithPath: (OFString *)path
isDirectory: (bool)isDirectory
+ (instancetype)fileIRIWithPath: (OFString *)path isDirectory: (bool)isDirectory
{
return [[[self alloc] initFileURIWithPath: path
return [[[self alloc] initFileIRIWithPath: path
isDirectory: isDirectory] autorelease];
}
#endif
static void
parseUserInfo(OFURI *self, const char *UTF8String, size_t length)
parseUserInfo(OFIRI *self, const char *UTF8String, size_t length)
{
const char *colon;
if ((colon = memchr(UTF8String, ':', length)) != NULL) {
self->_percentEncodedUser = [[OFString alloc]
initWithUTF8String: UTF8String
length: colon - UTF8String];
self->_percentEncodedPassword = [[OFString alloc]
initWithUTF8String: colon + 1
length: length - (colon - UTF8String) - 1];
OFURIVerifyIsEscaped(self->_percentEncodedPassword,
[OFCharacterSet URIPasswordAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(self->_percentEncodedPassword,
[OFCharacterSet IRIPasswordAllowedCharacterSet], true);
} else
self->_percentEncodedUser = [[OFString alloc]
initWithUTF8String: UTF8String
length: length];
OFURIVerifyIsEscaped(self->_percentEncodedUser,
[OFCharacterSet URIUserAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(self->_percentEncodedUser,
[OFCharacterSet IRIUserAllowedCharacterSet], true);
}
static void
parseHostPort(OFURI *self, const char *UTF8String, size_t length)
parseHostPort(OFIRI *self, const char *UTF8String, size_t length)
{
OFString *portString;
if (*UTF8String == '[') {
const char *end = memchr(UTF8String, ']', length);
if (end == NULL)
|
︙ | | |
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
|
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
|
-
-
+
+
|
initWithUTF8String: UTF8String
length: length];
UTF8String += length;
length = 0;
}
OFURIVerifyIsEscaped(self->_percentEncodedHost,
[OFCharacterSet URIHostAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(self->_percentEncodedHost,
[OFCharacterSet IRIHostAllowedCharacterSet], true);
}
if (length == 0)
return;
if (length <= 1 || *UTF8String != ':')
@throw [OFInvalidFormatException exception];
|
︙ | | |
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
|
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
|
-
+
|
@throw [OFInvalidFormatException exception];
self->_port = [[OFNumber alloc] initWithUnsignedShort:
(unsigned short)portString.unsignedLongLongValue];
}
static size_t
parseAuthority(OFURI *self, const char *UTF8String, size_t length)
parseAuthority(OFIRI *self, const char *UTF8String, size_t length)
{
size_t ret;
const char *slash, *at;
if ((slash = memchr(UTF8String, '/', length)) != NULL)
length = slash - UTF8String;
|
︙ | | |
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
|
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
|
-
-
+
+
-
-
+
+
-
-
+
+
|
const char *fragment, *query;
if ((fragment = memchr(UTF8String, '#', length)) != NULL) {
*fragmentString = [OFString
stringWithUTF8String: fragment + 1
length: length - (fragment - UTF8String) - 1];
OFURIVerifyIsEscaped(*fragmentString,
[OFCharacterSet URIQueryAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(*fragmentString,
[OFCharacterSet IRIQueryAllowedCharacterSet], true);
length = fragment - UTF8String;
}
if ((query = memchr(UTF8String, '?', length)) != NULL) {
*queryString = [OFString
stringWithUTF8String: query + 1
length: length - (query - UTF8String) - 1];
OFURIVerifyIsEscaped(*queryString,
[OFCharacterSet URIFragmentAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(*queryString,
[OFCharacterSet IRIFragmentAllowedCharacterSet], true);
length = query - UTF8String;
}
*pathString = [OFString stringWithUTF8String: UTF8String
length: length];
OFURIVerifyIsEscaped(*pathString,
[OFCharacterSet URIPathAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(*pathString,
[OFCharacterSet IRIPathAllowedCharacterSet], true);
}
- (instancetype)initWithString: (OFString *)string
{
self = [super init];
@try {
|
︙ | | |
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
|
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
|
-
-
+
+
|
colon - UTF8String < 1 || !OFASCIIIsAlpha(UTF8String[0]))
@throw [OFInvalidFormatException exception];
_scheme = [[[OFString stringWithUTF8String: UTF8String
length: colon - UTF8String]
lowercaseString] copy];
OFURIVerifyIsEscaped(_scheme,
[OFCharacterSet URISchemeAllowedCharacterSet], false);
OFIRIVerifyIsEscaped(_scheme,
[OFCharacterSet IRISchemeAllowedCharacterSet], false);
length -= colon - UTF8String + 1;
UTF8String = colon + 1;
if (length >= 2 && UTF8String[0] == '/' &&
UTF8String[1] == '/') {
size_t authorityLength;
|
︙ | | |
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
|
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
|
-
+
|
else
[components replaceObjectAtIndex: components.count - 1
withObject: path];
return [components componentsJoinedByString: @"/"];
}
- (instancetype)initWithString: (OFString *)string relativeToURI: (OFURI *)URI
- (instancetype)initWithString: (OFString *)string relativeToIRI: (OFIRI *)IRI
{
bool absolute;
@try {
absolute = isAbsolute(string);
} @catch (id e) {
[self release];
|
︙ | | |
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
|
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
|
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
@try {
void *pool = objc_autoreleasePoolPush();
const char *UTF8String = string.UTF8String;
size_t length = string.UTF8StringLength;
bool hasAuthority = false;
OFString *path, *query = nil, *fragment = nil;
_scheme = [URI->_scheme copy];
_scheme = [IRI->_scheme copy];
if (length >= 2 && UTF8String[0] == '/' &&
UTF8String[1] == '/') {
size_t authorityLength;
hasAuthority = true;
UTF8String += 2;
length -= 2;
authorityLength = parseAuthority(self,
UTF8String, length);
UTF8String += authorityLength;
length -= authorityLength;
if (length > 0)
OFEnsure(UTF8String[0] == '/');
} else {
_percentEncodedHost = [URI->_percentEncodedHost copy];
_port = [URI->_port copy];
_percentEncodedUser = [URI->_percentEncodedUser copy];
_percentEncodedHost = [IRI->_percentEncodedHost copy];
_port = [IRI->_port copy];
_percentEncodedUser = [IRI->_percentEncodedUser copy];
_percentEncodedPassword =
[URI->_percentEncodedPassword copy];
[IRI->_percentEncodedPassword copy];
}
parsePathQueryFragment(UTF8String, length,
&path, &query, &fragment);
_percentEncodedFragment = [fragment copy];
if (hasAuthority) {
_percentEncodedPath = [path copy];
_percentEncodedQuery = [query copy];
} else {
if (path.length == 0) {
_percentEncodedPath =
[URI->_percentEncodedPath copy];
[IRI->_percentEncodedPath copy];
_percentEncodedQuery = (query != nil
? [query copy]
: [URI->_percentEncodedQuery copy]);
: [IRI->_percentEncodedQuery copy]);
} else {
if ([path hasPrefix: @"/"])
_percentEncodedPath = [path copy];
else
_percentEncodedPath = [merge(
URI->_percentEncodedPath, path)
IRI->_percentEncodedPath, path)
copy];
_percentEncodedQuery = [query copy];
}
}
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
#ifdef OF_HAVE_FILES
- (instancetype)initFileURIWithPath: (OFString *)path
- (instancetype)initFileIRIWithPath: (OFString *)path
{
bool isDirectory;
@try {
void *pool = objc_autoreleasePoolPush();
isDirectory = [path of_isDirectoryPath];
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;
}
self = [self initFileURIWithPath: path isDirectory: isDirectory];
self = [self initFileIRIWithPath: path isDirectory: isDirectory];
return self;
}
- (instancetype)initFileURIWithPath: (OFString *)path
- (instancetype)initFileIRIWithPath: (OFString *)path
isDirectory: (bool)isDirectory
{
self = [super init];
@try {
void *pool = objc_autoreleasePoolPush();
OFString *percentEncodedHost = nil;
if (!path.absolutePath) {
OFString *currentDirectoryPath = [OFFileManager
defaultManager].currentDirectoryPath;
path = [currentDirectoryPath
stringByAppendingPathComponent: path];
path = path.stringByStandardizingPath;
}
path = [path of_pathToURIPathWithPercentEncodedHost:
path = [path of_pathToIRIPathWithPercentEncodedHost:
&percentEncodedHost];
_percentEncodedHost = [percentEncodedHost copy];
if (isDirectory && ![path hasSuffix: @"/"])
path = [path stringByAppendingString: @"/"];
_scheme = @"file";
_percentEncodedPath = [[path
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIPathAllowedCharacterSet]] copy];
[OFCharacterSet IRIPathAllowedCharacterSet]] copy];
objc_autoreleasePoolPop(pool);
} @catch (id e) {
[self release];
@throw e;
}
|
︙ | | |
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
|
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
|
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
|
[_percentEncodedFragment release];
[super dealloc];
}
- (bool)isEqual: (id)object
{
OFURI *URI;
OFIRI *IRI;
if (object == self)
return true;
if (![object isKindOfClass: [OFURI class]])
if (![object isKindOfClass: [OFIRI class]])
return false;
URI = object;
IRI = object;
if (![URI->_scheme isEqual: _scheme])
if (![IRI->_scheme isEqual: _scheme])
return false;
if (URI->_percentEncodedHost != _percentEncodedHost &&
![URI->_percentEncodedHost isEqual: _percentEncodedHost])
if (IRI->_percentEncodedHost != _percentEncodedHost &&
![IRI->_percentEncodedHost isEqual: _percentEncodedHost])
return false;
if (URI->_port != _port && ![URI->_port isEqual: _port])
if (IRI->_port != _port && ![IRI->_port isEqual: _port])
return false;
if (URI->_percentEncodedUser != _percentEncodedUser &&
![URI->_percentEncodedUser isEqual: _percentEncodedUser])
if (IRI->_percentEncodedUser != _percentEncodedUser &&
![IRI->_percentEncodedUser isEqual: _percentEncodedUser])
return false;
if (URI->_percentEncodedPassword != _percentEncodedPassword &&
![URI->_percentEncodedPassword isEqual: _percentEncodedPassword])
if (IRI->_percentEncodedPassword != _percentEncodedPassword &&
![IRI->_percentEncodedPassword isEqual: _percentEncodedPassword])
return false;
if (![URI->_percentEncodedPath isEqual: _percentEncodedPath])
if (![IRI->_percentEncodedPath isEqual: _percentEncodedPath])
return false;
if (URI->_percentEncodedQuery != _percentEncodedQuery &&
![URI->_percentEncodedQuery isEqual: _percentEncodedQuery])
if (IRI->_percentEncodedQuery != _percentEncodedQuery &&
![IRI->_percentEncodedQuery isEqual: _percentEncodedQuery])
return false;
if (URI->_percentEncodedFragment != _percentEncodedFragment &&
![URI->_percentEncodedFragment isEqual: _percentEncodedFragment])
if (IRI->_percentEncodedFragment != _percentEncodedFragment &&
![IRI->_percentEncodedFragment isEqual: _percentEncodedFragment])
return false;
return true;
}
- (unsigned long)hash
{
|
︙ | | |
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
|
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
|
-
+
|
- (OFString *)host
{
if ([_percentEncodedHost hasPrefix: @"["] &&
[_percentEncodedHost hasSuffix: @"]"]) {
OFString *host = [_percentEncodedHost substringWithRange:
OFMakeRange(1, _percentEncodedHost.length - 2)];
if (!OFURIIsIPv6Host(host))
if (!OFIRIIsIPv6Host(host))
@throw [OFInvalidArgumentException exception];
return host;
}
return _percentEncodedHost.stringByRemovingPercentEncoding;
}
|
︙ | | |
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
|
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
|
-
+
-
+
|
#endif
OFMutableArray *ret;
size_t count;
#ifdef OF_HAVE_FILES
if (isFile) {
OFString *path = [_percentEncodedPath
of_URIPathToPathWithPercentEncodedHost: nil];
of_IRIPathToPathWithPercentEncodedHost: nil];
ret = [[path.pathComponents mutableCopy] autorelease];
if (![ret.firstObject isEqual: @"/"])
[ret insertObject: @"/" atIndex: 0];
} else
#endif
ret = [[[_percentEncodedPath componentsSeparatedByString: @"/"]
mutableCopy] autorelease];
count = ret.count;
if (count > 0 && [ret.firstObject length] == 0)
[ret replaceObjectAtIndex: 0 withObject: @"/"];
for (size_t i = 0; i < count; i++) {
OFString *component = [ret objectAtIndex: i];
#ifdef OF_HAVE_FILES
if (isFile)
component =
[component of_pathComponentToURIPathComponent];
[component of_pathComponentToIRIPathComponent];
#endif
component = component.stringByRemovingPercentEncoding;
[ret replaceObjectAtIndex: i withObject: component];
}
[ret makeImmutable];
|
︙ | | |
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
|
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
|
-
+
|
- (id)copy
{
return [self retain];
}
- (id)mutableCopy
{
OFURI *copy = [[OFMutableURI alloc] initWithScheme: _scheme];
OFIRI *copy = [[OFMutableIRI alloc] initWithScheme: _scheme];
@try {
copy->_percentEncodedHost = [_percentEncodedHost copy];
copy->_port = [_port copy];
copy->_percentEncodedUser = [_percentEncodedUser copy];
copy->_percentEncodedPassword = [_percentEncodedPassword copy];
copy->_percentEncodedPath = [_percentEncodedPath copy];
|
︙ | | |
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
|
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
|
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
-
+
-
-
-
-
+
+
+
+
|
if (![_scheme isEqual: @"file"])
@throw [OFInvalidArgumentException exception];
if (![_percentEncodedPath hasPrefix: @"/"])
@throw [OFInvalidFormatException exception];
path = [self.path
of_URIPathToPathWithPercentEncodedHost: _percentEncodedHost];
of_IRIPathToPathWithPercentEncodedHost: _percentEncodedHost];
[path retain];
objc_autoreleasePoolPop(pool);
return [path autorelease];
}
#endif
- (OFURI *)URIByAppendingPathComponent: (OFString *)component
- (OFIRI *)IRIByAppendingPathComponent: (OFString *)component
{
OFMutableURI *URI = [[self mutableCopy] autorelease];
[URI appendPathComponent: component];
[URI makeImmutable];
return URI;
OFMutableIRI *IRI = [[self mutableCopy] autorelease];
[IRI appendPathComponent: component];
[IRI makeImmutable];
return IRI;
}
- (OFURI *)URIByAppendingPathComponent: (OFString *)component
- (OFIRI *)IRIByAppendingPathComponent: (OFString *)component
isDirectory: (bool)isDirectory
{
OFMutableURI *URI = [[self mutableCopy] autorelease];
[URI appendPathComponent: component isDirectory: isDirectory];
[URI makeImmutable];
return URI;
OFMutableIRI *IRI = [[self mutableCopy] autorelease];
[IRI appendPathComponent: component isDirectory: isDirectory];
[IRI makeImmutable];
return IRI;
}
- (OFURI *)URIByStandardizingPath
- (OFIRI *)IRIByStandardizingPath
{
OFMutableURI *URI = [[self mutableCopy] autorelease];
[URI standardizePath];
[URI makeImmutable];
return URI;
OFMutableIRI *IRI = [[self mutableCopy] autorelease];
[IRI standardizePath];
[IRI makeImmutable];
return IRI;
}
- (OFString *)description
{
return [OFString stringWithFormat: @"<%@: %@>",
self.class, self.string];
}
|
︙ | | |
Renamed and modified
src/OFURIHandler.h
[09864efcca]
to src/OFIRIHandler.h
[dd75369c8f].
︙ | | |
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
#import "OFObject.h"
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFArray OF_GENERIC(ObjectType);
@class OFDate;
@class OFStream;
@class OFURI;
@class OFIRI;
@class OFStream;
/**
* @class OFURIHandler OFURIHandler.h ObjFW/OFURIHandler.h
* @class OFIRIHandler OFIRIHandler.h ObjFW/OFIRIHandler.h
*
* @brief A handler for a URI scheme.
* @brief A handler for an IRI scheme.
*/
@interface OFURIHandler: OFObject
@interface OFIRIHandler: OFObject
{
OFString *_scheme;
OF_RESERVE_IVARS(OFURIHandler, 4)
OF_RESERVE_IVARS(OFIRIHandler, 4)
}
/**
* @brief The scheme this OFURIHandler handles.
* @brief The scheme this OFIRIHandler handles.
*/
@property (readonly, nonatomic) OFString *scheme;
/**
* @brief Registers the specified class as the handler for the specified scheme.
*
* If the same class is specified for two schemes, one instance of it is
* created per scheme.
*
* @param class_ The class to register as the handler for the specified scheme
* @param scheme The scheme for which to register the handler
* @return Whether the class was successfully registered. If a handler for the
* same scheme is already registered, registration fails.
*/
+ (bool)registerClass: (Class)class_ forScheme: (OFString *)scheme;
/**
* @brief Returns the handler for the specified URI.
* @brief Returns the handler for the specified IRI.
*
* @return The handler for the specified URI.
* @throw OFUnsupportedProtocolException The specified URI is not supported
* @return The handler for the specified IRI.
* @throw OFUnsupportedProtocolException The specified IRI is not supported
*/
+ (OFURIHandler *)handlerForURI: (OFURI *)URI;
+ (OFIRIHandler *)handlerForIRI: (OFIRI *)IRI;
/**
* @brief Opens the item at the specified URI.
* @brief Opens the item at the specified IRI.
*
* @param URI The URI of the item which should be opened
* @param IRI The IRI of the item which should be opened
* @param mode The mode in which the file should be opened.@n
* Possible modes are:
* @n
* Mode | Description
* ---------------|-------------------------------------
* `r` | Read-only
* `r+` | Read-write
* `w` | Write-only, create or truncate
* `wx` | Write-only, create or fail, exclusive
* `w+` | Read-write, create or truncate
* `w+x` | Read-write, create or fail, exclusive
* `a` | Write-only, create or append
* `a+` | Read-write, create or append
* @n
* The handler is allowed to not implement all modes and is also
* allowed to implement additional, scheme-specific modes.
* @return The opened stream if it was successfully opened
* @throw OFOpenItemFailedException Opening the item failed
* @throw OFUnsupportedProtocolException The specified URI is not supported
* @throw OFUnsupportedProtocolException The specified IRI is not supported
*/
+ (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode;
+ (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode;
- (instancetype)init OF_UNAVAILABLE;
/**
* @brief Initializes the handler for the specified scheme.
*
* @param scheme The scheme to initialize for
* @return An initialized URI handler
* @return An initialized IRI handler
*/
- (instancetype)initWithScheme: (OFString *)scheme OF_DESIGNATED_INITIALIZER;
/**
* @brief Opens the item at the specified URI.
* @brief Opens the item at the specified IRI.
*
* @param URI The URI of the item which should be opened
* @param IRI The IRI of the item which should be opened
* @param mode The mode in which the file should be opened.@n
* Possible modes are:
* @n
* Mode | Description
* ---------------|-------------------------------------
* `r` | Read-only
* `r+` | Read-write
* `w` | Write-only, create or truncate
* `wx` | Write-only, create or fail, exclusive
* `w+` | Read-write, create or truncate
* `w+x` | Read-write, create or fail, exclusive
* `a` | Write-only, create or append
* `a+` | Read-write, create or append
* @n
* The handler is allowed to not implement all modes and is also
* allowed to implement additional, scheme-specific modes.
* @return The opened stream if it was successfully opened
* @throw OFOpenItemFailedException Opening the item failed
* @throw OFUnsupportedProtocolException The specified URI is not supported by
* @throw OFUnsupportedProtocolException The specified IRI is not supported by
* the handler
*/
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode;
- (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode;
/**
* @brief Returns the attributes for the item at the specified URI.
* @brief Returns the attributes for the item at the specified IRI.
*
* @param URI The URI to return the attributes for
* @return A dictionary of attributes for the specified URI, with the keys of
* @param IRI The IRI to return the attributes for
* @return A dictionary of attributes for the specified IRI, with the keys of
* type @ref OFFileAttributeKey
*/
- (OFFileAttributes)attributesOfItemAtURI: (OFURI *)URI;
- (OFFileAttributes)attributesOfItemAtIRI: (OFIRI *)IRI;
/**
* @brief Sets the attributes for the item at the specified URI.
* @brief Sets the attributes for the item at the specified IRI.
*
* All attributes not part of the dictionary are left unchanged.
*
* @param attributes The attributes to set for the specified URI
* @param URI The URI of the item to set the attributes for
* @param attributes The attributes to set for the specified IRI
* @param IRI The IRI of the item to set the attributes for
*/
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURI: (OFURI *)URI;
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtIRI: (OFIRI *)IRI;
/**
* @brief Checks whether a file exists at the specified URI.
* @brief Checks whether a file exists at the specified IRI.
*
* @param URI The URI to check
* @return A boolean whether there is a file at the specified URI
* @param IRI The IRI to check
* @return A boolean whether there is a file at the specified IRI
*/
- (bool)fileExistsAtURI: (OFURI *)URI;
- (bool)fileExistsAtIRI: (OFIRI *)IRI;
/**
* @brief Checks whether a directory exists at the specified URI.
* @brief Checks whether a directory exists at the specified IRI.
*
* @param URI The URI to check
* @return A boolean whether there is a directory at the specified URI
* @param IRI The IRI to check
* @return A boolean whether there is a directory at the specified IRI
*/
- (bool)directoryExistsAtURI: (OFURI *)URI;
- (bool)directoryExistsAtIRI: (OFIRI *)IRI;
/**
* @brief Creates a directory at the specified URI.
* @brief Creates a directory at the specified IRI.
*
* @param URI The URI of the directory to create
* @param IRI The IRI of the directory to create
*/
- (void)createDirectoryAtURI: (OFURI *)URI;
- (void)createDirectoryAtIRI: (OFIRI *)IRI;
/**
* @brief Returns an array with the URIs of the items in the specified
* @brief Returns an array with the IRIs of the items in the specified
* directory.
*
* @note `.` and `..` are not part of the returned array.
*
* @param URI The URI to the directory whose items should be returned
* @return An array with the URIs of the items in the specified directory
* @param IRI The IRI to the directory whose items should be returned
* @return An array with the IRIs of the items in the specified directory
*/
- (OFArray OF_GENERIC(OFURI *) *)contentsOfDirectoryAtURI: (OFURI *)URI;
- (OFArray OF_GENERIC(OFIRI *) *)contentsOfDirectoryAtIRI: (OFIRI *)IRI;
/**
* @brief Removes the item at the specified URI.
* @brief Removes the item at the specified IRI.
*
* If the item at the specified URI is a directory, it is removed recursively.
* If the item at the specified IRI is a directory, it is removed recursively.
*
* @param URI The URI to the item which should be removed
* @param IRI The IRI to the item which should be removed
*/
- (void)removeItemAtURI: (OFURI *)URI;
- (void)removeItemAtIRI: (OFIRI *)IRI;
/**
* @brief Creates a hard link for the specified item.
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* This method is not available for all URIs.
* This method is not available for all IRIs.
*
* @param source The URI to the item for which a link should be created
* @param destination The URI to the item which should link to the source
* @param source The IRI to the item for which a link should be created
* @param destination The IRI to the item which should link to the source
*/
- (void)linkItemAtURI: (OFURI *)source toURI: (OFURI *)destination;
- (void)linkItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination;
/**
* @brief Creates a symbolic link for an item.
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* This method is not available for all URIs.
* This method is not available for all IRIs.
*
* @note On Windows, this requires at least Windows Vista and administrator
* privileges!
*
* @param URI The URI to the item which should symbolically link to the target
* @param IRI The IRI to the item which should symbolically link to the target
* @param target The target of the symbolic link
*/
- (void)createSymbolicLinkAtURI: (OFURI *)URI
- (void)createSymbolicLinkAtIRI: (OFIRI *)IRI
withDestinationPath: (OFString *)target;
/**
* @brief Tries to efficiently copy an item. If a copy would only be possible
* by reading the entire item and then writing it, it returns false.
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* If an item already exists, the copy operation fails. This is also the case
* if a directory is copied and an item already exists in the destination
* directory.
*
* @param source The file, directory or symbolic link to copy
* @param destination The destination URI
* @param destination The destination IRI
* @return True if an efficient copy was performed, false if an efficient copy
* was not possible. Note that errors while performing a copy are
* reported via exceptions and not by returning false!
*/
- (bool)copyItemAtURI: (OFURI *)source toURI: (OFURI *)destination;
- (bool)copyItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination;
/**
* @brief Tries to efficiently move an item. If a move would only be possible
* by copying the source and deleting it, it returns false.
*
* The destination URI must have a full path, which means it must include the
* The destination IRI must have a full path, which means it must include the
* name of the item.
*
* If the destination is on a different logical device or uses a different
* scheme, an efficient move is not possible and false is returned.
*
* @param source The item to rename
* @param destination The new name for the item
* @return True if an efficient move was performed, false if an efficient move
* was not possible. Note that errors while performing a move are
* reported via exceptions and not by returning false!
*/
- (bool)moveItemAtURI: (OFURI *)source toURI: (OFURI *)destination;
- (bool)moveItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination;
@end
OF_ASSUME_NONNULL_END
|
Renamed and modified
src/OFURIHandler.m
[1cc8c8dac2]
to src/OFIRIHandler.m
[6d211d14bb].
︙ | | |
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
|
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
|
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFURIHandler.h"
#import "OFIRIHandler.h"
#import "OFDictionary.h"
#import "OFNumber.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFNumber.h"
#ifdef OF_HAVE_THREADS
# import "OFMutex.h"
#endif
#import "OFArchiveURIHandler.h"
#import "OFEmbeddedURIHandler.h"
#import "OFArchiveIRIHandler.h"
#import "OFEmbeddedIRIHandler.h"
#ifdef OF_HAVE_FILES
# import "OFFileURIHandler.h"
# import "OFFileIRIHandler.h"
#endif
#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
# import "OFHTTPURIHandler.h"
# import "OFHTTPIRIHandler.h"
#endif
#import "OFUnsupportedProtocolException.h"
static OFMutableDictionary OF_GENERIC(OFString *, OFURIHandler *) *handlers;
static OFMutableDictionary OF_GENERIC(OFString *, OFIRIHandler *) *handlers;
#ifdef OF_HAVE_THREADS
static OFMutex *mutex;
static void
releaseMutex(void)
{
[mutex release];
}
#endif
@implementation OFURIHandler
@implementation OFIRIHandler
@synthesize scheme = _scheme;
+ (void)initialize
{
if (self != [OFURIHandler class])
if (self != [OFIRIHandler class])
return;
handlers = [[OFMutableDictionary alloc] init];
#ifdef OF_HAVE_THREADS
mutex = [[OFMutex alloc] init];
atexit(releaseMutex);
#endif
[self registerClass: [OFEmbeddedURIHandler class]
[self registerClass: [OFEmbeddedIRIHandler class]
forScheme: @"embedded"];
#ifdef OF_HAVE_FILES
[self registerClass: [OFFileURIHandler class] forScheme: @"file"];
[self registerClass: [OFFileIRIHandler class] forScheme: @"file"];
#endif
#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
[self registerClass: [OFHTTPURIHandler class] forScheme: @"http"];
[self registerClass: [OFHTTPURIHandler class] forScheme: @"https"];
[self registerClass: [OFHTTPIRIHandler class] forScheme: @"http"];
[self registerClass: [OFHTTPIRIHandler class] forScheme: @"https"];
#endif
[self registerClass: [OFArchiveURIHandler class] forScheme: @"gzip"];
[self registerClass: [OFArchiveURIHandler class] forScheme: @"lha"];
[self registerClass: [OFArchiveURIHandler class] forScheme: @"tar"];
[self registerClass: [OFArchiveURIHandler class] forScheme: @"zip"];
[self registerClass: [OFArchiveIRIHandler class] forScheme: @"gzip"];
[self registerClass: [OFArchiveIRIHandler class] forScheme: @"lha"];
[self registerClass: [OFArchiveIRIHandler class] forScheme: @"tar"];
[self registerClass: [OFArchiveIRIHandler class] forScheme: @"zip"];
}
+ (bool)registerClass: (Class)class forScheme: (OFString *)scheme
{
#ifdef OF_HAVE_THREADS
[mutex lock];
@try {
#endif
OFURIHandler *handler;
OFIRIHandler *handler;
if ([handlers objectForKey: scheme] != nil)
return false;
handler = [[class alloc] initWithScheme: scheme];
@try {
[handlers setObject: handler forKey: scheme];
} @finally {
[handler release];
}
#ifdef OF_HAVE_THREADS
} @finally {
[mutex unlock];
}
#endif
return true;
}
+ (OFURIHandler *)handlerForURI: (OFURI *)URI
+ (OFIRIHandler *)handlerForIRI: (OFIRI *)IRI
{
OF_KINDOF(OFURIHandler *) handler;
OF_KINDOF(OFIRIHandler *) handler;
#ifdef OF_HAVE_THREADS
[mutex lock];
@try {
#endif
handler = [handlers objectForKey: URI.scheme];
handler = [handlers objectForKey: IRI.scheme];
#ifdef OF_HAVE_THREADS
} @finally {
[mutex unlock];
}
#endif
if (handler == nil)
@throw [OFUnsupportedProtocolException exceptionWithURI: URI];
@throw [OFUnsupportedProtocolException exceptionWithIRI: IRI];
return handler;
}
+ (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
+ (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode
{
return [[self handlerForURI: URI] openItemAtURI: URI mode: mode];
return [[self handlerForIRI: IRI] openItemAtIRI: IRI mode: mode];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
|
︙ | | |
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
|
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
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
- (void)dealloc
{
[_scheme release];
[super dealloc];
}
- (OFStream *)openItemAtURI: (OFURI *)URI mode: (OFString *)mode
- (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode
{
OF_UNRECOGNIZED_SELECTOR
}
- (OFFileAttributes)attributesOfItemAtURI: (OFURI *)URI
- (OFFileAttributes)attributesOfItemAtIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtURI: (OFURI *)URI
- (void)setAttributes: (OFFileAttributes)attributes ofItemAtIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (bool)fileExistsAtURI: (OFURI *)URI
- (bool)fileExistsAtIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (bool)directoryExistsAtURI: (OFURI *)URI
- (bool)directoryExistsAtIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)createDirectoryAtURI: (OFURI *)URI
- (void)createDirectoryAtIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (OFArray OF_GENERIC(OFURI *) *)contentsOfDirectoryAtURI: (OFURI *)URI
- (OFArray OF_GENERIC(OFIRI *) *)contentsOfDirectoryAtIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)removeItemAtURI: (OFURI *)URI
- (void)removeItemAtIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)linkItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (void)linkItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)createSymbolicLinkAtURI: (OFURI *)destination
- (void)createSymbolicLinkAtIRI: (OFIRI *)destination
withDestinationPath: (OFString *)source
{
OF_UNRECOGNIZED_SELECTOR
}
- (bool)copyItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (bool)copyItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
return false;
}
- (bool)moveItemAtURI: (OFURI *)source toURI: (OFURI *)destination
- (bool)moveItemAtIRI: (OFIRI *)source toIRI: (OFIRI *)destination
{
return false;
}
@end
|
Modified src/OFLHAArchive.h
from [038ec719a6]
to [c87ed03839].
︙ | | |
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
-
-
+
+
|
#import "OFObject.h"
#import "OFKernelEventObserver.h"
#import "OFLHAArchiveEntry.h"
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFStream;
@class OFURI;
@class OFIRI;
@class OFStream;
/**
* @class OFLHAArchive OFLHAArchive.h ObjFW/OFLHAArchive.h
*
* @brief A class for accessing and manipulating LHA files.
*/
OF_SUBCLASSING_RESTRICTED
|
︙ | | |
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
-
+
-
+
-
-
+
+
-
-
+
+
-
+
|
* @return A new, autoreleased OFLHAArchive
*/
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
/**
* @brief Creates a new OFLHAArchive object with the specified file.
*
* @param URI The URI to the LHA file
* @param IRI The IRI to the LHA file
* @param mode The mode for the LHA file. Valid modes are "r" for reading,
* "w" for creating a new file and "a" for appending to an existing
* archive.
* @return A new, autoreleased OFLHAArchive
*/
+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
/**
* @brief Creates a URI for accessing a the specified file within the specified
* LHA archive.
* @brief Creates an IRI for accessing a the specified file within the
* specified LHA archive.
*
* @param path The path of the file within the archive
* @param URI The URI of the archive
* @return A URI for accessing the specified file within the specified LHA
* @param IRI The IRI of the archive
* @return An IRI for accessing the specified file within the specified LHA
* archive
*/
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
+ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI;
- (instancetype)init OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated OFLHAArchive object with the
* specified stream.
*
|
︙ | | |
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
|
-
+
-
+
|
- (instancetype)initWithStream: (OFStream *)stream
mode: (OFString *)mode OF_DESIGNATED_INITIALIZER;
/**
* @brief Initializes an already allocated OFLHAArchive object with the
* specified file.
*
* @param URI The URI to the LHA file
* @param IRI The IRI to the LHA file
* @param mode The mode for the LHA file. Valid modes are "r" for reading,
* "w" for creating a new file and "a" for appending to an existing
* archive.
* @return An initialized OFLHAArchive
*/
- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode;
- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
/**
* @brief Returns the next entry from the LHA archive or `nil` if all entries
* have been read.
*
* @note This is only available in read mode.
*
|
︙ | | |
Modified src/OFLHAArchive.m
from [9bc5b44666]
to [e14841e9db].
︙ | | |
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
-
+
+
+
-
-
|
#include "config.h"
#include <errno.h>
#import "OFLHAArchive.h"
#import "OFLHAArchiveEntry.h"
#import "OFLHAArchiveEntry+Private.h"
#import "OFArchiveURIHandler.h"
#import "OFArchiveIRIHandler.h"
#import "OFCRC16.h"
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFLHADecompressingStream.h"
#import "OFSeekableStream.h"
#import "OFStream.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFChecksumMismatchException.h"
#import "OFInvalidArgumentException.h"
#import "OFNotImplementedException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFTruncatedDataException.h"
|
︙ | | |
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
|
-
+
-
+
-
+
-
+
|
@synthesize encoding = _encoding;
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream mode: mode] autorelease];
}
+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
return [[[self alloc] initWithURI: URI mode: mode] autorelease];
return [[[self alloc] initWithIRI: IRI mode: mode] autorelease];
}
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
+ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI
{
return OFArchiveURIHandlerURIForFileInArchive(@"lha", path, URI);
return OFArchiveIRIHandlerIRIForFileInArchive(@"lha", path, IRI);
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
|
︙ | | |
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
-
+
-
+
-
+
|
[self release];
@throw e;
}
return self;
}
- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode
- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFStream *stream;
@try {
if ([mode isEqual: @"a"])
stream = [OFURIHandler openItemAtURI: URI mode: @"r+"];
stream = [OFIRIHandler openItemAtIRI: IRI mode: @"r+"];
else
stream = [OFURIHandler openItemAtURI: URI mode: mode];
stream = [OFIRIHandler openItemAtIRI: IRI mode: mode];
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithStream: stream mode: mode];
|
︙ | | |
Modified src/OFLocale.h
from [11147ec893]
to [080cdcf15b].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
-
+
|
*/
#import "OFObject.h"
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/** @file */
/**
* @def OF_LOCALIZED
*
* @brief Returns the localized string for the specified ID with the specified
|
︙ | | |
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
|
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
|
-
+
-
+
-
+
-
+
|
* @return The decimal point of the system's locale
*/
+ (nullable OFString *)decimalSeparator;
/**
* @brief Adds a directory to scan for localizations.
*
* @param URI The URI to the directory to scan for localizations
* @param IRI The IRI to the directory to scan for localizations
*/
+ (void)addLocalizationDirectoryURI: (OFURI *)URI;
+ (void)addLocalizationDirectoryIRI: (OFIRI *)IRI;
/**
* @brief Initializes the current OFLocale.
*
* @warning This sets the locale via `setlocale()`!
*
* @warning You should never call this yourself, except if you do not use
* @ref OFApplication. In this case, you need to allocate exactly one
* instance of OFLocale, which will become the current locale, and
* call this method.
*/
- (instancetype)init;
/**
* @brief Adds a directory to scan for localizations.
*
* @param URI The URI to the directory to scan for localizations
* @param IRI The IRI to the directory to scan for localizations
*/
- (void)addLocalizationDirectoryURI: (OFURI *)URI;
- (void)addLocalizationDirectoryIRI: (OFIRI *)IRI;
/**
* @brief Returns the localized string for the specified ID, using the fallback
* string if it cannot be looked up or is missing.
*
* @note This takes a variadic argument, terminated by `nil`, that consists of
* pairs of variable names and variable values, which will be replaced
|
︙ | | |
Modified src/OFLocale.m
from [552516ebb5]
to [962451e814].
︙ | | |
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
-
-
-
+
+
+
|
#include "config.h"
#include <locale.h>
#import "OFLocale.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFNumber.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFNumber.h"
#import "OFString.h"
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFOpenItemFailedException.h"
#ifdef OF_AMIGAOS
|
︙ | | |
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
|
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
|
-
+
-
+
|
}
+ (OFString *)decimalSeparator
{
return currentLocale.decimalSeparator;
}
+ (void)addLocalizationDirectoryURI: (OFURI *)URI
+ (void)addLocalizationDirectoryIRI: (OFIRI *)IRI
{
[currentLocale addLocalizationDirectoryURI: URI];
[currentLocale addLocalizationDirectoryIRI: IRI];
}
- (instancetype)init
{
self = [super init];
@try {
|
︙ | | |
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
|
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
|
-
+
-
+
-
+
-
+
|
[_countryCode release];
[_decimalSeparator release];
[_localizedStrings release];
[super dealloc];
}
- (void)addLocalizationDirectoryURI: (OFURI *)URI
- (void)addLocalizationDirectoryIRI: (OFIRI *)IRI
{
void *pool;
OFURI *mapURI, *localizationURI;
OFIRI *mapIRI, *localizationIRI;
OFString *languageCode, *countryCode, *localizationFile;
OFDictionary *map;
if (_languageCode == nil)
return;
pool = objc_autoreleasePoolPush();
mapURI = [URI URIByAppendingPathComponent: @"localizations.json"];
mapIRI = [IRI IRIByAppendingPathComponent: @"localizations.json"];
@try {
map = [[OFString stringWithContentsOfURI: mapURI]
map = [[OFString stringWithContentsOfIRI: mapIRI]
objectByParsingJSON];
} @catch (OFOpenItemFailedException *e) {
objc_autoreleasePoolPop(pool);
return;
}
languageCode = _languageCode.lowercaseString;
|
︙ | | |
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
|
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
|
-
+
-
-
+
+
|
objectForKey: @""];
if (localizationFile == nil) {
objc_autoreleasePoolPop(pool);
return;
}
localizationURI = [URI URIByAppendingPathComponent:
localizationIRI = [IRI IRIByAppendingPathComponent:
[localizationFile stringByAppendingString: @".json"]];
[_localizedStrings addObject: [[OFString stringWithContentsOfURI:
localizationURI] objectByParsingJSON]];
[_localizedStrings addObject: [[OFString stringWithContentsOfIRI:
localizationIRI] objectByParsingJSON]];
objc_autoreleasePoolPop(pool);
}
- (OFString *)localizedStringForID: (OFConstantString *)ID
fallback: (id)fallback, ...
{
|
︙ | | |
Modified src/OFMutableData.h
from [23548715da]
to [9e174a6e59].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
-
|
*/
#import "OFData.h"
OF_ASSUME_NONNULL_BEGIN
@class OFString;
@class OFURI;
/**
* @class OFMutableData OFMutableData.h ObjFW/OFMutableData.h
*
* @brief A class for storing and manipulating arbitrary data in an array.
*/
@interface OFMutableData: OFData
|
︙ | | |
Renamed and modified
src/OFMutableURI.h
[9400cfdc05]
to src/OFMutableIRI.h
[c2423fcac4].
︙ | | |
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
|
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
|
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFURI.h"
#import "OFIRI.h"
OF_ASSUME_NONNULL_BEGIN
/**
* @class OFMutableURI OFMutableURI.h ObjFW/OFMutableURI.h
* @class OFMutableIRI OFMutableIRI.h ObjFW/OFMutableIRI.h
*
* @brief A class for parsing URIs as per RFC 3986 and accessing and modifying
* @brief A class for parsing IRIs as per RFC 3987 and accessing and modifying
* parts of it.
*/
@interface OFMutableURI: OFURI
@interface OFMutableIRI: OFIRI
{
OF_RESERVE_IVARS(OFMutableURI, 4)
OF_RESERVE_IVARS(OFMutableIRI, 4)
}
/**
* @brief The scheme part of the URI.
* @brief The scheme part of the IRI.
*
* @throw OFInvalidFormatException The scheme being set is not in the correct
* format
*/
@property (readwrite, copy, nonatomic) OFString *scheme;
/**
* @brief The host part of the URI.
* @brief The host part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *host;
/**
* @brief The host part of the URI in percent-encoded form.
* @brief The host part of the IRI in percent-encoded form.
*
* Setting this retains the original percent-encoding used - if more characters
* than necessary are percent-encoded, it is kept this way.
*
* @throw OFInvalidFormatException The host being set is not in the correct
* format
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
OFString *percentEncodedHost;
/**
* @brief The port part of the URI.
* @brief The port part of the IRI.
*
* @throw OFInvalidArgumentException The port is not valid (e.g. negative or
* too big)
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFNumber *port;
/**
* @brief The user part of the URI.
* @brief The user part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *user;
/**
* @brief The user part of the URI in percent-encoded form.
* @brief The user part of the IRI in percent-encoded form.
*
* Setting this retains the original percent-encoding used - if more characters
* than necessary are percent-encoded, it is kept this way.
*
* @throw OFInvalidFormatException The user being set is not in the correct
* format
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
OFString *percentEncodedUser;
/**
* @brief The password part of the URI.
* @brief The password part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *password;
/**
* @brief The password part of the URI in URI-encoded form.
* @brief The password part of the IRI in percent-encoded form.
*
* Setting this retains the original percent-encoding used - if more characters
* than necessary are percent-encoded, it is kept this way.
*
* @throw OFInvalidFormatException The password being set is not in the correct
* format
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
OFString *percentEncodedPassword;
/**
* @brief The path part of the URI.
* @brief The path part of the IRI.
*/
@property (readwrite, copy, nonatomic) OFString *path;
/**
* @brief The path part of the URI in percent-encoded form.
* @brief The path part of the IRI in percent-encoded form.
*
* Setting this retains the original percent-encoding used - if more characters
* than necessary are percent-encoded, it is kept this way.
*
* @throw OFInvalidFormatException The path being set is not in the correct
* format
*/
@property (readwrite, copy, nonatomic) OFString *percentEncodedPath;
/**
* @brief The path of the URI split into components.
* @brief The path of the IRI split into components.
*
* The first component must always be empty to designate the root.
*
* @throw OFInvalidFormatException The path components being set are not in the
* correct format
*/
@property (readwrite, copy, nonatomic)
OFArray OF_GENERIC(OFString *) *pathComponents;
/**
* @brief The query part of the URI.
* @brief The query part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *query;
/**
* @brief The query part of the URI in percent-encoded form.
* @brief The query part of the IRI in percent-encoded form.
*
* Setting this retains the original percent-encoding used - if more characters
* than necessary are percent-encoded, it is kept this way.
*
* @throw OFInvalidFormatException The query being set is not in the correct
* format
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
OFString *percentEncodedQuery;
/**
* @brief The query part of the URI as an array.
* @brief The query part of the IRI as an array.
*
* For example, a query like `key1=value1&key2=value2` would correspond to the
* following array:
*
* @[
* [OFPair pairWithFirstObject: @"key1" secondObject: @"value1"],
* [OFPair pairWithFirstObject: @"key2" secondObject: @"value2"],
* ]
*
* @throw OFInvalidFormatException The query is not in the correct format
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
OFArray OF_GENERIC(OFPair OF_GENERIC(OFString *, OFString *) *) *queryItems;
/**
* @brief The fragment part of the URI.
* @brief The fragment part of the IRI.
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *fragment;
/**
* @brief The fragment part of the URI in percent-encoded form.
* @brief The fragment part of the IRI in percent-encoded form.
*
* Setting this retains the original percent-encoding used - if more characters
* than necessary are percent-encoded, it is kept this way.
*
* @throw OFInvalidFormatException The fragment being set is not in the correct
* format
*/
@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
OFString *percentEncodedFragment;
/**
* @brief Creates a new mutable URI with the specified schemed.
* @brief Creates a new mutable IRI with the specified schemed.
*
* @param scheme The scheme for the URI
* @return A new, autoreleased OFMutableURI
* @param scheme The scheme for the IRI
* @return A new, autoreleased OFMutableIRI
*/
+ (instancetype)URIWithScheme: (OFString *)scheme;
+ (instancetype)IRIWithScheme: (OFString *)scheme;
/**
* @brief Initializes an already allocated mutable URI with the specified
* @brief Initializes an already allocated mutable IRI with the specified
* schemed.
*
* @param scheme The scheme for the URI
* @return An initialized OFMutableURI
* @param scheme The scheme for the IRI
* @return An initialized OFMutableIRI
*/
- (instancetype)initWithScheme: (OFString *)scheme;
/**
* @brief Appends the specified path component.
*
* @param component The component to append
|
︙ | | |
208
209
210
211
212
213
214
215
216
217
218
219
220
|
208
209
210
211
212
213
214
215
216
217
218
219
220
|
-
+
|
/**
* @brief Resolves relative subpaths.
*/
- (void)standardizePath;
/**
* @brief Converts the mutable URI to an immutable URI.
* @brief Converts the mutable IRI to an immutable IRI.
*/
- (void)makeImmutable;
@end
OF_ASSUME_NONNULL_END
|
Renamed and modified
src/OFMutableURI.m
[375c07c449]
to src/OFMutableIRI.m
[24ff641e36].
︙ | | |
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
-
-
+
+
-
+
-
+
|
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFMutableURI.h"
#import "OFURI+Private.h"
#import "OFMutableIRI.h"
#import "OFIRI+Private.h"
#import "OFArray.h"
#import "OFDictionary.h"
#ifdef OF_HAVE_FILES
# import "OFFileManager.h"
#endif
#import "OFNumber.h"
#import "OFPair.h"
#import "OFString.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
@implementation OFMutableURI
@implementation OFMutableIRI
@dynamic scheme, host, percentEncodedHost, port, user, percentEncodedUser;
@dynamic password, percentEncodedPassword, path, percentEncodedPath;
@dynamic pathComponents, query, percentEncodedQuery, queryItems, fragment;
@dynamic percentEncodedFragment;
+ (instancetype)URIWithScheme: (OFString *)scheme
+ (instancetype)IRIWithScheme: (OFString *)scheme
{
return [[[self alloc] initWithScheme: scheme] autorelease];
}
- (instancetype)initWithScheme: (OFString *)scheme
{
self = [super of_init];
|
︙ | | |
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
-
-
+
+
-
+
-
+
-
+
-
-
+
+
|
{
void *pool = objc_autoreleasePoolPush();
OFString *old = _scheme;
if (scheme.length < 1 || !OFASCIIIsAlpha(*scheme.UTF8String))
@throw [OFInvalidFormatException exception];
OFURIVerifyIsEscaped(scheme,
[OFCharacterSet URISchemeAllowedCharacterSet], false);
OFIRIVerifyIsEscaped(scheme,
[OFCharacterSet IRISchemeAllowedCharacterSet], false);
_scheme = [scheme.lowercaseString copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (void)setHost: (OFString *)host
{
void *pool = objc_autoreleasePoolPush();
OFString *old = _percentEncodedHost;
if (OFURIIsIPv6Host(host))
if (OFIRIIsIPv6Host(host))
_percentEncodedHost = [[OFString alloc]
initWithFormat: @"[%@]", host];
else
_percentEncodedHost = [[host
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIHostAllowedCharacterSet]] copy];
[OFCharacterSet IRIHostAllowedCharacterSet]] copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (void)setPercentEncodedHost: (OFString *)percentEncodedHost
{
OFString *old;
if ([percentEncodedHost hasPrefix: @"["] &&
[percentEncodedHost hasSuffix: @"]"]) {
if (!OFURIIsIPv6Host([percentEncodedHost substringWithRange:
if (!OFIRIIsIPv6Host([percentEncodedHost substringWithRange:
OFMakeRange(1, percentEncodedHost.length - 2)]))
@throw [OFInvalidFormatException exception];
} else if (percentEncodedHost != nil)
OFURIVerifyIsEscaped(percentEncodedHost,
[OFCharacterSet URIHostAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(percentEncodedHost,
[OFCharacterSet IRIHostAllowedCharacterSet], true);
old = _percentEncodedHost;
_percentEncodedHost = [percentEncodedHost copy];
[old release];
}
- (void)setPort: (OFNumber *)port
|
︙ | | |
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
|
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
|
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
|
- (void)setUser: (OFString *)user
{
void *pool = objc_autoreleasePoolPush();
OFString *old = _percentEncodedUser;
_percentEncodedUser = [[user
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIUserAllowedCharacterSet]] copy];
[OFCharacterSet IRIUserAllowedCharacterSet]] copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (void)setPercentEncodedUser: (OFString *)percentEncodedUser
{
OFString *old;
if (percentEncodedUser != nil)
OFURIVerifyIsEscaped(percentEncodedUser,
[OFCharacterSet URIUserAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(percentEncodedUser,
[OFCharacterSet IRIUserAllowedCharacterSet], true);
old = _percentEncodedUser;
_percentEncodedUser = [percentEncodedUser copy];
[old release];
}
- (void)setPassword: (OFString *)password
{
void *pool = objc_autoreleasePoolPush();
OFString *old = _percentEncodedPassword;
_percentEncodedPassword = [[password
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIPasswordAllowedCharacterSet]] copy];
[OFCharacterSet IRIPasswordAllowedCharacterSet]] copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (void)setPercentEncodedPassword: (OFString *)percentEncodedPassword
{
OFString *old;
if (percentEncodedPassword != nil)
OFURIVerifyIsEscaped(percentEncodedPassword,
[OFCharacterSet URIPasswordAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(percentEncodedPassword,
[OFCharacterSet IRIPasswordAllowedCharacterSet], true);
old = _percentEncodedPassword;
_percentEncodedPassword = [percentEncodedPassword copy];
[old release];
}
- (void)setPath: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
OFString *old = _percentEncodedPath;
_percentEncodedPath = [[path
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIPathAllowedCharacterSet]] copy];
[OFCharacterSet IRIPathAllowedCharacterSet]] copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (void)setPercentEncodedPath: (OFString *)percentEncodedPath
{
OFString *old;
OFURIVerifyIsEscaped(percentEncodedPath,
[OFCharacterSet URIPathAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(percentEncodedPath,
[OFCharacterSet IRIPathAllowedCharacterSet], true);
old = _percentEncodedPath;
_percentEncodedPath = [percentEncodedPath copy];
[old release];
}
- (void)setPathComponents: (OFArray *)components
|
︙ | | |
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
|
-
+
-
-
+
+
|
- (void)setQuery: (OFString *)query
{
void *pool = objc_autoreleasePoolPush();
OFString *old = _percentEncodedQuery;
_percentEncodedQuery = [[query
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIQueryAllowedCharacterSet]] copy];
[OFCharacterSet IRIQueryAllowedCharacterSet]] copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (void)setPercentEncodedQuery: (OFString *)percentEncodedQuery
{
OFString *old;
if (percentEncodedQuery != nil)
OFURIVerifyIsEscaped(percentEncodedQuery,
[OFCharacterSet URIQueryAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(percentEncodedQuery,
[OFCharacterSet IRIQueryAllowedCharacterSet], true);
old = _percentEncodedQuery;
_percentEncodedQuery = [percentEncodedQuery copy];
[old release];
}
- (void)setQueryItems:
|
︙ | | |
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
|
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
|
-
+
|
[_percentEncodedQuery release];
_percentEncodedQuery = nil;
return;
}
pool = objc_autoreleasePoolPush();
percentEncodedQuery = [OFMutableString string];
characterSet = [OFCharacterSet URIQueryKeyValueAllowedCharacterSet];
characterSet = [OFCharacterSet IRIQueryKeyValueAllowedCharacterSet];
for (OFPair OF_GENERIC(OFString *, OFString *) *item in queryItems) {
OFString *key = [item.firstObject
stringByAddingPercentEncodingWithAllowedCharacters:
characterSet];
OFString *value = [item.secondObject
stringByAddingPercentEncodingWithAllowedCharacters:
|
︙ | | |
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
|
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
|
-
+
-
-
+
+
-
+
-
+
|
- (void)setFragment: (OFString *)fragment
{
void *pool = objc_autoreleasePoolPush();
OFString *old = _percentEncodedFragment;
_percentEncodedFragment = [[fragment
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIFragmentAllowedCharacterSet]] copy];
[OFCharacterSet IRIFragmentAllowedCharacterSet]] copy];
[old release];
objc_autoreleasePoolPop(pool);
}
- (void)setPercentEncodedFragment: (OFString *)percentEncodedFragment
{
OFString *old;
if (percentEncodedFragment != nil)
OFURIVerifyIsEscaped(percentEncodedFragment,
[OFCharacterSet URIFragmentAllowedCharacterSet], true);
OFIRIVerifyIsEscaped(percentEncodedFragment,
[OFCharacterSet IRIFragmentAllowedCharacterSet], true);
old = _percentEncodedFragment;
_percentEncodedFragment = [percentEncodedFragment copy];
[old release];
}
- (id)copy
{
OFMutableURI *copy = [self mutableCopy];
OFMutableIRI *copy = [self mutableCopy];
[copy makeImmutable];
return copy;
}
- (void)appendPathComponent: (OFString *)component
{
[self appendPathComponent: component isDirectory: false];
#ifdef OF_HAVE_FILES
if ([_scheme isEqual: @"file"] &&
![_percentEncodedPath hasSuffix: @"/"] &&
[[OFFileManager defaultManager] directoryExistsAtURI: self]) {
[[OFFileManager defaultManager] directoryExistsAtIRI: self]) {
void *pool = objc_autoreleasePoolPush();
OFString *path = [_percentEncodedPath
stringByAppendingString: @"/"];
[_percentEncodedPath release];
_percentEncodedPath = [path retain];
|
︙ | | |
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
|
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
|
-
+
|
if ([component isEqual: @"/"] && [_percentEncodedPath hasSuffix: @"/"])
return;
pool = objc_autoreleasePoolPush();
component = [component
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIPathAllowedCharacterSet]];
[OFCharacterSet IRIPathAllowedCharacterSet]];
#if defined(OF_WINDOWS) || defined(OF_MSDOS)
if ([_percentEncodedPath hasSuffix: @"/"] ||
([_scheme isEqual: @"file"] &&
[_percentEncodedPath hasSuffix: @":"]))
#else
if ([_percentEncodedPath hasSuffix: @"/"])
|
︙ | | |
430
431
432
433
434
435
436
437
438
439
|
430
431
432
433
434
435
436
437
438
439
|
-
+
|
self.percentEncodedPath = path;
objc_autoreleasePoolPop(pool);
}
- (void)makeImmutable
{
object_setClass(self, [OFURI class]);
object_setClass(self, [OFIRI class]);
}
@end
|
Modified src/OFMutableString.m
from [eb3bef8a08]
to [b8b23d5dca].
︙ | | |
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
|
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
|
-
+
-
+
-
+
-
+
|
{
return (id)[[OFMutableUTF8String alloc]
initWithContentsOfFile: path
encoding: encoding];
}
#endif
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
{
return (id)[[OFMutableUTF8String alloc] initWithContentsOfURI: URI];
return (id)[[OFMutableUTF8String alloc] initWithContentsOfIRI: IRI];
}
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
encoding: (OFStringEncoding)encoding
{
return (id)[[OFMutableUTF8String alloc]
initWithContentsOfURI: URI
initWithContentsOfIRI: IRI
encoding: encoding];
}
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
return (id)[[OFMutableUTF8String alloc] initWithSerialization: element];
}
|
︙ | | |
Modified src/OFSecureData.h
from [9dc679ab94]
to [17bf7bfda1].
︙ | | |
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
-
+
|
+ (instancetype)dataWithItemsNoCopy: (void *)items
count: (size_t)count
itemSize: (size_t)itemSize
freeWhenDone: (bool)freeWhenDone OF_UNAVAILABLE;
#ifdef OF_HAVE_FILES
+ (instancetype)dataWithContentsOfFile: (OFString *)path OF_UNAVAILABLE;
#endif
+ (instancetype)dataWithContentsOfURI: (OFURI *)URI OF_UNAVAILABLE;
+ (instancetype)dataWithContentsOfIRI: (OFIRI *)IRI OF_UNAVAILABLE;
+ (instancetype)dataWithStringRepresentation: (OFString *)string OF_UNAVAILABLE;
+ (instancetype)dataWithBase64EncodedString: (OFString *)string OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated OFSecureData with `count` items of
* item size 1, all set to zero.
*
|
︙ | | |
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
|
-
+
|
- (instancetype)initWithItemsNoCopy: (void *)items
count: (size_t)count
itemSize: (size_t)itemSize
freeWhenDone: (bool)freeWhenDone OF_UNAVAILABLE;
#ifdef OF_HAVE_FILES
- (instancetype)initWithContentsOfFile: (OFString *)path OF_UNAVAILABLE;
#endif
- (instancetype)initWithContentsOfURI: (OFURI *)URI OF_UNAVAILABLE;
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI OF_UNAVAILABLE;
- (instancetype)initWithStringRepresentation: (OFString *)string OF_UNAVAILABLE;
- (instancetype)initWithBase64EncodedString: (OFString *)string OF_UNAVAILABLE;
- (instancetype)initWithSerialization: (OFXMLElement *)element OF_UNAVAILABLE;
/**
* @brief Returns a specific item of the OFSecureData.
*
|
︙ | | |
183
184
185
186
187
188
189
190
191
192
193
194
195
|
183
184
185
186
187
188
189
190
191
192
193
194
195
|
-
+
|
- (void)zero;
- (OFString *)stringRepresentation OF_UNAVAILABLE;
- (OFString *)stringByBase64Encoding OF_UNAVAILABLE;
#ifdef OF_HAVE_FILES
- (void)writeToFile: (OFString *)path OF_UNAVAILABLE;
#endif
- (void)writeToURI: (OFURI *)URI OF_UNAVAILABLE;
- (void)writeToIRI: (OFIRI *)IRI OF_UNAVAILABLE;
- (OFXMLElement *)XMLElementBySerializing OF_UNAVAILABLE;
- (OFData *)messagePackRepresentation OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFSecureData.m
from [7420c1ca0e]
to [f035278e38].
︙ | | |
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
|
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
|
-
+
|
#ifdef OF_HAVE_FILES
+ (instancetype)dataWithContentsOfFile: (OFString *)path
{
OF_UNRECOGNIZED_SELECTOR
}
#endif
+ (instancetype)dataWithContentsOfURI: (OFURI *)URI
+ (instancetype)dataWithContentsOfIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)dataWithStringRepresentation: (OFString *)string
{
OF_UNRECOGNIZED_SELECTOR
|
︙ | | |
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
|
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
|
-
+
|
#ifdef OF_HAVE_FILES
- (instancetype)initWithContentsOfFile: (OFString *)path
{
OF_INVALID_INIT_METHOD
}
#endif
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithStringRepresentation: (OFString *)string
{
OF_INVALID_INIT_METHOD
|
︙ | | |
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
|
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
|
-
+
|
#ifdef OF_HAVE_FILES
- (void)writeToFile: (OFString *)path
{
OF_UNRECOGNIZED_SELECTOR
}
#endif
- (void)writeToURI: (OFURI *)URI
- (void)writeToIRI: (OFIRI *)IRI
{
OF_UNRECOGNIZED_SELECTOR
}
- (OFXMLElement *)XMLElementBySerializing
{
OF_UNRECOGNIZED_SELECTOR
|
︙ | | |
Modified src/OFString+PathAdditions.h
from [01351c2d45]
to [96e7ed9c77].
︙ | | |
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
-
+
-
+
-
+
|
*
* @param extension The extension to append
* @return A new, autoreleased OFString with the path extension appended
*/
- (OFString *)stringByAppendingPathExtension: (OFString *)extension;
- (bool)of_isDirectoryPath;
- (OFString *)of_pathToURIPathWithPercentEncodedHost:
- (OFString *)of_pathToIRIPathWithPercentEncodedHost:
(OFString *__autoreleasing _Nullable *_Nonnull)percentEncodedHost;
- (OFString *)of_URIPathToPathWithPercentEncodedHost:
- (OFString *)of_IRIPathToPathWithPercentEncodedHost:
(nullable OFString *)percentEncodedHost;
- (OFString *)of_pathComponentToURIPathComponent;
- (OFString *)of_pathComponentToIRIPathComponent;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFString+PercentEncoding.h
from [8762d6fc4c]
to [4cdc0b7563].
︙ | | |
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
-
+
|
* @brief The string with percent encoding removed.
*
* @throw OFInvalidFormatException The string is not in proper percent encoding
*/
@property (readonly, nonatomic) OFString *stringByRemovingPercentEncoding;
/**
* @brief Percent-encodes a string for use in a URI, but does not escape the
* @brief Percent-encodes a string for use in an IRI, but does not escape the
* specified allowed characters.
*
* @param allowedCharacters A character set of characters that should not be
* escaped
*
* @return A new autoreleased string
*/
- (OFString *)stringByAddingPercentEncodingWithAllowedCharacters:
(OFCharacterSet *)allowedCharacters;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFString.h
from [780687227d]
to [e5f7685ba0].
︙ | | |
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
|
-
+
|
*/
typedef void (^OFStringLineEnumerationBlock)(OFString *line, bool *stop);
#endif
#ifdef __OBJC__
@class OFArray OF_GENERIC(ObjectType);
@class OFCharacterSet;
@class OFURI;
@class OFIRI;
/**
* @class OFString OFString.h ObjFW/OFString.h
*
* @brief A class for handling strings.
*/
@interface OFString: OFObject <OFCopying, OFMutableCopying, OFComparing,
|
︙ | | |
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
|
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* @throw OFInvalidEncodingException The string is not in the specified encoding
*/
+ (instancetype)stringWithContentsOfFile: (OFString *)path
encoding: (OFStringEncoding)encoding;
# endif
/**
* @brief Creates a new OFString with the contents of the specified URI.
* @brief Creates a new OFString with the contents of the specified IRI.
*
* If the URI's scheme is file, it tries UTF-8 encoding.
* If the IRI's scheme is file, it tries UTF-8 encoding.
*
* If the URI's scheme is http(s), it tries to detect the encoding from the HTTP
* If the IRI's scheme is http(s), it tries to detect the encoding from the HTTP
* headers. If it could not detect the encoding using the HTTP headers, it tries
* UTF-8.
*
* @param URI The URI to the contents for the string
* @param IRI The IRI to the contents for the string
* @return A new autoreleased OFString
* @throw OFInvalidEncodingException The string is not in the expected encoding
*/
+ (instancetype)stringWithContentsOfURI: (OFURI *)URI;
+ (instancetype)stringWithContentsOfIRI: (OFIRI *)IRI;
/**
* @brief Creates a new OFString with the contents of the specified URI in the
* @brief Creates a new OFString with the contents of the specified IRI in the
* specified encoding.
*
* @param URI The URI to the contents for the string
* @param IRI The IRI to the contents for the string
* @param encoding The encoding to assume
* @return A new autoreleased OFString
* @throw OFInvalidEncodingException The string is not in the specified encoding
*/
+ (instancetype)stringWithContentsOfURI: (OFURI *)URI
+ (instancetype)stringWithContentsOfIRI: (OFIRI *)IRI
encoding: (OFStringEncoding)encoding;
/**
* @brief Initializes an already allocated OFString from a UTF-8 encoded C
* string.
*
* @param UTF8String A UTF-8 encoded C string to initialize the OFString with
|
︙ | | |
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
|
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
*/
- (instancetype)initWithContentsOfFile: (OFString *)path
encoding: (OFStringEncoding)encoding;
# endif
/**
* @brief Initializes an already allocated OFString with the contents of the
* specified URI.
* specified IRI.
*
* If the URI's scheme is file, it tries UTF-8 encoding.
* If the IRI's scheme is file, it tries UTF-8 encoding.
*
* If the URI's scheme is http(s), it tries to detect the encoding from the HTTP
* If the IRI's scheme is http(s), it tries to detect the encoding from the HTTP
* headers. If it could not detect the encoding using the HTTP headers, it tries
* UTF-8.
*
* @param URI The URI to the contents for the string
* @param IRI The IRI to the contents for the string
* @return An initialized OFString
* @throw OFInvalidEncodingException The string is not in the expected encoding
*/
- (instancetype)initWithContentsOfURI: (OFURI *)URI;
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI;
/**
* @brief Initializes an already allocated OFString with the contents of the
* specified URI in the specified encoding.
* specified IRI in the specified encoding.
*
* @param URI The URI to the contents for the string
* @param IRI The IRI to the contents for the string
* @param encoding The encoding to assume
* @return An initialized OFString
* @throw OFInvalidEncodingException The string is not in the specified encoding
*/
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
encoding: (OFStringEncoding)encoding;
/**
* @brief Writes the OFString into the specified C string with the specified
* encoding.
*
* @param cString The C string to write into
|
︙ | | |
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
|
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
|
-
+
-
+
-
+
-
+
-
-
+
+
-
+
|
* @throw OFInvalidEncodingException The string cannot be represented in the
* specified encoding
*/
- (void)writeToFile: (OFString *)path encoding: (OFStringEncoding)encoding;
# endif
/**
* @brief Writes the string to the specified URI using UTF-8 encoding.
* @brief Writes the string to the specified IRI using UTF-8 encoding.
*
* @param URI The URI to write to
* @param IRI The IRI to write to
*/
- (void)writeToURI: (OFURI *)URI;
- (void)writeToIRI: (OFIRI *)IRI;
/**
* @brief Writes the string to the specified URI using the specified encoding.
* @brief Writes the string to the specified IRI using the specified encoding.
*
* @param URI The URI to write to
* @param encoding The encoding to use to write the string to the URI
* @param IRI The IRI to write to
* @param encoding The encoding to use to write the string to the IRI
* @throw OFInvalidEncodingException The string cannot be represented in the
* specified encoding
*/
- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding;
- (void)writeToIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding;
# ifdef OF_HAVE_BLOCKS
/**
* Enumerates all lines in the receiver using the specified block.
*
* @brief block The block to call for each line
*/
|
︙ | | |
Modified src/OFString.m
from [03372dc363]
to [5e63b2cd8e].
︙ | | |
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
+
+
-
-
|
#import "OFCharacterSet.h"
#import "OFData.h"
#import "OFDictionary.h"
#ifdef OF_HAVE_FILES
# import "OFFile.h"
# import "OFFileManager.h"
#endif
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFLocale.h"
#import "OFStream.h"
#import "OFSystemInfo.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFUTF8String.h"
#import "OFUTF8String+Private.h"
#import "OFXMLElement.h"
#import "OFGetItemAttributesFailedException.h"
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
|
︙ | | |
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
|
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
|
-
+
-
+
-
+
-
+
|
encoding: (OFStringEncoding)encoding
{
return (id)[[OFUTF8String alloc] initWithContentsOfFile: path
encoding: encoding];
}
#endif
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
{
return (id)[[OFUTF8String alloc] initWithContentsOfURI: URI];
return (id)[[OFUTF8String alloc] initWithContentsOfIRI: IRI];
}
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
encoding: (OFStringEncoding)encoding
{
return (id)[[OFUTF8String alloc] initWithContentsOfURI: URI
return (id)[[OFUTF8String alloc] initWithContentsOfIRI: IRI
encoding: encoding];
}
- (instancetype)initWithSerialization: (OFXMLElement *)element
{
return (id)[[OFUTF8String alloc] initWithSerialization: element];
}
|
︙ | | |
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
|
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
|
-
+
-
+
-
+
-
+
|
encoding: (OFStringEncoding)encoding
{
return [[[self alloc] initWithContentsOfFile: path
encoding: encoding] autorelease];
}
#endif
+ (instancetype)stringWithContentsOfURI: (OFURI *)URI
+ (instancetype)stringWithContentsOfIRI: (OFIRI *)IRI
{
return [[[self alloc] initWithContentsOfURI: URI] autorelease];
return [[[self alloc] initWithContentsOfIRI: IRI] autorelease];
}
+ (instancetype)stringWithContentsOfURI: (OFURI *)URI
+ (instancetype)stringWithContentsOfIRI: (OFIRI *)IRI
encoding: (OFStringEncoding)encoding
{
return [[[self alloc] initWithContentsOfURI: URI
return [[[self alloc] initWithContentsOfIRI: IRI
encoding: encoding] autorelease];
}
- (instancetype)init
{
if ([self isMemberOfClass: [OFString class]]) {
@try {
|
︙ | | |
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
|
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
|
-
+
-
+
-
+
-
+
|
}
}
return self;
}
#endif
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
{
return [self initWithContentsOfURI: URI
return [self initWithContentsOfIRI: IRI
encoding: OFStringEncodingAutodetect];
}
- (instancetype)initWithContentsOfURI: (OFURI *)URI
- (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
encoding: (OFStringEncoding)encoding
{
void *pool = objc_autoreleasePoolPush();
OFData *data;
@try {
data = [OFData dataWithContentsOfURI: URI];
data = [OFData dataWithContentsOfIRI: IRI];
} @catch (id e) {
[self release];
@throw e;
}
/* FIXME: Detect encoding where we can. */
if (encoding == OFStringEncodingAutodetect)
|
︙ | | |
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
|
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
|
-
+
-
+
-
+
-
+
|
void *pool = objc_autoreleasePoolPush();
OFFile *file = [OFFile fileWithPath: path mode: @"w"];
[file writeString: self encoding: encoding];
objc_autoreleasePoolPop(pool);
}
#endif
- (void)writeToURI: (OFURI *)URI
- (void)writeToIRI: (OFIRI *)IRI
{
[self writeToURI: URI encoding: OFStringEncodingUTF8];
[self writeToIRI: IRI encoding: OFStringEncodingUTF8];
}
- (void)writeToURI: (OFURI *)URI encoding: (OFStringEncoding)encoding
- (void)writeToIRI: (OFIRI *)IRI encoding: (OFStringEncoding)encoding
{
void *pool = objc_autoreleasePoolPush();
OFStream *stream;
stream = [OFURIHandler openItemAtURI: URI mode: @"w"];
stream = [OFIRIHandler openItemAtIRI: IRI mode: @"w"];
[stream writeString: self encoding: encoding];
objc_autoreleasePoolPop(pool);
}
#ifdef OF_HAVE_BLOCKS
- (void)enumerateLinesUsingBlock: (OFStringLineEnumerationBlock)block
|
︙ | | |
Modified src/OFSystemInfo.h
from [8b4f866788]
to [3e88b6ebfe].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
-
+
-
-
-
+
+
+
|
*/
#import "OFObject.h"
#import "OFString.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFSystemInfo OFSystemInfo.h ObjFW/OFSystemInfo.h
*
* @brief A class for querying information about the system.
*/
OF_SUBCLASSING_RESTRICTED
@interface OFSystemInfo: OFObject
#ifdef OF_HAVE_CLASS_PROPERTIES
@property (class, readonly, nonatomic) size_t pageSize;
@property (class, readonly, nonatomic) size_t numberOfCPUs;
@property (class, readonly, nonatomic) OFString *ObjFWVersion;
@property (class, readonly, nonatomic) unsigned short ObjFWVersionMajor;
@property (class, readonly, nonatomic) unsigned short ObjFWVersionMinor;
@property (class, readonly, nullable, nonatomic) OFString *operatingSystemName;
@property (class, readonly, nullable, nonatomic)
OFString *operatingSystemVersion;
@property (class, readonly, nullable, nonatomic) OFURI *userDataURI;
@property (class, readonly, nullable, nonatomic) OFURI *userConfigURI;
@property (class, readonly, nullable, nonatomic) OFURI *temporaryDirectoryURI;
@property (class, readonly, nullable, nonatomic) OFIRI *userDataIRI;
@property (class, readonly, nullable, nonatomic) OFIRI *userConfigIRI;
@property (class, readonly, nullable, nonatomic) OFIRI *temporaryDirectoryIRI;
@property (class, readonly, nullable, nonatomic) OFString *CPUVendor;
@property (class, readonly, nullable, nonatomic) OFString *CPUModel;
# if defined(OF_X86_64) || defined(OF_X86) || defined(DOXYGEN)
@property (class, readonly, nonatomic) bool supportsMMX;
@property (class, readonly, nonatomic) bool supportsSSE;
@property (class, readonly, nonatomic) bool supportsSSE2;
@property (class, readonly, nonatomic) bool supportsSSE3;
|
︙ | | |
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
|
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
|
-
+
-
+
-
+
|
* On macOS and iOS, it uses the `NSApplicationSupportDirectory` directory.@n
* On Windows, it uses the `APPDATA` environment variable.@n
* On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory.@n
* On AmigaOS and MorphOS, it returns `PROGDIR:`.
*
* @return The path where user data for the application can be stored
*/
+ (nullable OFURI *)userDataURI;
+ (nullable OFIRI *)userDataIRI;
/**
* @brief Returns the path where user configuration for the application can be
* stored.
*
* On UNIX systems, this adheres to the XDG Base Directory specification.@n
* On macOS and iOS, it uses the `Preferences` directory inside of
* `NSLibraryDirectory` directory.@n
* On Windows, it uses the `APPDATA` environment variable.@n
* On Haiku, it uses the `B_USER_SETTINGS_DIRECTORY` directory.
* On AmigaOS and MorphOS, it returns `PROGDIR:`.
*
* @return The path where user configuration for the application can be stored
*/
+ (nullable OFURI *)userConfigURI;
+ (nullable OFIRI *)userConfigIRI;
/**
* @brief Returns a path where temporary files for can be stored.
*
* If possible, returns a temporary directory for the user, otherwise returns a
* global temporary directory.
*
* On UNIX systems, this adheres to the XDG Base Directory specification and
* returns `/tmp` if `XDG_RUNTIME_DIR` is not set.@n
* On macOS and iOS, this uses `_CS_DARWIN_USER_TEMP_DIR`, falling back to
* `/tmp` if this fails.@n
* On Windows, it uses `GetTempPath`.@n
* On Haiku, it uses the `B_SYSTEM_TEMP_DIRECTORY` directory.
* On AmigaOS and MorphOS, it returns `T:`.
*
* @return A path where temporary files can be stored
*/
+ (nullable OFURI *)temporaryDirectoryURI;
+ (nullable OFIRI *)temporaryDirectoryIRI;
/**
* @brief Returns the vendor of the CPU.
*
* If the vendor could not be determined, `nil` is returned instead.
*
* @return The vendor of the CPU
|
︙ | | |
Modified src/OFSystemInfo.m
from [9f095b0c1c]
to [e769963f32].
︙ | | |
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
+
-
|
# undef nx_id
#endif
#import "OFSystemInfo.h"
#import "OFApplication.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFIRI.h"
#import "OFLocale.h"
#import "OFOnce.h"
#import "OFString.h"
#import "OFURI.h"
#if defined(OF_MACOS) || defined(OF_IOS)
# ifdef HAVE_SYSDIR_H
# include <sysdir.h>
# endif
#endif
#ifdef OF_WINDOWS
|
︙ | | |
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
-
+
-
+
|
operatingSystemVersion = [[OFString alloc]
initWithCString: utsname.release
encoding: [OFLocale encoding]];
#endif
}
#ifdef OF_NINTENDO_SWITCH
static OFURI *tmpFSURI = nil;
static OFIRI *tmpFSIRI = nil;
static void
mountTmpFS(void)
{
if (R_SUCCEEDED(fsdevMountTemporaryStorage("tmpfs")))
tmpFSURI = [[OFURI alloc] initFileURIWithPath: @"tmpfs:/"
tmpFSIRI = [[OFIRI alloc] initFileIRIWithPath: @"tmpfs:/"
isDirectory: true];
}
#endif
#if defined(OF_X86_64) || defined(OF_X86)
static OF_INLINE struct X86Regs OF_CONST_FUNC
x86CPUID(uint32_t eax, uint32_t ecx)
|
︙ | | |
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
|
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
|
-
+
|
{
static OFOnceControl onceControl = OFOnceControlInitValue;
OFOnce(&onceControl, initOperatingSystemVersion);
return operatingSystemVersion;
}
+ (OFURI *)userDataURI
+ (OFIRI *)userDataIRI
{
#ifdef OF_HAVE_FILES
# if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
|
︙ | | |
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
|
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
[path deleteCharactersInRange: OFMakeRange(0, 1)];
[path insertString: home atIndex: 0];
}
[path makeImmutable];
return [OFURI fileURIWithPath: path isDirectory: true];
return [OFIRI fileIRIWithPath: path isDirectory: true];
# elif defined(OF_WINDOWS)
OFDictionary *env = [OFApplication environment];
OFString *appData;
if ((appData = [env objectForKey: @"APPDATA"]) == nil)
return nil;
return [OFURI fileURIWithPath: appData isDirectory: true];
return [OFIRI fileIRIWithPath: appData isDirectory: true];
# elif defined(OF_HAIKU)
char pathC[PATH_MAX];
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
return nil;
return [OFURI fileURIWithPath: [OFString stringWithUTF8String: pathC]
return [OFIRI fileIRIWithPath: [OFString stringWithUTF8String: pathC]
isDirectory: true];
# elif defined(OF_AMIGAOS)
return [OFURI fileURIWithPath: @"PROGDIR:" isDirectory: true];
return [OFIRI fileIRIWithPath: @"PROGDIR:" isDirectory: true];
# else
OFDictionary *env = [OFApplication environment];
OFString *var;
OFURI *URI;
OFIRI *IRI;
void *pool;
if ((var = [env objectForKey: @"XDG_DATA_HOME"]) != nil &&
var.length > 0)
return [OFURI fileURIWithPath: var isDirectory: true];
return [OFIRI fileIRIWithPath: var isDirectory: true];
if ((var = [env objectForKey: @"HOME"]) == nil)
return nil;
pool = objc_autoreleasePoolPush();
var = [OFString pathWithComponents: [OFArray arrayWithObjects:
var, @".local", @"share", nil]];
URI = [[OFURI alloc] initFileURIWithPath: var isDirectory: true];
IRI = [[OFIRI alloc] initFileIRIWithPath: var isDirectory: true];
objc_autoreleasePoolPop(pool);
return [URI autorelease];
return [IRI autorelease];
# endif
#else
return nil;
#endif
}
+ (OFURI *)userConfigURI
+ (OFIRI *)userConfigIRI
{
#ifdef OF_HAVE_FILES
# if defined(OF_MACOS) || defined(OF_IOS)
char pathC[PATH_MAX];
OFMutableString *path;
# ifdef HAVE_SYSDIR_START_SEARCH_PATH_ENUMERATION
|
︙ | | |
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
|
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
[path deleteCharactersInRange: OFMakeRange(0, 1)];
[path insertString: home atIndex: 0];
}
[path appendString: @"/Preferences"];
[path makeImmutable];
return [OFURI fileURIWithPath: path isDirectory: true];
return [OFIRI fileIRIWithPath: path isDirectory: true];
# elif defined(OF_WINDOWS)
OFDictionary *env = [OFApplication environment];
OFString *appData;
if ((appData = [env objectForKey: @"APPDATA"]) == nil)
return nil;
return [OFURI fileURIWithPath: appData isDirectory: true];
return [OFIRI fileIRIWithPath: appData isDirectory: true];
# elif defined(OF_HAIKU)
char pathC[PATH_MAX];
if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
return nil;
return [OFURI fileURIWithPath: [OFString stringWithUTF8String: pathC]
return [OFIRI fileIRIWithPath: [OFString stringWithUTF8String: pathC]
isDirectory: true];
# elif defined(OF_AMIGAOS)
return [OFURI fileURIWithPath: @"PROGDIR:" isDirectory: true];
return [OFIRI fileIRIWithPath: @"PROGDIR:" isDirectory: true];
# else
OFDictionary *env = [OFApplication environment];
OFString *var;
if ((var = [env objectForKey: @"XDG_CONFIG_HOME"]) != nil &&
var.length > 0)
return [OFURI fileURIWithPath: var isDirectory: true];
return [OFIRI fileIRIWithPath: var isDirectory: true];
if ((var = [env objectForKey: @"HOME"]) == nil)
return nil;
var = [var stringByAppendingPathComponent: @".config"];
return [OFURI fileURIWithPath: var isDirectory: true];
return [OFIRI fileIRIWithPath: var isDirectory: true];
# endif
#else
return nil;
#endif
}
+ (OFURI *)temporaryDirectoryURI
+ (OFIRI *)temporaryDirectoryIRI
{
#ifdef OF_HAVE_FILES
# if defined(OF_MACOS) || defined(OF_IOS)
char buffer[PATH_MAX];
size_t length;
OFString *path;
if ((length = confstr(_CS_DARWIN_USER_TEMP_DIR, buffer, PATH_MAX)) == 0)
return [OFURI fileURIWithPath: @"/tmp" isDirectory: true];
return [OFIRI fileIRIWithPath: @"/tmp" isDirectory: true];
path = [OFString stringWithCString: buffer
encoding: [OFLocale encoding]
length: length - 1];
return [OFURI fileURIWithPath: path isDirectory: true];
return [OFIRI fileIRIWithPath: path isDirectory: true];
# elif defined(OF_WINDOWS)
OFString *path;
if ([self isWindowsNT]) {
wchar_t buffer[PATH_MAX];
if (!GetTempPathW(PATH_MAX, buffer))
return nil;
path = [OFString stringWithUTF16String: buffer];
} else {
char buffer[PATH_MAX];
if (!GetTempPathA(PATH_MAX, buffer))
return nil;
path = [OFString stringWithCString: buffer
encoding: [OFLocale encoding]];
}
return [OFURI fileURIWithPath: path isDirectory: true];
return [OFIRI fileIRIWithPath: path isDirectory: true];
# elif defined(OF_HAIKU)
char pathC[PATH_MAX];
if (find_directory(B_SYSTEM_TEMP_DIRECTORY, 0, false,
pathC, PATH_MAX) != B_OK)
return nil;
return [OFURI fileURIWithPath: [OFString stringWithUTF8String: pathC]
return [OFIRI fileIRIWithPath: [OFString stringWithUTF8String: pathC]
isDirectory: true];
# elif defined(OF_AMIGAOS)
return [OFURI fileURIWithPath: @"T:" isDirectory: true];
return [OFIRI fileIRIWithPath: @"T:" isDirectory: true];
# elif defined(OF_MSDOS)
OFString *path = [[OFApplication environment] objectForKey: @"TEMP"];
if (path == nil)
return nil;
return [OFURI fileURIWithPath: path isDirectory: true];
return [OFIRI fileIRIWithPath: path isDirectory: true];
# elif defined(OF_MINT)
return [OFURI fileURIWithPath: @"u:\\tmp" isDirectory: true];
return [OFIRI fileIRIWithPath: @"u:\\tmp" isDirectory: true];
# elif defined(OF_NINTENDO_SWITCH)
static OFOnceControl onceControl = OFOnceControlInitValue;
OFOnce(&onceControl, mountTmpFS);
return tmpFSURI;
return tmpFSIRI;
# else
OFString *path =
[[OFApplication environment] objectForKey: @"XDG_RUNTIME_DIR"];
if (path != nil)
return [OFURI fileURIWithPath: path];
return [OFIRI fileIRIWithPath: path];
return [OFURI fileURIWithPath: @"/tmp"];
return [OFIRI fileIRIWithPath: @"/tmp"];
# endif
#else
return nil;
#endif
}
+ (OFString *)CPUVendor
|
︙ | | |
Modified src/OFTarArchive.h
from [7277c325d2]
to [6a44745e76].
︙ | | |
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
-
-
+
+
|
#import "OFObject.h"
#import "OFKernelEventObserver.h"
#import "OFString.h"
#import "OFTarArchiveEntry.h"
OF_ASSUME_NONNULL_BEGIN
@class OFStream;
@class OFURI;
@class OFIRI;
@class OFStream;
/**
* @class OFTarArchive OFTarArchive.h ObjFW/OFTarArchive.h
*
* @brief A class for accessing and manipulating tar archives.
*/
OF_SUBCLASSING_RESTRICTED
|
︙ | | |
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
-
+
-
+
-
-
+
+
-
-
+
+
-
+
|
* failed
*/
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
/**
* @brief Creates a new OFTarArchive object with the specified file.
*
* @param URI The URI to the tar archive
* @param IRI The IRI to the tar archive
* @param mode The mode for the tar file. Valid modes are "r" for reading,
* "w" for creating a new file and "a" for appending to an existing
* archive.
* @return A new, autoreleased OFTarArchive
* @throw OFInvalidFormatException The archive has an invalid format
* @throw OFSeekFailedException The archive was open in append mode and seeking
* failed
*/
+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
/**
* @brief Creates a URI for accessing a the specified file within the specified
* tar archive.
* @brief Creates an IRI for accessing a the specified file within the
* specified tar archive.
*
* @param path The path of the file within the archive
* @param URI The URI of the archive
* @return A URI for accessing the specified file within the specified tar
* @param IRI The IRI of the archive
* @return An IRI for accessing the specified file within the specified tar
* archive
*/
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
+ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI;
- (instancetype)init OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated OFTarArchive object with the
* specified stream.
*
|
︙ | | |
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
-
+
-
+
|
- (instancetype)initWithStream: (OFStream *)stream
mode: (OFString *)mode OF_DESIGNATED_INITIALIZER;
/**
* @brief Initializes an already allocated OFTarArchive object with the
* specified file.
*
* @param URI The URI to the tar archive
* @param IRI The IRI to the tar archive
* @param mode The mode for the tar file. Valid modes are "r" for reading,
* "w" for creating a new file and "a" for appending to an existing
* archive.
* @return An initialized OFTarArchive
* @throw OFInvalidFormatException The archive has an invalid format
* @throw OFSeekFailedException The archive was open in append mode and seeking
* failed
*/
- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode;
- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
/**
* @brief Returns the next entry from the tar archive or `nil` if all entries
* have been read.
*
* @note This is only available in read mode.
*
|
︙ | | |
Modified src/OFTarArchive.m
from [734cc4a931]
to [f6df68ff0d].
︙ | | |
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
-
+
-
-
-
-
+
+
+
+
|
#include "config.h"
#include <errno.h>
#import "OFTarArchive.h"
#import "OFTarArchiveEntry.h"
#import "OFTarArchiveEntry+Private.h"
#import "OFArchiveURIHandler.h"
#import "OFArchiveIRIHandler.h"
#import "OFDate.h"
#import "OFSeekableStream.h"
#import "OFStream.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFSeekableStream.h"
#import "OFStream.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFNotOpenException.h"
#import "OFOutOfRangeException.h"
#import "OFTruncatedDataException.h"
#import "OFWriteFailedException.h"
|
︙ | | |
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
-
+
-
+
-
+
-
+
|
@synthesize encoding = _encoding;
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream mode: mode] autorelease];
}
+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
return [[[self alloc] initWithURI: URI mode: mode] autorelease];
return [[[self alloc] initWithIRI: IRI mode: mode] autorelease];
}
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
+ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI
{
return OFArchiveURIHandlerURIForFileInArchive(@"tar", path, URI);
return OFArchiveIRIHandlerIRIForFileInArchive(@"tar", path, IRI);
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
|
︙ | | |
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
|
-
+
-
+
-
+
|
[self release];
@throw e;
}
return self;
}
- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode
- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFStream *stream;
@try {
if ([mode isEqual: @"a"])
stream = [OFURIHandler openItemAtURI: URI mode: @"r+"];
stream = [OFIRIHandler openItemAtIRI: IRI mode: @"r+"];
else
stream = [OFURIHandler openItemAtURI: URI mode: mode];
stream = [OFIRIHandler openItemAtIRI: IRI mode: mode];
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithStream: stream mode: mode];
|
︙ | | |
Modified src/OFZIPArchive.h
from [b8f3f259b0]
to [4188dbeefa].
︙ | | |
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
|
-
+
-
+
-
-
+
+
-
-
+
+
-
+
|
* @throw OFInvalidFormatException The format is not that of a valid ZIP archive
*/
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode;
/**
* @brief Creates a new OFZIPArchive object with the specified file.
*
* @param URI The URI to the ZIP file
* @param IRI The IRI to the ZIP file
* @param mode The mode for the ZIP file. Valid modes are "r" for reading,
* "w" for creating a new file and "a" for appending to an existing
* archive.
* @return A new, autoreleased OFZIPArchive
* @throw OFInvalidFormatException The format is not that of a valid ZIP archive
*/
+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode;
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
/**
* @brief Creates a URI for accessing a the specified file within the specified
* ZIP archive.
* @brief Creates an IRI for accessing a the specified file within the
* specified ZIP archive.
*
* @param path The path of the file within the archive
* @param URI The URI of the archive
* @return A URI for accessing the specified file within the specified ZIP
* @param IRI The IRI of the archive
* @return An IRI for accessing the specified file within the specified ZIP
* archive
*/
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI;
+ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI;
- (instancetype)init OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated OFZIPArchive object with the
* specified stream.
*
|
︙ | | |
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
-
+
-
+
|
- (instancetype)initWithStream: (OFStream *)stream
mode: (OFString *)mode OF_DESIGNATED_INITIALIZER;
/**
* @brief Initializes an already allocated OFZIPArchive object with the
* specified file.
*
* @param URI The URI to the ZIP file
* @param IRI The IRI to the ZIP file
* @param mode The mode for the ZIP file. Valid modes are "r" for reading,
* "w" for creating a new file and "a" for appending to an existing
* archive.
* @return An initialized OFZIPArchive
* @throw OFInvalidFormatException The format is not that of a valid ZIP archive
*/
- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode;
- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode;
/**
* @brief Returns a stream for reading the specified file from the archive.
*
* @note This method is only available in read mode.
*
* @note The returned stream conforms to @ref OFReadyForReadingObserving if the
|
︙ | | |
Modified src/OFZIPArchive.m
from [3d9576934f]
to [5ba6fac0e8].
︙ | | |
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
-
+
+
+
-
-
|
#include "config.h"
#include <errno.h>
#import "OFZIPArchive.h"
#import "OFZIPArchiveEntry.h"
#import "OFZIPArchiveEntry+Private.h"
#import "OFArchiveURIHandler.h"
#import "OFArchiveIRIHandler.h"
#import "OFArray.h"
#import "OFCRC32.h"
#import "OFData.h"
#import "OFDictionary.h"
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFInflate64Stream.h"
#import "OFInflateStream.h"
#import "OFSeekableStream.h"
#import "OFStream.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFChecksumMismatchException.h"
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
#import "OFNotImplementedException.h"
#import "OFNotOpenException.h"
#import "OFOpenItemFailedException.h"
|
︙ | | |
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
-
+
-
+
-
+
-
+
|
@synthesize archiveComment = _archiveComment;
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream mode: mode] autorelease];
}
+ (instancetype)archiveWithURI: (OFURI *)URI mode: (OFString *)mode
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
return [[[self alloc] initWithURI: URI mode: mode] autorelease];
return [[[self alloc] initWithIRI: IRI mode: mode] autorelease];
}
+ (OFURI *)URIForFilePath: (OFString *)path inArchiveWithURI: (OFURI *)URI
+ (OFIRI *)IRIForFilePath: (OFString *)path inArchiveWithIRI: (OFIRI *)IRI
{
return OFArchiveURIHandlerURIForFileInArchive(@"zip", path, URI);
return OFArchiveIRIHandlerIRIForFileInArchive(@"zip", path, IRI);
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
|
︙ | | |
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
-
+
-
+
-
+
|
[self release];
@throw e;
}
return self;
}
- (instancetype)initWithURI: (OFURI *)URI mode: (OFString *)mode
- (instancetype)initWithIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFStream *stream;
@try {
if ([mode isEqual: @"a"])
stream = [OFURIHandler openItemAtURI: URI mode: @"r+"];
stream = [OFIRIHandler openItemAtIRI: IRI mode: @"r+"];
else
stream = [OFURIHandler openItemAtURI: URI mode: mode];
stream = [OFIRIHandler openItemAtIRI: IRI mode: mode];
} @catch (id e) {
[self release];
@throw e;
}
self = [self initWithStream: stream mode: mode];
|
︙ | | |
Modified src/ObjFW.h
from [940f93b1b8]
to [a1674a4bb5].
︙ | | |
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
-
-
-
+
+
+
|
#import "OFNull.h"
#import "OFMethodSignature.h"
#import "OFInvocation.h"
#import "OFNumber.h"
#import "OFDate.h"
#import "OFUUID.h"
#import "OFURI.h"
#import "OFURIHandler.h"
#import "OFIRI.h"
#import "OFIRIHandler.h"
#import "OFUUID.h"
#import "OFColor.h"
#import "OFNotification.h"
#import "OFNotificationCenter.h"
#import "OFStream.h"
#import "OFSeekableStream.h"
|
︙ | | |
Modified src/exceptions/OFCopyItemFailedException.h
from [123bfde77a]
to [d7289d0c18].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFCopyItemFailedException \
* OFCopyItemFailedException.h ObjFW/OFCopyItemFailedException.h
*
* @brief An exception indicating that copying a item failed.
*/
@interface OFCopyItemFailedException: OFException
{
OFURI *_sourceURI, *_destinationURI;
OFIRI *_sourceIRI, *_destinationIRI;
int _errNo;
OF_RESERVE_IVARS(OFCopyItemFailedException, 4)
}
/**
* @brief The URI of the source item.
* @brief The IRI of the source item.
*/
@property (readonly, nonatomic) OFURI *sourceURI;
@property (readonly, nonatomic) OFIRI *sourceIRI;
/**
* @brief The destination URI.
* @brief The destination IRI.
*/
@property (readonly, nonatomic) OFURI *destinationURI;
@property (readonly, nonatomic) OFIRI *destinationIRI;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased copy item failed exception.
*
* @param sourceURI The URI of the source item
* @param destinationURI The destination URI
* @param sourceIRI The IRI of the source item
* @param destinationIRI The destination IRI
* @param errNo The errno of the error that occurred
* @return A new, autoreleased copy item failed exception
*/
+ (instancetype)exceptionWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
+ (instancetype)exceptionWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated copy item failed exception.
*
* @param sourceURI The URI of the source item
* @param destinationURI The destination URI
* @param sourceIRI The IRI of the source item
* @param destinationIRI The destination IRI
* @param errNo The errno of the error that occurred
* @return An initialized copy item failed exception
*/
- (instancetype)initWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
- (instancetype)initWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFCopyItemFailedException.m
from [86e24afee9]
to [bffe79215a].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFCopyItemFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFCopyItemFailedException
@synthesize sourceURI = _sourceURI, destinationURI = _destinationURI;
@synthesize sourceIRI = _sourceIRI, destinationIRI = _destinationIRI;
@synthesize errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
+ (instancetype)exceptionWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo
{
return [[[self alloc] initWithSourceURI: sourceURI
destinationURI: destinationURI
return [[[self alloc] initWithSourceIRI: sourceIRI
destinationIRI: destinationIRI
errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
- (instancetype)initWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo
{
self = [super init];
@try {
_sourceURI = [sourceURI copy];
_destinationURI = [destinationURI copy];
_sourceIRI = [sourceIRI copy];
_destinationIRI = [destinationIRI copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_sourceURI release];
[_destinationURI release];
[_sourceIRI release];
[_destinationIRI release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat: @"Failed to copy item %@ to %@: %@",
_sourceURI, _destinationURI, OFStrError(_errNo)];
_sourceIRI, _destinationIRI, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFCreateDirectoryFailedException.h
from [e16c672401]
to [0a4916308d].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFCreateDirectoryFailedException \
* OFCreateDirectoryFailedException.h \
* ObjFW/OFCreateDirectoryFailedException.h
*
* @brief An exception indicating a directory couldn't be created.
*/
@interface OFCreateDirectoryFailedException: OFException
{
OFURI *_URI;
OFIRI *_IRI;
int _errNo;
OF_RESERVE_IVARS(OFCreateDirectoryFailedException, 4)
}
/**
* @brief The URI of the directory which couldn't be created.
* @brief The IRI of the directory which couldn't be created.
*/
@property (readonly, nonatomic) OFURI *URI;
@property (readonly, nonatomic) OFIRI *IRI;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased create directory failed exception.
*
* @param URI The URI of the directory which could not be created
* @param IRI The IRI of the directory which could not be created
* @param errNo The errno of the error that occurred
* @return A new, autoreleased create directory failed exception
*/
+ (instancetype)exceptionWithURI: (OFURI *)URI errNo: (int)errNo;
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated create directory failed exception.
*
* @param URI The URI of the directory which could not be created
* @param IRI The IRI of the directory which could not be created
* @param errNo The errno of the error that occurred
* @return An initialized create directory failed exception
*/
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFCreateDirectoryFailedException.m
from [cd0b53b912]
to [41652ef987].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFCreateDirectoryFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFCreateDirectoryFailedException
@synthesize URI = _URI, errNo = _errNo;
@synthesize IRI = _IRI, errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithURI: (OFURI *)URI errNo: (int)errNo
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI errNo: (int)errNo
{
return [[[self alloc] initWithURI: URI errNo: errNo] autorelease];
return [[[self alloc] initWithIRI: IRI errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithURI: (OFURI *)URI errNo: (int)errNo
- (instancetype)initWithIRI: (OFIRI *)IRI errNo: (int)errNo
{
self = [super init];
@try {
_URI = [URI copy];
_IRI = [IRI copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"Failed to create directory %@: %@", _URI, OFStrError(_errNo)];
@"Failed to create directory %@: %@", _IRI, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFCreateSymbolicLinkFailedException.h
from [79c2f6b7ee]
to [a31832a3fb].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFCreateSymbolicLinkFailedException \
* OFCreateSymbolicLinkFailedException.h \
* ObjFW/OFCreateSymbolicLinkFailedException.h
*
* @brief An exception indicating that creating a symbolic link failed.
*/
@interface OFCreateSymbolicLinkFailedException: OFException
{
OFURI *_URI;
OFIRI *_IRI;
OFString *_target;
int _errNo;
OF_RESERVE_IVARS(OFCreateSymbolicLinkFailedException, 4)
}
/**
* @brief The URI at which the symlink should have been created.
* @brief The IRI at which the symlink should have been created.
*/
@property (readonly, nonatomic) OFURI *URI;
@property (readonly, nonatomic) OFIRI *IRI;
/**
* @brief The target for the symlink.
*/
@property (readonly, nonatomic) OFString *target;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased create symbolic link failed exception.
*
* @param URI The URI where the symlink should have been created
* @param IRI The IRI where the symlink should have been created
* @param target The target for the symbolic link
* @param errNo The errno of the error that occurred
* @return A new, autoreleased create symbolic link failed exception
*/
+ (instancetype)exceptionWithURI: (OFURI *)URI
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI
target: (OFString *)target
errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated create symbolic link failed
* exception.
*
* @param URI The URI where the symlink should have been created
* @param IRI The IRI where the symlink should have been created
* @param target The target for the symbolic link
* @param errNo The errno of the error that occurred
* @return An initialized create symbolic link failed exception
*/
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
target: (OFString *)target
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFCreateSymbolicLinkFailedException.m
from [c5e085b246]
to [afa585d265].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFCreateSymbolicLinkFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFCreateSymbolicLinkFailedException
@synthesize URI = _URI, target = _target, errNo = _errNo;
@synthesize IRI = _IRI, target = _target, errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithURI: (OFURI *)URI
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI
target: (OFString *)target
errNo: (int)errNo
{
return [[[self alloc] initWithURI: URI
return [[[self alloc] initWithIRI: IRI
target: target
errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
target: (OFString *)target
errNo: (int)errNo
{
self = [super init];
@try {
_URI = [URI copy];
_IRI = [IRI copy];
_target = [target copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[_target release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"Failed to create symbolic link %@ with target %@: %@",
_URI, _target, OFStrError(_errNo)];
_IRI, _target, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFGetItemAttributesFailedException.h
from [354af07fb2]
to [a44aaef36d].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFGetItemAttributesFailedException \
* OFGetItemAttributesFailedException.h \
* ObjFW/OFGetItemAttributesFailedException.h
*
* @brief An exception indicating an item's attributes could not be retrieved.
*/
@interface OFGetItemAttributesFailedException: OFException
{
OFURI *_URI;
OFIRI *_IRI;
int _errNo;
OF_RESERVE_IVARS(OFGetItemAttributesFailedException, 4)
}
/**
* @brief The URI of the item whose attributes could not be retrieved.
* @brief The IRI of the item whose attributes could not be retrieved.
*/
@property (readonly, nonatomic) OFURI *URI;
@property (readonly, nonatomic) OFIRI *IRI;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased retrieve item attributes failed exception.
*
* @param URI The URI of the item whose attributes could not be retrieved
* @param IRI The IRI of the item whose attributes could not be retrieved
* @param errNo The errno of the error that occurred
* @return A new, autoreleased retrieve item attributes failed exception
*/
+ (instancetype)exceptionWithURI: (OFURI *)URI errNo: (int)errNo;
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated retrieve item attributes failed
* exception.
*
* @param URI The URI of the item whose attributes could not be retrieved
* @param IRI The IRI of the item whose attributes could not be retrieved
* @param errNo The errno of the error that occurred
* @return An initialized retrieve item attributes failed exception
*/
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFGetItemAttributesFailedException.m
from [db212ce8f9]
to [bf7eea9fc6].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFGetItemAttributesFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFGetItemAttributesFailedException
@synthesize URI = _URI, errNo = _errNo;
@synthesize IRI = _IRI, errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithURI: (OFURI *)URI errNo: (int)errNo
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI errNo: (int)errNo
{
return [[[self alloc] initWithURI: URI errNo: errNo] autorelease];
return [[[self alloc] initWithIRI: IRI errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithURI: (OFURI *)URI errNo: (int)errNo
- (instancetype)initWithIRI: (OFIRI *)IRI errNo: (int)errNo
{
self = [super init];
@try {
_URI = [URI copy];
_IRI = [IRI copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"Failed to get attributes for item %@: %@",
_URI, OFStrError(_errNo)];
_IRI, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFHTTPRequestFailedException.m
from [f93ff97e23]
to [31c2419af8].
︙ | | |
60
61
62
63
64
65
66
67
68
69
70
|
60
61
62
63
64
65
66
67
68
69
70
|
-
-
+
+
|
}
- (OFString *)description
{
const char *method = OFHTTPRequestMethodName(_request.method);
return [OFString stringWithFormat:
@"An HTTP %s request with URI %@ failed with code %hd!", method,
_request.URI, _response.statusCode];
@"An HTTP %s request with IRI %@ failed with code %hd!", method,
_request.IRI, _response.statusCode];
}
@end
|
Modified src/exceptions/OFLinkItemFailedException.h
from [bc4e6321e5]
to [6b61ae09b8].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFLinkItemFailedException \
* OFLinkItemFailedException.h ObjFW/OFLinkItemFailedException.h
*
* @brief An exception indicating that creating a link failed.
*/
@interface OFLinkItemFailedException: OFException
{
OFURI *_sourceURI, *_destinationURI;
OFIRI *_sourceIRI, *_destinationIRI;
int _errNo;
OF_RESERVE_IVARS(OFLinkItemFailedException, 4)
}
/**
* @brief A URI with the source for the link.
* @brief An IRI with the source for the link.
*/
@property (readonly, nonatomic) OFURI *sourceURI;
@property (readonly, nonatomic) OFIRI *sourceIRI;
/**
* @brief A URI with the destination for the link.
* @brief An IRI with the destination for the link.
*/
@property (readonly, nonatomic) OFURI *destinationURI;
@property (readonly, nonatomic) OFIRI *destinationIRI;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased link failed exception.
*
* @param sourceURI The source for the link
* @param destinationURI The destination for the link
* @param sourceIRI The source for the link
* @param destinationIRI The destination for the link
* @param errNo The errno of the error that occurred
* @return A new, autoreleased link failed exception
*/
+ (instancetype)exceptionWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
+ (instancetype)exceptionWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated link failed exception.
*
* @param sourceURI The source for the link
* @param destinationURI The destination for the link
* @param sourceIRI The source for the link
* @param destinationIRI The destination for the link
* @param errNo The errno of the error that occurred
* @return An initialized link failed exception
*/
- (instancetype)initWithSourceURI: (OFURI*)sourceURI
destinationURI: (OFURI *)destinationURI
- (instancetype)initWithSourceIRI: (OFIRI*)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFLinkItemFailedException.m
from [3033895110]
to [c5752027ce].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
|
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFLinkItemFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFLinkItemFailedException
@synthesize sourceURI = _sourceURI, destinationURI = _destinationURI;
@synthesize sourceIRI = _sourceIRI, destinationIRI = _destinationIRI;
@synthesize errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
+ (instancetype)exceptionWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo
{
return [[[self alloc] initWithSourceURI: sourceURI
destinationURI: destinationURI
return [[[self alloc] initWithSourceIRI: sourceIRI
destinationIRI: destinationIRI
errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
- (instancetype)initWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo
{
self = [super init];
@try {
_sourceURI = [sourceURI copy];
_destinationURI = [destinationURI copy];
_sourceIRI = [sourceIRI copy];
_destinationIRI = [destinationIRI copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_sourceURI release];
[_destinationURI release];
[_sourceIRI release];
[_destinationIRI release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat: @"Failed to link file %@ to %@: %@",
_sourceURI, _destinationURI, OFStrError(_errNo)];
_sourceIRI, _destinationIRI, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFMoveItemFailedException.h
from [f2cc0cdf02]
to [9960932e73].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFMoveItemFailedException \
* OFMoveItemFailedException.h ObjFW/OFMoveItemFailedException.h
*
* @brief An exception indicating that moving an item failed.
*/
@interface OFMoveItemFailedException: OFException
{
OFURI *_sourceURI, *_destinationURI;
OFIRI *_sourceIRI, *_destinationIRI;
int _errNo;
OF_RESERVE_IVARS(OFMoveItemFailedException, 4)
}
/**
* @brief The original URI.
* @brief The original IRI.
*/
@property (readonly, nonatomic) OFURI *sourceURI;
@property (readonly, nonatomic) OFIRI *sourceIRI;
/**
* @brief The new URI.
* @brief The new IRI.
*/
@property (readonly, nonatomic) OFURI *destinationURI;
@property (readonly, nonatomic) OFIRI *destinationIRI;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased move item failed exception.
*
* @param sourceURI The original URI
* @param destinationURI The new URI
* @param sourceIRI The original IRI
* @param destinationIRI The new IRI
* @param errNo The errno of the error that occurred
* @return A new, autoreleased move item failed exception
*/
+ (instancetype)exceptionWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
+ (instancetype)exceptionWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated move item failed exception.
*
* @param sourceURI The original URI
* @param destinationURI The new URI
* @param sourceIRI The original IRI
* @param destinationIRI The new IRI
* @param errNo The errno of the error that occurred
* @return An initialized move item failed exception
*/
- (instancetype)initWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
- (instancetype)initWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFMoveItemFailedException.m
from [7df7241c06]
to [0cb3330782].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
|
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFMoveItemFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFMoveItemFailedException
@synthesize sourceURI = _sourceURI, destinationURI = _destinationURI;
@synthesize sourceIRI = _sourceIRI, destinationIRI = _destinationIRI;
@synthesize errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
+ (instancetype)exceptionWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo
{
return [[[self alloc] initWithSourceURI: sourceURI
destinationURI: destinationURI
return [[[self alloc] initWithSourceIRI: sourceIRI
destinationIRI: destinationIRI
errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithSourceURI: (OFURI *)sourceURI
destinationURI: (OFURI *)destinationURI
- (instancetype)initWithSourceIRI: (OFIRI *)sourceIRI
destinationIRI: (OFIRI *)destinationIRI
errNo: (int)errNo
{
self = [super init];
@try {
_sourceURI = [sourceURI copy];
_destinationURI = [destinationURI copy];
_sourceIRI = [sourceIRI copy];
_destinationIRI = [destinationIRI copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_sourceURI release];
[_destinationURI release];
[_sourceIRI release];
[_destinationIRI release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"Failed to move item at %@ to %@: %@",
_sourceURI, _destinationURI, OFStrError(_errNo)];
_sourceIRI, _destinationIRI, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFOpenItemFailedException.h
from [fe988003bf]
to [b9ddbfc8ab].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFOpenItemFailedException \
* OFOpenItemFailedException.h ObjFW/OFOpenItemFailedException.h
*
* @brief An exception indicating an item could not be opened.
*/
@interface OFOpenItemFailedException: OFException
{
OFURI *_Nullable _URI;
OFIRI *_Nullable _IRI;
OFString *_Nullable _path;
OFString *_mode;
int _errNo;
OF_RESERVE_IVARS(OFOpenItemFailedException, 4)
}
/**
* @brief The URI of the item which could not be opened.
* @brief The IRI of the item which could not be opened.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFURI *URI;
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFIRI *IRI;
/**
* @brief The path of the item which could not be opened.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *path;
/**
* @brief The mode in which the item should have been opened.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFString *mode;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased open item failed exception.
*
* @param URI The URI of the item which could not be opened
* @param IRI The IRI of the item which could not be opened
* @param mode A string with the mode in which the item should have been opened
* @param errNo The errno of the error that occurred
* @return A new, autoreleased open item failed exception
*/
+ (instancetype)exceptionWithURI: (OFURI *)URI
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI
mode: (nullable OFString *)mode
errNo: (int)errNo;
/**
* @brief Creates a new, autoreleased open item failed exception.
*
* @param path The path of the item which could not be opened
* @param mode A string with the mode in which the item should have been opened
* @param errNo The errno of the error that occurred
* @return A new, autoreleased open item failed exception
*/
+ (instancetype)exceptionWithPath: (OFString *)path
mode: (nullable OFString *)mode
errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated open item failed exception.
*
* @param URI The URI of the item which could not be opened
* @param IRI The IRI of the item which could not be opened
* @param mode A string with the mode in which the item should have been opened
* @param errNo The errno of the error that occurred
* @return An initialized open item failed exception
*/
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
mode: (nullable OFString *)mode
errNo: (int)errNo;
/**
* @brief Initializes an already allocated open item failed exception.
*
* @param path The path of the item which could not be opened
|
︙ | | |
Modified src/exceptions/OFOpenItemFailedException.m
from [7129cdf836]
to [5182d161f3].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFOpenItemFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFOpenItemFailedException
@synthesize URI = _URI, path = _path, mode = _mode, errNo = _errNo;
@synthesize IRI = _IRI, path = _path, mode = _mode, errNo = _errNo;
+ (instancetype)exceptionWithURI: (OFURI *)URI
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI
mode: (OFString *)mode
errNo: (int)errNo
{
return [[[self alloc] initWithURI: URI
return [[[self alloc] initWithIRI: IRI
mode: mode
errNo: errNo] autorelease];
}
+ (instancetype)exceptionWithPath: (OFString *)path
mode: (OFString *)mode
errNo: (int)errNo
{
return [[[self alloc] initWithPath: path
mode: mode
errNo: errNo] autorelease];
}
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
mode: (OFString *)mode
errNo: (int)errNo
{
self = [super init];
@try {
_URI = [URI copy];
_IRI = [IRI copy];
_mode = [mode copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
|
︙ | | |
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
-
+
-
-
+
+
|
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[_path release];
[_mode release];
[super dealloc];
}
- (OFString *)description
{
id item = nil;
if (_URI != nil)
item = _URI;
if (_IRI != nil)
item = _IRI;
else if (_path != nil)
item = _path;
if (_mode != nil)
return [OFString stringWithFormat:
@"Failed to open file %@ with mode %@: %@",
item, _mode, OFStrError(_errNo)];
else
return [OFString stringWithFormat:
@"Failed to open item %@: %@", item, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFRemoveItemFailedException.h
from [18b7b9ee6b]
to [8b4fed00fc].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFRemoveItemFailedException \
* OFRemoveItemFailedException.h ObjFW/OFRemoveItemFailedException.h
*
* @brief An exception indicating that removing an item failed.
*/
@interface OFRemoveItemFailedException: OFException
{
OFURI *_URI;
OFIRI *_IRI;
int _errNo;
OF_RESERVE_IVARS(OFRemoveItemFailedException, 4)
}
/**
* @brief The URI of the item which could not be removed.
* @brief The IRI of the item which could not be removed.
*/
@property (readonly, nonatomic) OFURI *URI;
@property (readonly, nonatomic) OFIRI *IRI;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief Creates a new, autoreleased remove failed exception.
*
* @param URI The URI of the item which could not be removed
* @param IRI The IRI of the item which could not be removed
* @param errNo The errno of the error that occurred
* @return A new, autoreleased remove item failed exception
*/
+ (instancetype)exceptionWithURI: (OFURI *)URI errNo: (int)errNo;
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated remove failed exception.
*
* @param URI The URI of the item which could not be removed
* @param IRI The IRI of the item which could not be removed
* @param errNo The errno of the error that occurred
* @return An initialized remove item failed exception
*/
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFRemoveItemFailedException.m
from [790fd92540]
to [c486ea57fb].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFRemoveItemFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFRemoveItemFailedException
@synthesize URI = _URI, errNo = _errNo;
@synthesize IRI = _IRI, errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithURI: (OFURI *)URI errNo: (int)errNo
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI errNo: (int)errNo
{
return [[[self alloc] initWithURI: URI errNo: errNo] autorelease];
return [[[self alloc] initWithIRI: IRI errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithURI: (OFURI *)URI errNo: (int)errNo
- (instancetype)initWithIRI: (OFIRI *)IRI errNo: (int)errNo
{
self = [super init];
@try {
_URI = [URI copy];
_IRI = [IRI copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"Failed to remove item at URI %@: %@", _URI, OFStrError(_errNo)];
@"Failed to remove item at IRI %@: %@", _IRI, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFSetItemAttributesFailedException.h
from [4b245f8a54]
to [27c349806a].
︙ | | |
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFException.h"
#import "OFURIHandler.h"
#import "OFIRIHandler.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFSetItemAttributesFailedException \
* OFSetItemAttributesFailedException.h \
* ObjFW/OFSetItemAttributesFailedException.h
*
* @brief An exception indicating an item's attributes could not be set.
*/
@interface OFSetItemAttributesFailedException: OFException
{
OFURI *_URI;
OFIRI *_IRI;
OFFileAttributes _attributes;
OFFileAttributeKey _failedAttribute;
int _errNo;
OF_RESERVE_IVARS(OFSetItemAttributesFailedException, 4)
}
/**
* @brief The URI of the item whose attributes could not be set.
* @brief The IRI of the item whose attributes could not be set.
*/
@property (readonly, nonatomic) OFURI *URI;
@property (readonly, nonatomic) OFIRI *IRI;
/**
* @brief The errno of the error that occurred.
*/
@property (readonly, nonatomic) int errNo;
/**
* @brief The attributes that should have been set.
*/
@property (readonly, nonatomic) OFFileAttributes attributes;
/**
* @brief The first attribute that could not be set.
*/
@property (readonly, nonatomic) OFFileAttributeKey failedAttribute;
/**
* @brief Creates a new, autoreleased set item attributes failed exception.
*
* @param URI The URI of the item whose attributes could not be set
* @param IRI The IRI of the item whose attributes could not be set
* @param attributes The attributes that should have been set for the specified
* item.
* @param failedAttribute The first attribute that could not be set
* @param errNo The errno of the error that occurred
* @return A new, autoreleased set item attributes failed exception
*/
+ (instancetype)exceptionWithURI: (OFURI *)URI
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI
attributes: (OFFileAttributes)attributes
failedAttribute: (OFFileAttributeKey)failedAttribute
errNo: (int)errNo;
+ (instancetype)exception OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated set item attributes failed exception.
*
* @param URI The URI of the item whose attributes could not be set
* @param IRI The IRI of the item whose attributes could not be set
* @param attributes The attributes that should have been set for the specified
* item.
* @param failedAttribute The first attribute that could not be set
* @param errNo The errno of the error that occurred
* @return An initialized set item attributes failed exception
*/
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
attributes: (OFFileAttributes)attributes
failedAttribute: (OFFileAttributeKey)failedAttribute
errNo: (int)errNo OF_DESIGNATED_INITIALIZER;
- (instancetype)init OF_UNAVAILABLE;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFSetItemAttributesFailedException.m
from [419b3c1aff]
to [ee40a2e08a].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFSetItemAttributesFailedException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFSetItemAttributesFailedException
@synthesize URI = _URI, attributes = _attributes;
@synthesize IRI = _IRI, attributes = _attributes;
@synthesize failedAttribute = _failedAttribute, errNo = _errNo;
+ (instancetype)exception
{
OF_UNRECOGNIZED_SELECTOR
}
+ (instancetype)exceptionWithURI: (OFURI *)URI
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI
attributes: (OFFileAttributes)attributes
failedAttribute: (OFFileAttributeKey)failedAttribute
errNo: (int)errNo
{
return [[[self alloc] initWithURI: URI
return [[[self alloc] initWithIRI: IRI
attributes: attributes
failedAttribute: failedAttribute
errNo: errNo] autorelease];
}
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
attributes: (OFFileAttributes)attributes
failedAttribute: (OFFileAttributeKey)failedAttribute
errNo: (int)errNo
{
self = [super init];
@try {
_URI = [URI copy];
_IRI = [IRI copy];
_attributes = [attributes copy];
_failedAttribute = [failedAttribute copy];
_errNo = errNo;
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[_attributes release];
[_failedAttribute release];
[super dealloc];
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"Failed to set attribute %@ for item %@: %@",
_failedAttribute, _URI, OFStrError(_errNo)];
_failedAttribute, _IRI, OFStrError(_errNo)];
}
@end
|
Modified src/exceptions/OFUnsupportedProtocolException.h
from [229fefef5c]
to [fcc9fd2e50].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* file.
*/
#import "OFException.h"
OF_ASSUME_NONNULL_BEGIN
@class OFURI;
@class OFIRI;
/**
* @class OFUnsupportedProtocolException \
* OFUnsupportedProtocolException.h \
* ObjFW/OFUnsupportedProtocolException.h
*
* @brief An exception indicating that the protocol specified by the URI is not
* @brief An exception indicating that the protocol specified by the IRI is not
* supported.
*/
@interface OFUnsupportedProtocolException: OFException
{
OFURI *_Nullable _URI;
OFIRI *_Nullable _IRI;
OF_RESERVE_IVARS(OFUnsupportedProtocolException, 4)
}
/**
* @brief The URI whose protocol is unsupported.
* @brief The IRI whose protocol is unsupported.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFURI *URI;
@property OF_NULLABLE_PROPERTY (readonly, nonatomic) OFIRI *IRI;
/**
* @brief Creates a new, autoreleased unsupported protocol exception.
*
* @param URI The URI whose protocol is unsupported
* @param IRI The IRI whose protocol is unsupported
* @return A new, autoreleased unsupported protocol exception
*/
+ (instancetype)exceptionWithURI: (nullable OFURI*)URI;
+ (instancetype)exceptionWithIRI: (nullable OFIRI*)IRI;
/**
* @brief Initializes an already allocated unsupported protocol exception
*
* @param URI The URI whose protocol is unsupported
* @param IRI The IRI whose protocol is unsupported
* @return An initialized unsupported protocol exception
*/
- (instancetype)initWithURI: (nullable OFURI*)URI OF_DESIGNATED_INITIALIZER;
- (instancetype)initWithIRI: (nullable OFIRI*)IRI OF_DESIGNATED_INITIALIZER;
@end
OF_ASSUME_NONNULL_END
|
Modified src/exceptions/OFUnsupportedProtocolException.m
from [a391485837]
to [1aff01bcf1].
︙ | | |
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFUnsupportedProtocolException.h"
#import "OFString.h"
#import "OFURI.h"
#import "OFIRI.h"
#import "OFString.h"
@implementation OFUnsupportedProtocolException
@synthesize URI = _URI;
@synthesize IRI = _IRI;
+ (instancetype)exceptionWithURI: (OFURI *)URI
+ (instancetype)exceptionWithIRI: (OFIRI *)IRI
{
return [[[self alloc] initWithURI: URI] autorelease];
return [[[self alloc] initWithIRI: IRI] autorelease];
}
- (instancetype)initWithURI: (OFURI *)URI
- (instancetype)initWithIRI: (OFIRI *)IRI
{
self = [super init];
_URI = [URI retain];
_IRI = [IRI retain];
return self;
}
- (void)dealloc
{
[_URI release];
[_IRI release];
[super dealloc];
}
- (OFString *)description
{
if (_URI != nil)
if (_IRI != nil)
return [OFString stringWithFormat:
@"The protocol of URI %@ is not supported!", _URI];
@"The protocol of IRI %@ is not supported!", _IRI];
else
return @"The requested protocol is unsupported!";
}
@end
|
Modified src/platform/AmigaOS/OFString+PathAdditions.m
from [60752aa5d1]
to [26bec42e68].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
-
+
|
* file.
*/
#include "config.h"
#import "OFString+PathAdditions.h"
#import "OFArray.h"
#import "OFFileURIHandler.h"
#import "OFFileIRIHandler.h"
#import "OFOutOfRangeException.h"
int _OFString_PathAdditions_reference;
@implementation OFString (PathAdditions)
+ (OFString *)pathWithComponents: (OFArray *)components
|
︙ | | |
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
-
+
-
+
|
} else
return [self stringByAppendingFormat: @".%@", extension];
}
- (bool)of_isDirectoryPath
{
return ([self hasSuffix: @"/"] || [self hasSuffix: @":"] ||
[OFFileURIHandler of_directoryExistsAtPath: self]);
[OFFileIRIHandler of_directoryExistsAtPath: self]);
}
- (OFString *)of_pathToURIPathWithPercentEncodedHost:
- (OFString *)of_pathToIRIPathWithPercentEncodedHost:
(OFString **)percentEncodedHost
{
OFArray OF_GENERIC(OFString *) *components = self.pathComponents;
OFMutableString *ret = [OFMutableString string];
for (OFString *component in components) {
if (component.length == 0)
|
︙ | | |
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
|
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
|
-
+
|
}
[ret makeImmutable];
return ret;
}
- (OFString *)of_URIPathToPathWithPercentEncodedHost:
- (OFString *)of_IRIPathToPathWithPercentEncodedHost:
(OFString *)percentEncodedHost
{
OFString *path = self;
if (path.length > 1 && [path hasSuffix: @"/"])
path = [path substringToIndex: path.length - 1];
|
︙ | | |
349
350
351
352
353
354
355
356
357
358
359
360
|
349
350
351
352
353
354
355
356
357
358
359
360
|
-
+
|
if ([component isEqual: @".."])
[components replaceObjectAtIndex: i withObject: @"/"];
}
return [OFString pathWithComponents: components];
}
- (OFString *)of_pathComponentToURIPathComponent
- (OFString *)of_pathComponentToIRIPathComponent
{
return self;
}
@end
|
Modified src/platform/POSIX/OFString+PathAdditions.m
from [d1f51523cf]
to [6f2e8391b1].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
-
+
|
* file.
*/
#include "config.h"
#import "OFString+PathAdditions.h"
#import "OFArray.h"
#import "OFFileURIHandler.h"
#import "OFFileIRIHandler.h"
#import "OFOutOfRangeException.h"
int _OFString_PathAdditions_reference;
@implementation OFString (PathAdditions)
+ (OFString *)pathWithComponents: (OFArray *)components
|
︙ | | |
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
|
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
|
-
+
-
+
-
+
-
+
|
} else
return [self stringByAppendingFormat: @".%@", extension];
}
- (bool)of_isDirectoryPath
{
return ([self hasSuffix: @"/"] ||
[OFFileURIHandler of_directoryExistsAtPath: self]);
[OFFileIRIHandler of_directoryExistsAtPath: self]);
}
- (OFString *)of_pathToURIPathWithPercentEncodedHost:
- (OFString *)of_pathToIRIPathWithPercentEncodedHost:
(OFString **)percentEncodedHost
{
return self;
}
- (OFString *)of_URIPathToPathWithPercentEncodedHost:
- (OFString *)of_IRIPathToPathWithPercentEncodedHost:
(OFString *)percentEncodedHost
{
OFString *path = self;
if (path.length > 1 && [path hasSuffix: @"/"])
path = [path substringToIndex: path.length - 1];
return path;
}
- (OFString *)of_pathComponentToURIPathComponent
- (OFString *)of_pathComponentToIRIPathComponent
{
return self;
}
@end
|
Modified src/platform/Windows/OFString+PathAdditions.m
from [ec08b34f89]
to [6ebe3fd31f].
︙ | | |
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
-
-
+
+
|
* Windows-specific parts!
*/
#include "config.h"
#import "OFString+PathAdditions.h"
#import "OFArray.h"
#import "OFFileURIHandler.h"
#import "OFURI.h"
#import "OFFileIRIHandler.h"
#import "OFIRI.h"
#import "OFInvalidFormatException.h"
#import "OFOutOfRangeException.h"
int _OFString_PathAdditions_reference;
@implementation OFString (PathAdditions)
|
︙ | | |
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
|
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
|
-
+
-
+
-
+
-
+
|
} else
return [self stringByAppendingFormat: @".%@", extension];
}
- (bool)of_isDirectoryPath
{
return ([self hasSuffix: @"\\"] || [self hasSuffix: @"/"] ||
[OFFileURIHandler of_directoryExistsAtPath: self]);
[OFFileIRIHandler of_directoryExistsAtPath: self]);
}
- (OFString *)of_pathToURIPathWithPercentEncodedHost:
- (OFString *)of_pathToIRIPathWithPercentEncodedHost:
(OFString **)percentEncodedHost
{
OFString *path = self;
if ([path hasPrefix: @"\\\\"]) {
OFArray *components = path.pathComponents;
if (components.count < 2)
@throw [OFInvalidFormatException exception];
*percentEncodedHost = [[components objectAtIndex: 1]
stringByAddingPercentEncodingWithAllowedCharacters:
[OFCharacterSet URIHostAllowedCharacterSet]];
[OFCharacterSet IRIHostAllowedCharacterSet]];
path = [OFString pathWithComponents: [components
objectsInRange: OFMakeRange(2, components.count - 2)]];
}
path = [path stringByReplacingOccurrencesOfString: @"\\"
withString: @"/"];
path = [@"/" stringByAppendingString: path];
return path;
}
- (OFString *)of_URIPathToPathWithPercentEncodedHost:
- (OFString *)of_IRIPathToPathWithPercentEncodedHost:
(OFString *)percentEncodedHost
{
OFString *path = self;
if (path.length > 1 && [path hasSuffix: @"/"] &&
![path hasSuffix: @":/"])
path = [path substringToIndex: path.length - 1];
|
︙ | | |
394
395
396
397
398
399
400
401
402
403
404
405
406
|
394
395
396
397
398
399
400
401
402
403
404
405
406
|
-
+
|
path = [OFString stringWithFormat: @"\\\\%@\\%@",
host, path];
}
return path;
}
- (OFString *)of_pathComponentToURIPathComponent
- (OFString *)of_pathComponentToIRIPathComponent
{
return [self stringByReplacingOccurrencesOfString: @"\\"
withString: @"/"];
}
@end
|
Modified src/platform/libfat/OFString+PathAdditions.m
from [6647377f7a]
to [9d3f92c7b7].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
-
+
|
* file.
*/
#include "config.h"
#import "OFString+PathAdditions.h"
#import "OFArray.h"
#import "OFFileURIHandler.h"
#import "OFFileIRIHandler.h"
#import "OFOutOfRangeException.h"
int _OFString_PathAdditions_reference;
@implementation OFString (PathAdditions)
+ (OFString *)pathWithComponents: (OFArray *)components
|
︙ | | |
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
|
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
|
-
+
-
+
-
+
-
+
|
} else
return [self stringByAppendingFormat: @".%@", extension];
}
- (bool)of_isDirectoryPath
{
return ([self hasSuffix: @"/"] ||
[OFFileURIHandler of_directoryExistsAtPath: self]);
[OFFileIRIHandler of_directoryExistsAtPath: self]);
}
- (OFString *)of_pathToURIPathWithPercentEncodedHost:
- (OFString *)of_pathToIRIPathWithPercentEncodedHost:
(OFString **)percentEncodedHost
{
return [@"/" stringByAppendingString: self];
}
- (OFString *)of_URIPathToPathWithPercentEncodedHost:
- (OFString *)of_IRIPathToPathWithPercentEncodedHost:
(OFString *)percentEncodedHost
{
OFString *path = self;
if (path.length > 1 && [path hasSuffix: @"/"])
path = [path substringToIndex: path.length - 1];
return [path substringFromIndex: 1];
}
- (OFString *)of_pathComponentToURIPathComponent
- (OFString *)of_pathComponentToIRIPathComponent
{
return self;
}
@end
|
Modified tests/Makefile
from [90bcdcd287]
to [517e3febc0].
︙ | | |
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
+
|
${OF_BLOCK_TESTS_M} \
OFCharacterSetTests.m \
OFDataTests.m \
OFDateTests.m \
OFDictionaryTests.m \
OFHMACTests.m \
OFINIFileTests.m \
OFIRITests.m \
OFInvocationTests.m \
OFJSONTests.m \
OFListTests.m \
OFLocaleTests.m \
OFMD5HashTests.m \
OFMemoryStreamTests.m \
OFMethodSignatureTests.m \
|
︙ | | |
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
-
|
OFSHA512HashTests.m \
OFScryptTests.m \
OFSerializationTests.m \
OFSetTests.m \
OFStreamTests.m \
OFStringTests.m \
OFSystemInfoTests.m \
OFURITests.m \
OFValueTests.m \
OFXMLElementBuilderTests.m \
OFXMLNodeTests.m \
OFXMLParserTests.m \
RuntimeTests.m \
${RUNTIME_ARC_TESTS_M} \
TestsAppDelegate.m \
|
︙ | | |
Modified tests/OFArrayTests.m
from [cc2ce2f7d0]
to [60972c86ec].
︙ | | |
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
|
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
|
-
-
-
+
+
+
-
-
-
+
+
+
|
valueForKey: @"length"] isEqual:
[arrayClass arrayWithObjects: [OFNumber numberWithInt: 3],
[OFNumber numberWithInt: 3], [OFNumber numberWithInt: 6], nil]] &&
[[[arrayClass arrayWithObjects: @"1", @"2", nil]
valueForKey: @"@count"] isEqual: [OFNumber numberWithInt: 2]])
mutableArray1 = [mutableArrayClass arrayWithObjects:
[OFMutableURI URIWithString: @"http://foo.bar/"],
[OFMutableURI URIWithString: @"http://bar.qux/"],
[OFMutableURI URIWithString: @"http://qux.quxqux/"], nil];
[OFMutableIRI IRIWithString: @"http://foo.bar/"],
[OFMutableIRI IRIWithString: @"http://bar.qux/"],
[OFMutableIRI IRIWithString: @"http://qux.quxqux/"], nil];
TEST(@"-[setValue:forKey:]",
R([mutableArray1 setValue: [OFNumber numberWithShort: 1234]
forKey: @"port"]) &&
[mutableArray1 isEqual: [arrayClass arrayWithObjects:
[OFURI URIWithString: @"http://foo.bar:1234/"],
[OFURI URIWithString: @"http://bar.qux:1234/"],
[OFURI URIWithString: @"http://qux.quxqux:1234/"], nil]])
[OFIRI IRIWithString: @"http://foo.bar:1234/"],
[OFIRI IRIWithString: @"http://bar.qux:1234/"],
[OFIRI IRIWithString: @"http://qux.quxqux:1234/"], nil]])
objc_autoreleasePoolPop(pool);
}
- (void)arrayTests
{
module = @"OFArray";
|
︙ | | |
Modified tests/OFHMACTests.m
from [dc8ace4048]
to [7899f615bb].
︙ | | |
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
-
-
+
+
|
"\x61\xB3\xF9\x1A\xE3\x09\x43\xA6\x5B\x85\xB1\x50\x5B\xCB\x1A\x2E"
"\xB7\xE8\x87\xC1\x73\x19\x63\xF6\xA2\x91\x8D\x7E\x2E\xCC\xEC\x99";
@implementation TestsAppDelegate (OFHMACTests)
- (void)HMACTests
{
void *pool = objc_autoreleasePoolPush();
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
OFHMAC *HMACMD5, *HMACSHA1, *HMACRMD160;
OFHMAC *HMACSHA256, *HMACSHA384, *HMACSHA512;
TEST(@"+[HMACWithHashClass:] with MD5",
(HMACMD5 = [OFHMAC HMACWithHashClass: [OFMD5Hash class]
allowsSwappableMemory: true]))
TEST(@"+[HMACWithHashClass:] with SHA-1",
|
︙ | | |
Modified tests/OFHTTPClientTests.m
from [64ad652a21]
to [d6825e4ddf].
︙ | | |
97
98
99
100
101
102
103
104
105
106
107
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
|
97
98
99
100
101
102
103
104
105
106
107
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
|
-
+
-
+
-
+
|
[[OFRunLoop mainRunLoop] stop];
}
- (void)HTTPClientTests
{
void *pool = objc_autoreleasePoolPush();
HTTPClientTestsServer *server;
OFURI *URI;
OFIRI *IRI;
OFHTTPClient *client;
OFHTTPRequest *request;
OFData *data;
condition = [OFCondition condition];
[condition lock];
server = [[[HTTPClientTestsServer alloc] init] autorelease];
server.supportsSockets = true;
[server start];
[condition wait];
[condition unlock];
URI = [OFURI URIWithString:
IRI = [OFIRI IRIWithString:
[OFString stringWithFormat: @"http://127.0.0.1:%" @PRIu16 "/foo",
server->_port]];
TEST(@"-[asyncPerformRequest:]",
(client = [OFHTTPClient client]) && (client.delegate = self) &&
(request = [OFHTTPRequest requestWithURI: URI]) &&
(request = [OFHTTPRequest requestWithIRI: IRI]) &&
(request.headers =
[OFDictionary dictionaryWithObject: @"5"
forKey: @"Content-Length"]) &&
R([client asyncPerformRequest: request]))
[[OFRunLoop mainRunLoop] runUntilDate:
[OFDate dateWithTimeIntervalSinceNow: 2]];
|
︙ | | |
Modified tests/OFHTTPCookieManagerTests.m
from [fc980e6e00]
to [fb9851a004].
︙ | | |
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
-
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
|
static OFString *const module = @"OFHTTPCookieManager";
@implementation TestsAppDelegate (OFHTTPCookieManagerTests)
- (void)HTTPCookieManagerTests
{
void *pool = objc_autoreleasePoolPush();
OFHTTPCookieManager *manager = [OFHTTPCookieManager manager];
OFURI *URI1, *URI2, *URI3, *URI4;
OFIRI *IRI1, *IRI2, *IRI3, *IRI4;
OFHTTPCookie *cookie1, *cookie2, *cookie3, *cookie4, *cookie5;
URI1 = [OFURI URIWithString: @"http://nil.im/foo"];
URI2 = [OFURI URIWithString: @"https://nil.im/foo/bar"];
URI3 = [OFURI URIWithString: @"https://test.nil.im/foo/bar"];
URI4 = [OFURI URIWithString: @"http://webkeks.org/foo/bar"];
IRI1 = [OFIRI IRIWithString: @"http://nil.im/foo"];
IRI2 = [OFIRI IRIWithString: @"https://nil.im/foo/bar"];
IRI3 = [OFIRI IRIWithString: @"https://test.nil.im/foo/bar"];
IRI4 = [OFIRI IRIWithString: @"http://webkeks.org/foo/bar"];
cookie1 = [OFHTTPCookie cookieWithName: @"test"
value: @"1"
domain: @"nil.im"];
TEST(@"-[addCookie:forURI:] #1",
R([manager addCookie: cookie1 forURI: URI1]))
TEST(@"-[addCookie:forIRI:] #1",
R([manager addCookie: cookie1 forIRI: IRI1]))
TEST(@"-[cookiesForURI:] #1",
[[manager cookiesForURI: URI1] isEqual:
TEST(@"-[cookiesForIRI:] #1",
[[manager cookiesForIRI: IRI1] isEqual:
[OFArray arrayWithObject: cookie1]])
cookie2 = [OFHTTPCookie cookieWithName: @"test"
value: @"2"
domain: @"webkeks.org"];
TEST(@"-[addCookie:forURI:] #2",
R([manager addCookie: cookie2 forURI: URI1]))
TEST(@"-[addCookie:forIRI:] #2",
R([manager addCookie: cookie2 forIRI: IRI1]))
TEST(@"-[cookiesForURI:] #2",
[[manager cookiesForURI: URI1] isEqual:
TEST(@"-[cookiesForIRI:] #2",
[[manager cookiesForIRI: IRI1] isEqual:
[OFArray arrayWithObject: cookie1]] &&
[[manager cookiesForURI: URI4] isEqual: [OFArray array]])
[[manager cookiesForIRI: IRI4] isEqual: [OFArray array]])
cookie3 = [OFHTTPCookie cookieWithName: @"test"
value: @"3"
domain: @"nil.im"];
cookie3.secure = true;
TEST(@"-[addCookie:forURI:] #3",
R([manager addCookie: cookie3 forURI: URI2]))
TEST(@"-[addCookie:forIRI:] #3",
R([manager addCookie: cookie3 forIRI: IRI2]))
TEST(@"-[cookiesForURI:] #3",
[[manager cookiesForURI: URI2] isEqual:
TEST(@"-[cookiesForIRI:] #3",
[[manager cookiesForIRI: IRI2] isEqual:
[OFArray arrayWithObject: cookie3]] &&
[[manager cookiesForURI: URI1] isEqual: [OFArray array]])
[[manager cookiesForIRI: IRI1] isEqual: [OFArray array]])
cookie3.expires = [OFDate dateWithTimeIntervalSinceNow: -1];
cookie4 = [OFHTTPCookie cookieWithName: @"test"
value: @"4"
domain: @"nil.im"];
cookie4.domain = @".nil.im";
TEST(@"-[addCookie:forURI:] #4",
R([manager addCookie: cookie4 forURI: URI2]))
TEST(@"-[addCookie:forIRI:] #4",
R([manager addCookie: cookie4 forIRI: IRI2]))
TEST(@"-[cookiesForURI:] #4",
[[manager cookiesForURI: URI2] isEqual:
TEST(@"-[cookiesForIRI:] #4",
[[manager cookiesForIRI: IRI2] isEqual:
[OFArray arrayWithObject: cookie4]] &&
[[manager cookiesForURI: URI3] isEqual:
[[manager cookiesForIRI: IRI3] isEqual:
[OFArray arrayWithObject: cookie4]])
cookie5 = [OFHTTPCookie cookieWithName: @"bar"
value: @"5"
domain: @"test.nil.im"];
TEST(@"-[addCookie:forURI:] #5",
R([manager addCookie: cookie5 forURI: URI1]))
TEST(@"-[addCookie:forIRI:] #5",
R([manager addCookie: cookie5 forIRI: IRI1]))
TEST(@"-[cookiesForURI:] #5",
[[manager cookiesForURI: URI1] isEqual:
TEST(@"-[cookiesForIRI:] #5",
[[manager cookiesForIRI: IRI1] isEqual:
[OFArray arrayWithObject: cookie4]] &&
[[manager cookiesForURI: URI3] isEqual:
[[manager cookiesForIRI: IRI3] isEqual:
[OFArray arrayWithObjects: cookie4, cookie5, nil]])
TEST(@"-[purgeExpiredCookies]",
[manager.cookies isEqual:
[OFArray arrayWithObjects: cookie3, cookie4, cookie5, nil]] &&
R([manager purgeExpiredCookies]) &&
[manager.cookies isEqual:
[OFArray arrayWithObjects: cookie4, cookie5, nil]])
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/OFHTTPCookieTests.m
from [beb8a32ced]
to [01656ca976].
︙ | | |
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
static OFString *const module = @"OFHTTPCookie";
@implementation TestsAppDelegate (OFHTTPCookieTests)
- (void)HTTPCookieTests
{
void *pool = objc_autoreleasePoolPush();
OFURI *URI = [OFURI URIWithString: @"http://nil.im"];
OFIRI *IRI = [OFIRI IRIWithString: @"http://nil.im"];
OFHTTPCookie *cookie1, *cookie2;
OFArray OF_GENERIC(OFHTTPCookie *) *cookies;
cookie1 = [OFHTTPCookie cookieWithName: @"foo"
value: @"bar"
domain: @"nil.im"];
TEST(@"+[cookiesWithResponseHeaderFields:forURI:] #1",
TEST(@"+[cookiesWithResponseHeaderFields:forIRI:] #1",
[[OFHTTPCookie cookiesWithResponseHeaderFields: [OFDictionary
dictionaryWithObject: @"foo=bar"
forKey: @"Set-Cookie"] forURI: URI]
forKey: @"Set-Cookie"] forIRI: IRI]
isEqual: [OFArray arrayWithObject: cookie1]])
cookie2 = [OFHTTPCookie cookieWithName: @"qux"
value: @"cookie"
domain: @"nil.im"];
TEST(@"+[cookiesWithResponseHeaderFields:forURI:] #2",
TEST(@"+[cookiesWithResponseHeaderFields:forIRI:] #2",
[[OFHTTPCookie cookiesWithResponseHeaderFields: [OFDictionary
dictionaryWithObject: @"foo=bar,qux=cookie"
forKey: @"Set-Cookie"] forURI: URI]
forKey: @"Set-Cookie"] forIRI: IRI]
isEqual: [OFArray arrayWithObjects: cookie1, cookie2, nil]])
cookie1.expires = [OFDate dateWithTimeIntervalSince1970: 1234567890];
cookie2.expires = [OFDate dateWithTimeIntervalSince1970: 1234567890];
cookie1.path = @"/x";
cookie2.domain = @"webkeks.org";
cookie2.path = @"/objfw";
cookie2.secure = true;
cookie2.HTTPOnly = true;
[cookie2.extensions addObject: @"foo"];
[cookie2.extensions addObject: @"bar"];
TEST(@"+[cookiesWithResponseHeaderFields:forURI:] #3",
TEST(@"+[cookiesWithResponseHeaderFields:forIRI:] #3",
[(cookies = [OFHTTPCookie cookiesWithResponseHeaderFields:
[OFDictionary dictionaryWithObject:
@"foo=bar; Expires=Fri, 13 Feb 2009 23:31:30 GMT; Path=/x,"
@"qux=cookie; Expires=Fri, 13 Feb 2009 23:31:30 GMT; "
@"Domain=webkeks.org; Path=/objfw; Secure; HTTPOnly; foo; bar"
forKey: @"Set-Cookie"] forURI: URI]) isEqual:
forKey: @"Set-Cookie"] forIRI: IRI]) isEqual:
[OFArray arrayWithObjects: cookie1, cookie2, nil]])
TEST(@"+[requestHeaderFieldsWithCookies:]",
[[OFHTTPCookie requestHeaderFieldsWithCookies: cookies] isEqual:
[OFDictionary dictionaryWithObject: @"foo=bar; qux=cookie"
forKey: @"Cookie"]])
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/OFINIFileTests.m
from [18e2931d0e]
to [cf313772fa].
︙ | | |
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
-
+
-
+
-
-
-
+
+
+
|
@"[types]\r\n"
@"integer=16\r\n"
@"bool=false\r\n"
@"float=0.25\r\n"
@"array1=foo\r\n"
@"array1=bar\r\n"
@"double=0.75\r\n";
OFURI *URI;
OFIRI *IRI;
OFINIFile *file;
OFINICategory *tests, *foobar, *types;
OFArray *array;
#if defined(OF_HAVE_FILES) && !defined(OF_NINTENDO_DS)
OFURI *writeURI;
OFIRI *writeIRI;
#endif
module = @"OFINIFile";
URI = [OFURI URIWithString: @"embedded:testfile.ini"];
TEST(@"+[fileWithURI:encoding:]",
(file = [OFINIFile fileWithURI: URI
IRI = [OFIRI IRIWithString: @"embedded:testfile.ini"];
TEST(@"+[fileWithIRI:encoding:]",
(file = [OFINIFile fileWithIRI: IRI
encoding: OFStringEncodingCodepage437]))
tests = [file categoryForName: @"tests"];
foobar = [file categoryForName: @"foobar"];
types = [file categoryForName: @"types"];
TEST(@"-[categoryForName:]",
tests != nil && foobar != nil && types != nil)
|
︙ | | |
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
-
-
+
+
-
+
-
+
-
+
|
R([foobar removeValueForKey: @"quxqux "]) &&
R([types removeValueForKey: @"array2"]))
module = @"OFINIFile";
/* FIXME: Find a way to write files on Nintendo DS */
#if defined(OF_HAVE_FILES) && !defined(OF_NINTENDO_DS)
writeURI = [[OFSystemInfo temporaryDirectoryURI]
URIByAppendingPathComponent: @"objfw-tests.ini"
writeIRI = [[OFSystemInfo temporaryDirectoryIRI]
IRIByAppendingPathComponent: @"objfw-tests.ini"
isDirectory: false];
TEST(@"-[writeToFile:encoding:]",
R([file writeToURI: writeURI
R([file writeToIRI: writeIRI
encoding: OFStringEncodingCodepage437]) &&
[[OFString stringWithContentsOfURI: writeURI
[[OFString stringWithContentsOfIRI: writeIRI
encoding: OFStringEncodingCodepage437]
isEqual: output])
[[OFFileManager defaultManager] removeItemAtURI: writeURI];
[[OFFileManager defaultManager] removeItemAtIRI: writeIRI];
#else
(void)output;
#endif
objc_autoreleasePoolPop(pool);
}
@end
|
Renamed and modified
tests/OFURITests.m
[becd53da30]
to tests/OFIRITests.m
[91e81f03e0].
︙ | | |
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
|
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
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
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
|
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
|
* file.
*/
#include "config.h"
#import "TestsAppDelegate.h"
static OFString *const module = @"OFURI";
static OFString *URIString = @"ht+tp://us%3Aer:p%40w@ho%3Ast:1234/"
static OFString *const module = @"OFIRI";
static OFString *IRIString = @"ht+tp://us%3Aer:p%40w@ho%3Ast:1234/"
@"pa%3Fth?que%23ry=1&f%26oo=b%3dar#frag%23ment";
@implementation TestsAppDelegate (OFURITests)
- (void)URITests
@implementation TestsAppDelegate (OFIRITests)
- (void)IRITests
{
void *pool = objc_autoreleasePoolPush();
OFURI *URI1, *URI2, *URI3, *URI4, *URI5, *URI6, *URI7, *URI8, *URI9;
OFURI *URI10, *URI11;
OFMutableURI *mutableURI;
OFIRI *IRI1, *IRI2, *IRI3, *IRI4, *IRI5, *IRI6, *IRI7, *IRI8, *IRI9;
OFIRI *IRI10, *IRI11;
OFMutableIRI *mutableIRI;
TEST(@"+[URIWithString:]",
R(URI1 = [OFURI URIWithString: URIString]) &&
R(URI2 = [OFURI URIWithString: @"http://foo:80"]) &&
R(URI3 = [OFURI URIWithString: @"http://bar/"]) &&
R(URI4 = [OFURI URIWithString: @"file:///etc/passwd"]) &&
R(URI5 = [OFURI URIWithString: @"http://foo/bar/qux/foo%2fbar"]) &&
R(URI6 = [OFURI URIWithString: @"https://[12:34::56:abcd]/"]) &&
R(URI7 = [OFURI URIWithString: @"https://[12:34::56:abcd]:234/"]) &&
R(URI8 = [OFURI URIWithString: @"urn:qux:foo"]) &&
R(URI9 = [OFURI URIWithString: @"file:/foo?query#frag"]) &&
R(URI10 = [OFURI URIWithString: @"file:foo@bar/qux?query#frag"]) &&
R(URI11 = [OFURI URIWithString: @"http://ä/ö?ü"]))
TEST(@"+[IRIWithString:]",
R(IRI1 = [OFIRI IRIWithString: IRIString]) &&
R(IRI2 = [OFIRI IRIWithString: @"http://foo:80"]) &&
R(IRI3 = [OFIRI IRIWithString: @"http://bar/"]) &&
R(IRI4 = [OFIRI IRIWithString: @"file:///etc/passwd"]) &&
R(IRI5 = [OFIRI IRIWithString: @"http://foo/bar/qux/foo%2fbar"]) &&
R(IRI6 = [OFIRI IRIWithString: @"https://[12:34::56:abcd]/"]) &&
R(IRI7 = [OFIRI IRIWithString: @"https://[12:34::56:abcd]:234/"]) &&
R(IRI8 = [OFIRI IRIWithString: @"urn:qux:foo"]) &&
R(IRI9 = [OFIRI IRIWithString: @"file:/foo?query#frag"]) &&
R(IRI10 = [OFIRI IRIWithString: @"file:foo@bar/qux?query#frag"]) &&
R(IRI11 = [OFIRI IRIWithString: @"http://ä/ö?ü"]))
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #1",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #1",
OFInvalidFormatException,
[OFURI URIWithString: @"ht,tp://foo"])
[OFIRI IRIWithString: @"ht,tp://foo"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #2",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #2",
OFInvalidFormatException,
[OFURI URIWithString: @"http://f`oo"])
[OFIRI IRIWithString: @"http://f`oo"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #3",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #3",
OFInvalidFormatException,
[OFURI URIWithString: @"http://foo/`"])
[OFIRI IRIWithString: @"http://foo/`"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #4",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #4",
OFInvalidFormatException,
[OFURI URIWithString: @"http://foo/foo?`"])
[OFIRI IRIWithString: @"http://foo/foo?`"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #5",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #5",
OFInvalidFormatException,
[OFURI URIWithString: @"http://foo/foo?foo#`"])
[OFIRI IRIWithString: @"http://foo/foo?foo#`"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #6",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #6",
OFInvalidFormatException,
[OFURI URIWithString: @"https://[g]/"])
[OFIRI IRIWithString: @"https://[g]/"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #7",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #7",
OFInvalidFormatException,
[OFURI URIWithString: @"https://[f]:/"])
[OFIRI IRIWithString: @"https://[f]:/"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #8",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #8",
OFInvalidFormatException,
[OFURI URIWithString: @"https://[f]:f/"])
[OFIRI IRIWithString: @"https://[f]:f/"])
EXPECT_EXCEPTION(@"+[URIWithString:] fails with invalid characters #9",
EXPECT_EXCEPTION(@"+[IRIWithString:] fails with invalid characters #9",
OFInvalidFormatException,
[OFURI URIWithString: @"foo:"])
[OFIRI IRIWithString: @"foo:"])
TEST(@"+[URIWithString:relativeToURI:]",
[[[OFURI URIWithString: @"/foo" relativeToURI: URI1] string]
TEST(@"+[IRIWithString:relativeToIRI:]",
[[[OFIRI IRIWithString: @"/foo" relativeToIRI: IRI1] string]
isEqual: @"ht+tp://us%3Aer:p%40w@ho%3Ast:1234/foo"] &&
[[[OFURI URIWithString: @"foo/bar?q"
relativeToURI: [OFURI URIWithString: @"http://h/qux/quux"]]
[[[OFIRI IRIWithString: @"foo/bar?q"
relativeToIRI: [OFIRI IRIWithString: @"http://h/qux/quux"]]
string] isEqual: @"http://h/qux/foo/bar?q"] &&
[[[OFURI URIWithString: @"foo/bar"
relativeToURI: [OFURI URIWithString: @"http://h/qux/?x"]]
[[[OFIRI IRIWithString: @"foo/bar"
relativeToIRI: [OFIRI IRIWithString: @"http://h/qux/?x"]]
string] isEqual: @"http://h/qux/foo/bar"] &&
[[[OFURI URIWithString: @"http://foo/?q"
relativeToURI: URI1] string] isEqual: @"http://foo/?q"] &&
[[[OFURI URIWithString: @"foo"
relativeToURI: [OFURI URIWithString: @"http://foo/bar"]]
[[[OFIRI IRIWithString: @"http://foo/?q"
relativeToIRI: IRI1] string] isEqual: @"http://foo/?q"] &&
[[[OFIRI IRIWithString: @"foo"
relativeToIRI: [OFIRI IRIWithString: @"http://foo/bar"]]
string] isEqual: @"http://foo/foo"] &&
[[[OFURI URIWithString: @"foo"
relativeToURI: [OFURI URIWithString: @"http://foo"]]
[[[OFIRI IRIWithString: @"foo"
relativeToIRI: [OFIRI IRIWithString: @"http://foo"]]
string] isEqual: @"http://foo/foo"])
EXPECT_EXCEPTION(
@"+[URIWithString:relativeToURI:] fails with invalid characters #1",
@"+[IRIWithString:relativeToIRI:] fails with invalid characters #1",
OFInvalidFormatException,
[OFURI URIWithString: @"`" relativeToURI: URI1])
[OFIRI IRIWithString: @"`" relativeToIRI: IRI1])
EXPECT_EXCEPTION(
@"+[URIWithString:relativeToURI:] fails with invalid characters #2",
@"+[IRIWithString:relativeToIRI:] fails with invalid characters #2",
OFInvalidFormatException,
[OFURI URIWithString: @"/`" relativeToURI: URI1])
[OFIRI IRIWithString: @"/`" relativeToIRI: IRI1])
EXPECT_EXCEPTION(
@"+[URIWithString:relativeToURI:] fails with invalid characters #3",
@"+[IRIWithString:relativeToIRI:] fails with invalid characters #3",
OFInvalidFormatException,
[OFURI URIWithString: @"?`" relativeToURI: URI1])
[OFIRI IRIWithString: @"?`" relativeToIRI: IRI1])
EXPECT_EXCEPTION(
@"+[URIWithString:relativeToURI:] fails with invalid characters #4",
@"+[IRIWithString:relativeToIRI:] fails with invalid characters #4",
OFInvalidFormatException,
[OFURI URIWithString: @"#`" relativeToURI: URI1])
[OFIRI IRIWithString: @"#`" relativeToIRI: IRI1])
#ifdef OF_HAVE_FILES
TEST(@"+[fileURIWithPath:]",
[[[OFURI fileURIWithPath: @"testfile.txt"] fileSystemRepresentation]
TEST(@"+[fileIRIWithPath:]",
[[[OFIRI fileIRIWithPath: @"testfile.txt"] fileSystemRepresentation]
isEqual: [[OFFileManager defaultManager].currentDirectoryPath
stringByAppendingPathComponent: @"testfile.txt"]])
# if defined(OF_WINDOWS) || defined(OF_MSDOS)
OFURI *tmp;
TEST(@"+[fileURIWithPath:] for c:\\",
(tmp = [OFURI fileURIWithPath: @"c:\\"]) &&
OFIRI *tmp;
TEST(@"+[fileIRIWithPath:] for c:\\",
(tmp = [OFIRI fileIRIWithPath: @"c:\\"]) &&
[tmp.string isEqual: @"file:/c:/"] &&
[tmp.fileSystemRepresentation isEqual: @"c:\\"])
# endif
# ifdef OF_WINDOWS
TEST(@"+[fileURIWithPath:] with UNC",
(tmp = [OFURI fileURIWithPath: @"\\\\foo\\bar"
TEST(@"+[fileIRIWithPath:] with UNC",
(tmp = [OFIRI fileIRIWithPath: @"\\\\foo\\bar"
isDirectory: false]) &&
[tmp.host isEqual: @"foo"] && [tmp.path isEqual: @"/bar"] &&
[tmp.string isEqual: @"file://foo/bar"] &&
[tmp.fileSystemRepresentation isEqual: @"\\\\foo\\bar"] &&
(tmp = [OFURI fileURIWithPath: @"\\\\test" isDirectory: true]) &&
(tmp = [OFIRI fileIRIWithPath: @"\\\\test" isDirectory: true]) &&
[tmp.host isEqual: @"test"] && [tmp.path isEqual: @"/"] &&
[tmp.string isEqual: @"file://test/"] &&
[tmp.fileSystemRepresentation isEqual: @"\\\\test"])
# endif
#endif
TEST(@"-[string]",
[URI1.string isEqual: URIString] &&
[URI2.string isEqual: @"http://foo:80"] &&
[URI3.string isEqual: @"http://bar/"] &&
[URI4.string isEqual: @"file:///etc/passwd"] &&
[URI5.string isEqual: @"http://foo/bar/qux/foo%2fbar"] &&
[URI6.string isEqual: @"https://[12:34::56:abcd]/"] &&
[URI7.string isEqual: @"https://[12:34::56:abcd]:234/"] &&
[URI8.string isEqual: @"urn:qux:foo"] &&
[URI9.string isEqual: @"file:/foo?query#frag"] &&
[URI10.string isEqual: @"file:foo@bar/qux?query#frag"] &&
[URI11.string isEqual: @"http://ä/ö?ü"])
[IRI1.string isEqual: IRIString] &&
[IRI2.string isEqual: @"http://foo:80"] &&
[IRI3.string isEqual: @"http://bar/"] &&
[IRI4.string isEqual: @"file:///etc/passwd"] &&
[IRI5.string isEqual: @"http://foo/bar/qux/foo%2fbar"] &&
[IRI6.string isEqual: @"https://[12:34::56:abcd]/"] &&
[IRI7.string isEqual: @"https://[12:34::56:abcd]:234/"] &&
[IRI8.string isEqual: @"urn:qux:foo"] &&
[IRI9.string isEqual: @"file:/foo?query#frag"] &&
[IRI10.string isEqual: @"file:foo@bar/qux?query#frag"] &&
[IRI11.string isEqual: @"http://ä/ö?ü"])
TEST(@"-[scheme]",
[URI1.scheme isEqual: @"ht+tp"] && [URI4.scheme isEqual: @"file"] &&
[URI9.scheme isEqual: @"file"] && [URI10.scheme isEqual: @"file"] &&
[URI11.scheme isEqual: @"http"])
[IRI1.scheme isEqual: @"ht+tp"] && [IRI4.scheme isEqual: @"file"] &&
[IRI9.scheme isEqual: @"file"] && [IRI10.scheme isEqual: @"file"] &&
[IRI11.scheme isEqual: @"http"])
TEST(@"-[user]", [URI1.user isEqual: @"us:er"] && URI4.user == nil &&
URI10.user == nil && URI11.user == nil)
TEST(@"-[user]", [IRI1.user isEqual: @"us:er"] && IRI4.user == nil &&
IRI10.user == nil && IRI11.user == nil)
TEST(@"-[password]",
[URI1.password isEqual: @"p@w"] && URI4.password == nil &&
URI10.password == nil && URI11.password == nil)
TEST(@"-[host]", [URI1.host isEqual: @"ho:st"] &&
[URI6.host isEqual: @"12:34::56:abcd"] &&
[URI7.host isEqual: @"12:34::56:abcd"] &&
URI8.host == nil && URI9.host == nil && URI10.host == nil &&
[URI11.host isEqual: @"ä"])
TEST(@"-[port]", URI1.port.unsignedShortValue == 1234 &&
[URI4 port] == nil && URI7.port.unsignedShortValue == 234 &&
URI8.port == nil && URI9.port == nil && URI10.port == nil &&
URI11.port == nil)
[IRI1.password isEqual: @"p@w"] && IRI4.password == nil &&
IRI10.password == nil && IRI11.password == nil)
TEST(@"-[host]", [IRI1.host isEqual: @"ho:st"] &&
[IRI6.host isEqual: @"12:34::56:abcd"] &&
[IRI7.host isEqual: @"12:34::56:abcd"] &&
IRI8.host == nil && IRI9.host == nil && IRI10.host == nil &&
[IRI11.host isEqual: @"ä"])
TEST(@"-[port]", IRI1.port.unsignedShortValue == 1234 &&
[IRI4 port] == nil && IRI7.port.unsignedShortValue == 234 &&
IRI8.port == nil && IRI9.port == nil && IRI10.port == nil &&
IRI11.port == nil)
TEST(@"-[path]",
[URI1.path isEqual: @"/pa?th"] &&
[URI4.path isEqual: @"/etc/passwd"] &&
[URI8.path isEqual: @"qux:foo"] &&
[URI9.path isEqual: @"/foo"] &&
[URI10.path isEqual: @"foo@bar/qux"] &&
[URI11.path isEqual: @"/ö"])
[IRI1.path isEqual: @"/pa?th"] &&
[IRI4.path isEqual: @"/etc/passwd"] &&
[IRI8.path isEqual: @"qux:foo"] &&
[IRI9.path isEqual: @"/foo"] &&
[IRI10.path isEqual: @"foo@bar/qux"] &&
[IRI11.path isEqual: @"/ö"])
TEST(@"-[pathComponents]",
[URI1.pathComponents isEqual:
[IRI1.pathComponents isEqual:
[OFArray arrayWithObjects: @"/", @"pa?th", nil]] &&
[URI4.pathComponents isEqual:
[IRI4.pathComponents isEqual:
[OFArray arrayWithObjects: @"/", @"etc", @"passwd", nil]] &&
[URI5.pathComponents isEqual:
[IRI5.pathComponents isEqual:
[OFArray arrayWithObjects: @"/", @"bar", @"qux", @"foo/bar", nil]])
TEST(@"-[lastPathComponent]",
[[[OFURI URIWithString: @"http://host/foo//bar/baz"]
[[[OFIRI IRIWithString: @"http://host/foo//bar/baz"]
lastPathComponent] isEqual: @"baz"] &&
[[[OFURI URIWithString: @"http://host/foo//bar/baz/"]
[[[OFIRI IRIWithString: @"http://host/foo//bar/baz/"]
lastPathComponent] isEqual: @"baz"] &&
[[[OFURI URIWithString: @"http://host/foo/"]
[[[OFIRI IRIWithString: @"http://host/foo/"]
lastPathComponent] isEqual: @"foo"] &&
[[[OFURI URIWithString: @"http://host/"]
[[[OFIRI IRIWithString: @"http://host/"]
lastPathComponent] isEqual: @"/"] &&
[URI5.lastPathComponent isEqual: @"foo/bar"])
[IRI5.lastPathComponent isEqual: @"foo/bar"])
TEST(@"-[query]",
[URI1.query isEqual: @"que#ry=1&f&oo=b=ar"] && URI4.query == nil &&
[URI9.query isEqual: @"query"] && [URI10.query isEqual: @"query"] &&
[URI11.query isEqual: @"ü"])
[IRI1.query isEqual: @"que#ry=1&f&oo=b=ar"] && IRI4.query == nil &&
[IRI9.query isEqual: @"query"] && [IRI10.query isEqual: @"query"] &&
[IRI11.query isEqual: @"ü"])
TEST(@"-[queryItems]",
[URI1.queryItems isEqual: [OFArray arrayWithObjects:
[IRI1.queryItems isEqual: [OFArray arrayWithObjects:
[OFPair pairWithFirstObject: @"que#ry" secondObject: @"1"],
[OFPair pairWithFirstObject: @"f&oo" secondObject: @"b=ar"], nil]]);
TEST(@"-[fragment]",
[URI1.fragment isEqual: @"frag#ment"] && URI4.fragment == nil &&
[URI9.fragment isEqual: @"frag"] &&
[URI10.fragment isEqual: @"frag"])
[IRI1.fragment isEqual: @"frag#ment"] && IRI4.fragment == nil &&
[IRI9.fragment isEqual: @"frag"] &&
[IRI10.fragment isEqual: @"frag"])
TEST(@"-[copy]", R(URI4 = [[URI1 copy] autorelease]))
TEST(@"-[copy]", R(IRI4 = [[IRI1 copy] autorelease]))
TEST(@"-[isEqual:]", [URI1 isEqual: URI4] && ![URI2 isEqual: URI3] &&
[[OFURI URIWithString: @"HTTP://bar/"] isEqual: URI3])
TEST(@"-[isEqual:]", [IRI1 isEqual: IRI4] && ![IRI2 isEqual: IRI3] &&
[[OFIRI IRIWithString: @"HTTP://bar/"] isEqual: IRI3])
TEST(@"-[hash:]", URI1.hash == URI4.hash && URI2.hash != URI3.hash)
TEST(@"-[hash:]", IRI1.hash == IRI4.hash && IRI2.hash != IRI3.hash)
EXPECT_EXCEPTION(@"Detection of invalid format",
OFInvalidFormatException, [OFURI URIWithString: @"http"])
OFInvalidFormatException, [OFIRI IRIWithString: @"http"])
mutableURI = [OFMutableURI URIWithScheme: @"dummy"];
mutableIRI = [OFMutableIRI IRIWithScheme: @"dummy"];
EXPECT_EXCEPTION(
@"-[setPercentEncodedScheme:] with invalid characters fails",
OFInvalidFormatException, mutableURI.scheme = @"%20")
OFInvalidFormatException, mutableIRI.scheme = @"%20")
TEST(@"-[setHost:]",
(mutableURI.host = @"ho:st") &&
[mutableURI.percentEncodedHost isEqual: @"ho%3Ast"] &&
(mutableURI.host = @"12:34:ab") &&
[mutableURI.percentEncodedHost isEqual: @"[12:34:ab]"] &&
(mutableURI.host = @"12:34:aB") &&
[mutableURI.percentEncodedHost isEqual: @"[12:34:aB]"] &&
(mutableURI.host = @"12:34:g") &&
[mutableURI.percentEncodedHost isEqual: @"12%3A34%3Ag"])
(mutableIRI.host = @"ho:st") &&
[mutableIRI.percentEncodedHost isEqual: @"ho%3Ast"] &&
(mutableIRI.host = @"12:34:ab") &&
[mutableIRI.percentEncodedHost isEqual: @"[12:34:ab]"] &&
(mutableIRI.host = @"12:34:aB") &&
[mutableIRI.percentEncodedHost isEqual: @"[12:34:aB]"] &&
(mutableIRI.host = @"12:34:g") &&
[mutableIRI.percentEncodedHost isEqual: @"12%3A34%3Ag"])
TEST(@"-[setPercentEncodedHost:]",
(mutableURI.percentEncodedHost = @"ho%3Ast") &&
[mutableURI.host isEqual: @"ho:st"] &&
(mutableURI.percentEncodedHost = @"[12:34]") &&
[mutableURI.host isEqual: @"12:34"] &&
(mutableURI.percentEncodedHost = @"[12::ab]") &&
[mutableURI.host isEqual: @"12::ab"])
(mutableIRI.percentEncodedHost = @"ho%3Ast") &&
[mutableIRI.host isEqual: @"ho:st"] &&
(mutableIRI.percentEncodedHost = @"[12:34]") &&
[mutableIRI.host isEqual: @"12:34"] &&
(mutableIRI.percentEncodedHost = @"[12::ab]") &&
[mutableIRI.host isEqual: @"12::ab"])
EXPECT_EXCEPTION(
@"-[setPercentEncodedHost:] with invalid characters fails #1",
OFInvalidFormatException,
mutableURI.percentEncodedHost = @"/")
mutableIRI.percentEncodedHost = @"/")
EXPECT_EXCEPTION(
@"-[setPercentEncodedHost:] with invalid characters fails #2",
OFInvalidFormatException,
mutableURI.percentEncodedHost = @"[12:34")
mutableIRI.percentEncodedHost = @"[12:34")
EXPECT_EXCEPTION(
@"-[setPercentEncodedHost:] with invalid characters fails #3",
OFInvalidFormatException,
mutableURI.percentEncodedHost = @"[a::g]")
mutableIRI.percentEncodedHost = @"[a::g]")
TEST(@"-[setUser:]",
(mutableURI.user = @"us:er") &&
[mutableURI.percentEncodedUser isEqual: @"us%3Aer"])
(mutableIRI.user = @"us:er") &&
[mutableIRI.percentEncodedUser isEqual: @"us%3Aer"])
TEST(@"-[setPercentEncodedUser:]",
(mutableURI.percentEncodedUser = @"us%3Aer") &&
[mutableURI.user isEqual: @"us:er"])
(mutableIRI.percentEncodedUser = @"us%3Aer") &&
[mutableIRI.user isEqual: @"us:er"])
EXPECT_EXCEPTION(
@"-[setPercentEncodedUser:] with invalid characters fails",
OFInvalidFormatException,
mutableURI.percentEncodedHost = @"/")
mutableIRI.percentEncodedHost = @"/")
TEST(@"-[setPassword:]",
(mutableURI.password = @"pass:word") &&
[mutableURI.percentEncodedPassword isEqual: @"pass%3Aword"])
(mutableIRI.password = @"pass:word") &&
[mutableIRI.percentEncodedPassword isEqual: @"pass%3Aword"])
TEST(@"-[setPercentEncodedPassword:]",
(mutableURI.percentEncodedPassword = @"pass%3Aword") &&
[mutableURI.password isEqual: @"pass:word"])
(mutableIRI.percentEncodedPassword = @"pass%3Aword") &&
[mutableIRI.password isEqual: @"pass:word"])
EXPECT_EXCEPTION(
@"-[setPercentEncodedPassword:] with invalid characters fails",
OFInvalidFormatException,
mutableURI.percentEncodedPassword = @"/")
mutableIRI.percentEncodedPassword = @"/")
TEST(@"-[setPath:]",
(mutableURI.path = @"pa/th@?") &&
[mutableURI.percentEncodedPath isEqual: @"pa/th@%3F"])
(mutableIRI.path = @"pa/th@?") &&
[mutableIRI.percentEncodedPath isEqual: @"pa/th@%3F"])
TEST(@"-[setPercentEncodedPath:]",
(mutableURI.percentEncodedPath = @"pa/th@%3F") &&
[mutableURI.path isEqual: @"pa/th@?"])
(mutableIRI.percentEncodedPath = @"pa/th@%3F") &&
[mutableIRI.path isEqual: @"pa/th@?"])
EXPECT_EXCEPTION(
@"-[setPercentEncodedPath:] with invalid characters fails",
OFInvalidFormatException,
mutableURI.percentEncodedPath = @"?")
mutableIRI.percentEncodedPath = @"?")
TEST(@"-[setQuery:]",
(mutableURI.query = @"que/ry?#") &&
[mutableURI.percentEncodedQuery isEqual: @"que/ry?%23"])
(mutableIRI.query = @"que/ry?#") &&
[mutableIRI.percentEncodedQuery isEqual: @"que/ry?%23"])
TEST(@"-[setPercentEncodedQuery:]",
(mutableURI.percentEncodedQuery = @"que/ry?%23") &&
[mutableURI.query isEqual: @"que/ry?#"])
(mutableIRI.percentEncodedQuery = @"que/ry?%23") &&
[mutableIRI.query isEqual: @"que/ry?#"])
EXPECT_EXCEPTION(
@"-[setPercentEncodedQuery:] with invalid characters fails",
OFInvalidFormatException,
mutableURI.percentEncodedQuery = @"`")
mutableIRI.percentEncodedQuery = @"`")
TEST(@"-[setQueryItems:]",
(mutableURI.queryItems = [OFArray arrayWithObjects:
(mutableIRI.queryItems = [OFArray arrayWithObjects:
[OFPair pairWithFirstObject: @"foo&bar" secondObject: @"baz=qux"],
[OFPair pairWithFirstObject: @"f=oobar" secondObject: @"b&azqux"],
nil]) && [mutableURI.percentEncodedQuery isEqual:
nil]) && [mutableIRI.percentEncodedQuery isEqual:
@"foo%26bar=baz%3Dqux&f%3Doobar=b%26azqux"])
TEST(@"-[setFragment:]",
(mutableURI.fragment = @"frag/ment?#") &&
[mutableURI.percentEncodedFragment isEqual: @"frag/ment?%23"])
(mutableIRI.fragment = @"frag/ment?#") &&
[mutableIRI.percentEncodedFragment isEqual: @"frag/ment?%23"])
TEST(@"-[setPercentEncodedFragment:]",
(mutableURI.percentEncodedFragment = @"frag/ment?%23") &&
[mutableURI.fragment isEqual: @"frag/ment?#"])
(mutableIRI.percentEncodedFragment = @"frag/ment?%23") &&
[mutableIRI.fragment isEqual: @"frag/ment?#"])
EXPECT_EXCEPTION(
@"-[setPercentEncodedFragment:] with invalid characters fails",
OFInvalidFormatException,
mutableURI.percentEncodedFragment = @"`")
mutableIRI.percentEncodedFragment = @"`")
TEST(@"-[URIByAppendingPathComponent:isDirectory:]",
[[[OFURI URIWithString: @"file:///foo/bar"]
URIByAppendingPathComponent: @"qux" isDirectory: false] isEqual:
[OFURI URIWithString: @"file:///foo/bar/qux"]] &&
[[[OFURI URIWithString: @"file:///foo/bar/"]
URIByAppendingPathComponent: @"qux" isDirectory: false] isEqual:
[OFURI URIWithString: @"file:///foo/bar/qux"]] &&
[[[OFURI URIWithString: @"file:///foo/bar/"]
URIByAppendingPathComponent: @"qu?x" isDirectory: false] isEqual:
[OFURI URIWithString: @"file:///foo/bar/qu%3Fx"]] &&
[[[OFURI URIWithString: @"file:///foo/bar/"]
URIByAppendingPathComponent: @"qu?x" isDirectory: true] isEqual:
[OFURI URIWithString: @"file:///foo/bar/qu%3Fx/"]])
TEST(@"-[IRIByAppendingPathComponent:isDirectory:]",
[[[OFIRI IRIWithString: @"file:///foo/bar"]
IRIByAppendingPathComponent: @"qux" isDirectory: false] isEqual:
[OFIRI IRIWithString: @"file:///foo/bar/qux"]] &&
[[[OFIRI IRIWithString: @"file:///foo/bar/"]
IRIByAppendingPathComponent: @"qux" isDirectory: false] isEqual:
[OFIRI IRIWithString: @"file:///foo/bar/qux"]] &&
[[[OFIRI IRIWithString: @"file:///foo/bar/"]
IRIByAppendingPathComponent: @"qu?x" isDirectory: false] isEqual:
[OFIRI IRIWithString: @"file:///foo/bar/qu%3Fx"]] &&
[[[OFIRI IRIWithString: @"file:///foo/bar/"]
IRIByAppendingPathComponent: @"qu?x" isDirectory: true] isEqual:
[OFIRI IRIWithString: @"file:///foo/bar/qu%3Fx/"]])
TEST(@"-[URIByStandardizingPath]",
[[[OFURI URIWithString: @"http://foo/bar/.."]
URIByStandardizingPath] isEqual:
[OFURI URIWithString: @"http://foo/"]] &&
[[[OFURI URIWithString: @"http://foo/bar/%2E%2E/../qux/"]
URIByStandardizingPath] isEqual:
[OFURI URIWithString: @"http://foo/bar/qux/"]] &&
[[[OFURI URIWithString: @"http://foo/bar/./././qux/./"]
URIByStandardizingPath] isEqual:
[OFURI URIWithString: @"http://foo/bar/qux/"]] &&
[[[OFURI URIWithString: @"http://foo/bar/../../qux"]
URIByStandardizingPath] isEqual:
[OFURI URIWithString: @"http://foo/../qux"]])
TEST(@"-[IRIByStandardizingPath]",
[[[OFIRI IRIWithString: @"http://foo/bar/.."]
IRIByStandardizingPath] isEqual:
[OFIRI IRIWithString: @"http://foo/"]] &&
[[[OFIRI IRIWithString: @"http://foo/bar/%2E%2E/../qux/"]
IRIByStandardizingPath] isEqual:
[OFIRI IRIWithString: @"http://foo/bar/qux/"]] &&
[[[OFIRI IRIWithString: @"http://foo/bar/./././qux/./"]
IRIByStandardizingPath] isEqual:
[OFIRI IRIWithString: @"http://foo/bar/qux/"]] &&
[[[OFIRI IRIWithString: @"http://foo/bar/../../qux"]
IRIByStandardizingPath] isEqual:
[OFIRI IRIWithString: @"http://foo/../qux"]])
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/OFMD5HashTests.m
from [5005b07061]
to [a073bdebb4].
︙ | | |
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
-
-
+
+
|
"\x00\x8B\x9D\x1B\x58\xDF\xF8\xFE\xEE\xF3\xAE\x8D\xBB\x68\x2D\x38";
@implementation TestsAppDelegate (OFMD5HashTests)
- (void)MD5HashTests
{
void *pool = objc_autoreleasePoolPush();
OFMD5Hash *MD5, *MD5Copy;
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(MD5 = [OFMD5Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
size_t length = [file readIntoBuffer: buffer length: 64];
|
︙ | | |
Modified tests/OFRIPEMD160HashTests.m
from [c46510efe0]
to [3fe936d99c].
︙ | | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
-
-
+
+
|
"\xE6\x08\x8B";
@implementation TestsAppDelegate (OFRIPEMD160HashTests)
- (void)RIPEMD160HashTests
{
void *pool = objc_autoreleasePoolPush();
OFRIPEMD160Hash *RIPEMD160, *RIPEMD160Copy;
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(RIPEMD160 = [OFRIPEMD160Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
size_t length = [file readIntoBuffer: buffer length: 64];
|
︙ | | |
Modified tests/OFSHA1HashTests.m
from [76d8541713]
to [05362d2397].
︙ | | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
-
-
+
+
|
"\x94\xE7\x17";
@implementation TestsAppDelegate (SHA1HashTests)
- (void)SHA1HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA1Hash *SHA1, *SHA1Copy;
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA1 = [OFSHA1Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
size_t length = [file readIntoBuffer: buffer length: 64];
|
︙ | | |
Modified tests/OFSHA224HashTests.m
from [a723282b7a]
to [690dd2b8b3].
︙ | | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
-
-
+
+
|
"\x5F\x4F\x20\x02\x4D\x15\xED\x1C\x61\x1F\xF7";
@implementation TestsAppDelegate (SHA224HashTests)
- (void)SHA224HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA224Hash *SHA224, *SHA224Copy;
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA224 = [OFSHA224Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
size_t length = [file readIntoBuffer: buffer length: 64];
|
︙ | | |
Modified tests/OFSHA256HashTests.m
from [ea4a5936cb]
to [b725fbd32b].
︙ | | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
-
-
+
+
|
"\x67\x93\x8F\x0F\x44\x90\xB8\xF5\x35\x89\xF0\x5A\x23\x7F\x69";
@implementation TestsAppDelegate (SHA256HashTests)
- (void)SHA256HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA256Hash *SHA256, *SHA256Copy;
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA256 = [OFSHA256Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[64];
size_t length = [file readIntoBuffer: buffer length: 64];
|
︙ | | |
Modified tests/OFSHA384HashTests.m
from [4335e4cd7c]
to [87ddf9bb8c].
︙ | | |
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
-
-
+
+
|
"\xE9\x1A\xB3\x51\x70\x8C\x1F\x3F\x56\x12\x44\x01\x91\x54";
@implementation TestsAppDelegate (SHA384HashTests)
- (void)SHA384HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA384Hash *SHA384, *SHA384Copy;
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA384 = [OFSHA384Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[128];
size_t length = [file readIntoBuffer: buffer length: 128];
|
︙ | | |
Modified tests/OFSHA512HashTests.m
from [9748b0700b]
to [178e7d8afd].
︙ | | |
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
-
-
+
+
|
"\xA1\x8A\x41\x64\x33\x69\x21\x8C\x2A\x44\x6D\xF2\xA0";
@implementation TestsAppDelegate (SHA512HashTests)
- (void)SHA512HashTests
{
void *pool = objc_autoreleasePoolPush();
OFSHA512Hash *SHA512, *SHA512Copy;
OFURI *URI = [OFURI URIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFURIHandler openItemAtURI: URI mode: @"r"];
OFIRI *IRI = [OFIRI IRIWithString: @"embedded:testfile.bin"];
OFStream *file = [OFIRIHandler openItemAtIRI: IRI mode: @"r"];
TEST(@"+[hashWithAllowsSwappableMemory:]",
(SHA512 = [OFSHA512Hash hashWithAllowsSwappableMemory: true]))
while (!file.atEndOfStream) {
char buffer[128];
size_t length = [file readIntoBuffer: buffer length: 128];
|
︙ | | |
Modified tests/OFSerializationTests.m
from [d36329ce8f]
to [622eefb6e4].
︙ | | |
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
-
+
-
-
+
+
|
[array addObject: [OFDate dateWithTimeIntervalSince1970: 1234.5678]];
[dict setObject: @"Hello" forKey: array];
[dict setObject: @"B\"la" forKey: @"Blub"];
[list appendObject: @"Hello"];
[list appendObject: @"Wo\rld!\nHow are you?"];
[list appendObject: [OFURI URIWithString: @"https://objfw.nil.im/"]];
[list appendObject: [OFIRI IRIWithString: @"https://objfw.nil.im/"]];
[list appendObject:
[OFXMLElement elementWithXMLString: @"<x><y/><![CDATA[<]]></x>"]];
[list appendObject:
[OFSet setWithObjects: @"foo", @"foo", @"bar", nil]];
[list appendObject:
[OFCountedSet setWithObjects: @"foo", @"foo", @"bar", nil]];
[dict setObject: @"list" forKey: list];
data = [OFData dataWithItems: "0123456789:;<ABCDEFGHJIKLMNOPQRSTUVWXYZ"
count: 39];
[dict setObject: @"data" forKey: data];
UUID = [OFUUID
UUIDWithUUIDString: @"01234567-89AB-CDEF-FEDC-BA9876543210"];
[dict setObject: @"uuid" forKey: UUID];
TEST(@"-[stringBySerializing]",
(string = dict.stringBySerializing) && [string isEqual:
[OFString stringWithContentsOfURI:
[OFURI URIWithString: @"embedded:serialization.xml"]]])
[OFString stringWithContentsOfIRI:
[OFIRI IRIWithString: @"embedded:serialization.xml"]]])
TEST(@"-[objectByDeserializing]",
[string.objectByDeserializing isEqual: dict])
objc_autoreleasePoolPop(pool);
}
@end
|
Modified tests/OFStringTests.m
from [10adf25aaa]
to [c838f881ff].
︙ | | |
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
|
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
|
-
-
+
+
|
#ifdef OF_HAVE_FILES
TEST(@"+[stringWithContentsOfFile:encoding]", (string = [stringClass
stringWithContentsOfFile: @"testfile.txt"
encoding: OFStringEncodingISO8859_1]) &&
[string isEqual: @"testäöü"])
TEST(@"+[stringWithContentsOfURI:encoding]", (string = [stringClass
stringWithContentsOfURI: [OFURI fileURIWithPath: @"testfile.txt"]
TEST(@"+[stringWithContentsOfIRI:encoding]", (string = [stringClass
stringWithContentsOfIRI: [OFIRI fileIRIWithPath: @"testfile.txt"]
encoding: OFStringEncodingISO8859_1]) &&
[string isEqual: @"testäöü"])
#endif
TEST(@"-[appendUTFString:length:]",
R([mutableString1 appendUTF8String: "\xEF\xBB\xBF" "barqux"
length: 6]) &&
|
︙ | | |
Modified tests/OFSystemInfoTests.m
from [5b9edfd152]
to [b1b4f2e37e].
︙ | | |
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
-
-
+
+
-
-
+
+
-
-
+
+
|
[OFStdOut writeFormat: @"[OFSystemInfo] Operating system name: %@\n",
[OFSystemInfo operatingSystemName]];
[OFStdOut writeFormat:
@"[OFSystemInfo] Operating system version: %@\n",
[OFSystemInfo operatingSystemVersion]];
[OFStdOut writeFormat: @"[OFSystemInfo] User config URI: %@\n",
[OFSystemInfo userConfigURI].string];
[OFStdOut writeFormat: @"[OFSystemInfo] User config IRI: %@\n",
[OFSystemInfo userConfigIRI].string];
[OFStdOut writeFormat: @"[OFSystemInfo] User data URI: %@\n",
[OFSystemInfo userDataURI].string];
[OFStdOut writeFormat: @"[OFSystemInfo] User data IRI: %@\n",
[OFSystemInfo userDataIRI].string];
[OFStdOut writeFormat: @"[OFSystemInfo] Temporary directory URI: %@\n",
[OFSystemInfo temporaryDirectoryURI].string];
[OFStdOut writeFormat: @"[OFSystemInfo] Temporary directory IRI: %@\n",
[OFSystemInfo temporaryDirectoryIRI].string];
[OFStdOut writeFormat: @"[OFSystemInfo] CPU vendor: %@\n",
[OFSystemInfo CPUVendor]];
[OFStdOut writeFormat: @"[OFSystemInfo] CPU model: %@\n",
[OFSystemInfo CPUModel]];
|
︙ | | |
Modified tests/OFUNIXDatagramSocketTests.m
from [61f9f2c60c]
to [a1b7bb0a63].
︙ | | |
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
-
-
+
+
-
+
|
void *pool = objc_autoreleasePoolPush();
OFString *path;
OFUNIXDatagramSocket *sock;
OFSocketAddress address1, address2;
char buffer[5];
#if defined(OF_HAVE_FILES) && !defined(OF_IOS)
path = [[OFSystemInfo temporaryDirectoryURI]
URIByAppendingPathComponent: [[OFUUID UUID] UUIDString]]
path = [[OFSystemInfo temporaryDirectoryIRI]
IRIByAppendingPathComponent: [[OFUUID UUID] UUIDString]]
.fileSystemRepresentation;
#else
/*
* We can have sockets, including UNIX sockets, while file support is
* disabled.
*
* We also use this code path for iOS, as the temporaryDirectoryURI is
* We also use this code path for iOS, as the temporaryDirectoryIRI is
* too long on the iOS simulator.
*/
path = [OFString stringWithFormat: @"/tmp/%@",
[[OFUUID UUID] UUIDString]];
#endif
TEST(@"+[socket]", (sock = [OFUNIXDatagramSocket socket]))
|
︙ | | |
Modified tests/OFUNIXStreamSocketTests.m
from [cebf3c029f]
to [285815f0a8].
︙ | | |
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
-
-
+
+
-
+
|
{
void *pool = objc_autoreleasePoolPush();
OFString *path;
OFUNIXStreamSocket *sockClient, *sockServer, *sockAccepted;
char buffer[5];
#if defined(OF_HAVE_FILES) && !defined(OF_IOS)
path = [[OFSystemInfo temporaryDirectoryURI]
URIByAppendingPathComponent: [[OFUUID UUID] UUIDString]]
path = [[OFSystemInfo temporaryDirectoryIRI]
IRIByAppendingPathComponent: [[OFUUID UUID] UUIDString]]
.fileSystemRepresentation;
#else
/*
* We can have sockets, including UNIX sockets, while file support is
* disabled.
*
* We also use this code path for iOS, as the temporaryDirectoryURI is
* We also use this code path for iOS, as the temporaryDirectory:RI is
* too long on the iOS simulator.
*/
path = [OFString stringWithFormat: @"/tmp/%@",
[[OFUUID UUID] UUIDString]];
#endif
TEST(@"+[socket]", (sockClient = [OFUNIXStreamSocket socket]) &&
|
︙ | | |
Modified tests/TestsAppDelegate.h
from [1f4a8a0dc4]
to [a114a42509].
︙ | | |
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
+
+
+
+
|
@interface TestsAppDelegate (OFHTTPCookieManagerTests)
- (void)HTTPCookieManagerTests;
@end
@interface TestsAppDelegate (OFINIFileTests)
- (void)INIFileTests;
@end
@interface TestsAppDelegate (OFIRITests)
- (void)IRITests;
@end
@interface TestsAppDelegate (OFIPXSocketTests)
- (void)IPXSocketTests;
@end
@interface TestsAppDelegate (OFInvocationTests)
- (void)invocationTests;
|
︙ | | |
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
|
263
264
265
266
267
268
269
270
271
272
273
274
275
276
|
-
-
-
-
|
- (void)UNIXDatagramSocketTests;
@end
@interface TestsAppDelegate (OFUNIXStreamSocketTests)
- (void)UNIXStreamSocketTests;
@end
@interface TestsAppDelegate (OFURITests)
- (void)URITests;
@end
@interface TestsAppDelegate (OFValueTests)
- (void)valueTests;
@end
@interface TestsAppDelegate (OFWindowsRegistryKeyTests)
- (void)windowsRegistryKeyTests;
@end
|
︙ | | |
Modified tests/TestsAppDelegate.m
from [07389d44c6]
to [4e486d7e06].
︙ | | |
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
|
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
|
-
+
|
[self DDPSocketTests];
# endif
[self kernelEventObserverTests];
#endif
#ifdef OF_HAVE_THREADS
[self threadTests];
#endif
[self URITests];
[self IRITests];
#if defined(OF_HAVE_SOCKETS) && defined(OF_HAVE_THREADS)
[self HTTPClientTests];
#endif
#ifdef OF_HAVE_SOCKETS
[self HTTPCookieTests];
[self HTTPCookieManagerTests];
#endif
|
︙ | | |
Modified tests/serialization.xml
from [ea3d1a36ad]
to [41f0bf4f05].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
-
+
|
<OFString>B"la</OFString>
</object>
<key>
<OFList>
<OFString>Hello</OFString>
<OFString>Wo
ld!
How are you?</OFString>
<OFURI>https://objfw.nil.im/</OFURI>
<OFIRI>https://objfw.nil.im/</OFIRI>
<OFXMLElement name='x'>
<children>
<OFMutableArray>
<OFXMLElement name='y'/>
<OFXMLCDATA><![CDATA[<]]></OFXMLCDATA>
</OFMutableArray>
</children>
|
︙ | | |
Modified utils/objfw-embed
from [3a281e6a17]
to [9ca9ee2bd1].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
-
+
-
+
|
#!/bin/sh
if test $# != 3; then
echo "Usage: $0 source_file filename output.m" 1>&2
exit 1
fi
exec 1>$3
cat <<EOF
#include <stddef.h>
#include <stdint.h>
#ifdef OF_COMPILING_OBJFW
# import "OFEmbeddedURIHandler.h"
# import "OFEmbeddedIRIHandler.h"
#else
# import <ObjFW/OFEmbeddedURIHandler.h>
# import <ObjFW/OFEmbeddedIRIHandler.h>
#endif
static const uint8_t bytes[] = {
EOF
od -vtx1 $1 | sed -e '/^[^ ][^ ]*$/d;s/ */ /g' -e 's/ $//g;s/^[^ ][^ ]* //' -e 's/ /, 0x/g' -e 's/^/ 0x/' -e 's/$/,/'
cat <<EOF
};
|
︙ | | |
Modified utils/ofarc/OFArc.m
from [448648acfa]
to [08dae94193].
︙ | | |
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
+
-
|
#include <string.h>
#import "OFApplication.h"
#import "OFArray.h"
#import "OFFile.h"
#import "OFFileManager.h"
#import "OFIRI.h"
#import "OFLocale.h"
#import "OFOptionsParser.h"
#import "OFSandbox.h"
#import "OFStdIOStream.h"
#import "OFURI.h"
#import "OFArc.h"
#import "GZIPArchive.h"
#import "LHAArchive.h"
#import "TarArchive.h"
#import "ZIPArchive.h"
|
︙ | | |
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
|
-
-
+
+
-
-
+
+
|
/* Dropped after parsing options */
sandbox.allowsUnveil = true;
[OFApplication of_activateSandbox: sandbox];
#endif
#ifndef OF_AMIGAOS
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @LOCALIZATION_DIR]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @LOCALIZATION_DIR]];
#else
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @"PROGDIR:/share/ofarc/localization"]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @"PROGDIR:/share/ofarc/localization"]];
#endif
optionsParser = [OFOptionsParser parserWithOptions: options];
while ((option = [optionsParser nextOption]) != '\0') {
switch (option) {
case 'f':
if (_overwrite < 0)
|
︙ | | |
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
|
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
|
-
+
|
OFString *error = [OFString
stringWithCString: strerror(e.errNo)
encoding: [OFLocale encoding]];
[OFStdErr writeString: @"\r"];
[OFStdErr writeLine: OF_LOCALIZED(
@"failed_to_create_directory",
@"Failed to create directory %[dir]: %[error]",
@"dir", e.URI.fileSystemRepresentation,
@"dir", e.IRI.fileSystemRepresentation,
@"error", error)];
_exitStatus = 1;
} @catch (OFOpenItemFailedException *e) {
OFString *error = [OFString
stringWithCString: strerror(e.errNo)
encoding: [OFLocale encoding]];
[OFStdErr writeString: @"\r"];
|
︙ | | |
Modified utils/ofdns/OFDNS.m
from [9c8d151d03]
to [37e990202e].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
+
-
|
*/
#include "config.h"
#import "OFApplication.h"
#import "OFArray.h"
#import "OFDNSResolver.h"
#import "OFIRI.h"
#import "OFLocale.h"
#import "OFOptionsParser.h"
#import "OFSandbox.h"
#import "OFStdIOStream.h"
#import "OFURI.h"
@interface OFDNS: OFObject <OFApplicationDelegate, OFDNSResolverQueryDelegate>
{
size_t _inFlight;
int _errors;
}
@end
|
︙ | | |
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
-
-
+
+
-
-
+
+
|
OFUnichar option;
OFArray OF_GENERIC(OFString *) *remainingArguments;
OFDNSResolver *resolver;
OFDNSClass DNSClass;
#ifdef OF_HAVE_FILES
# ifndef OF_AMIGAOS
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @LOCALIZATION_DIR]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @LOCALIZATION_DIR]];
# else
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @"PROGDIR:/share/ofdns/localization"]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @"PROGDIR:/share/ofdns/localization"]];
# endif
#endif
#ifdef OF_HAVE_SANDBOX
OFSandbox *sandbox = [[OFSandbox alloc] init];
@try {
sandbox.allowsStdIO = true;
|
︙ | | |
Modified utils/ofhash/OFHash.m
from [9ba8d5174c]
to [973c5d3e52].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
|
+
-
|
*/
#include "config.h"
#import "OFApplication.h"
#import "OFArray.h"
#import "OFFile.h"
#import "OFIRI.h"
#import "OFLocale.h"
#import "OFMD5Hash.h"
#import "OFOptionsParser.h"
#import "OFRIPEMD160Hash.h"
#import "OFSHA1Hash.h"
#import "OFSHA224Hash.h"
#import "OFSHA256Hash.h"
#import "OFSHA384Hash.h"
#import "OFSHA512Hash.h"
#import "OFSandbox.h"
#import "OFSecureData.h"
#import "OFStdIOStream.h"
#import "OFURI.h"
#import "OFOpenItemFailedException.h"
#import "OFReadFailedException.h"
@interface OFHash: OFObject <OFApplicationDelegate>
@end
|
︙ | | |
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
-
-
+
+
-
-
+
+
|
OFSHA1Hash *SHA1Hash = nil;
OFSHA224Hash *SHA224Hash = nil;
OFSHA256Hash *SHA256Hash = nil;
OFSHA384Hash *SHA384Hash = nil;
OFSHA512Hash *SHA512Hash = nil;
#ifndef OF_AMIGAOS
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @LOCALIZATION_DIR]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @LOCALIZATION_DIR]];
#else
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @"PROGDIR:/share/ofhash/localization"]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @"PROGDIR:/share/ofhash/localization"]];
#endif
while ((option = [optionsParser nextOption]) != '\0') {
switch (option) {
case '?':
if (optionsParser.lastLongOption != nil)
[OFStdErr writeLine:
|
︙ | | |
Modified utils/ofhttp/OFHTTP.m
from [05abbe7837]
to [e73ed438ad].
︙ | | |
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
+
-
|
#import "OFData.h"
#import "OFDictionary.h"
#import "OFFile.h"
#import "OFFileManager.h"
#import "OFHTTPClient.h"
#import "OFHTTPRequest.h"
#import "OFHTTPResponse.h"
#import "OFIRI.h"
#import "OFLocale.h"
#import "OFOptionsParser.h"
#ifdef OF_HAVE_PLUGINS
# import "OFPlugin.h"
#endif
#import "OFSandbox.h"
#import "OFStdIOStream.h"
#import "OFSystemInfo.h"
#import "OFTCPSocket.h"
#import "OFTLSStream.h"
#import "OFURI.h"
#ifdef HAVE_TLS_SUPPORT
# import "ObjFWTLS.h"
#endif
#import "OFConnectSocketFailedException.h"
#import "OFGetItemAttributesFailedException.h"
|
︙ | | |
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
|
-
-
+
+
-
+
-
+
|
#define GIBIBYTE (1024 * 1024 * 1024)
#define MEBIBYTE (1024 * 1024)
#define KIBIBYTE (1024)
@interface OFHTTP: OFObject <OFApplicationDelegate, OFHTTPClientDelegate,
OFStreamDelegate>
{
OFArray OF_GENERIC(OFString *) *_URIs;
size_t _URIIndex;
OFArray OF_GENERIC(OFString *) *_IRIs;
size_t _IRIIndex;
int _errorCode;
OFString *_outputPath, *_currentFileName;
bool _continue, _force, _detectFileName, _detectFileNameRequest;
bool _detectedFileName, _quiet, _verbose, _insecure, _ignoreStatus;
bool _useUnicode;
OFStream *_body;
OFHTTPRequestMethod _method;
OFMutableDictionary *_clientHeaders;
OFHTTPClient *_HTTPClient;
char *_buffer;
OFStream *_output;
unsigned long long _received, _length, _resumedFrom;
ProgressBar *_progressBar;
}
- (void)downloadNextURI;
- (void)downloadNextIRI;
@end
#ifdef HAVE_TLS_SUPPORT
void
_reference_to_ObjFWTLS(void)
{
_ObjFWTLS_reference = 1;
}
#endif
OF_APPLICATION_DELEGATE(OFHTTP)
static void
help(OFStream *stream, bool full, int status)
{
[OFStdErr writeLine:
OF_LOCALIZED(@"usage",
@"Usage: %[prog] -[cehHmoOPqv] uri1 [uri2 ...]",
@"Usage: %[prog] -[cehHmoOPqv] iri1 [iri2 ...]",
@"prog", [OFApplication programName])];
if (full) {
[stream writeString: @"\n"];
[stream writeLine: OF_LOCALIZED(@"full_usage",
@"Options:\n "
@"-b --body "
|
︙ | | |
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
|
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
|
-
-
+
+
-
-
+
+
|
/* Dropped after parsing options */
sandbox.allowsUnveil = true;
[OFApplication of_activateSandbox: sandbox];
#endif
#ifndef OF_AMIGAOS
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @LOCALIZATION_DIR]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @LOCALIZATION_DIR]];
#else
[OFLocale addLocalizationDirectoryURI:
[OFURI fileURIWithPath: @"PROGDIR:/share/ofhttp/localization"]];
[OFLocale addLocalizationDirectoryIRI:
[OFIRI fileIRIWithPath: @"PROGDIR:/share/ofhttp/localization"]];
#endif
optionsParser = [OFOptionsParser parserWithOptions: options];
while ((option = [optionsParser nextOption]) != '\0') {
switch (option) {
case 'b':
[self setBody: optionsParser.argument];
|
︙ | | |
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
|
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
|
-
+
-
+
-
+
-
-
+
+
-
+
|
[sandbox unveilPath: @"/etc/ssl" permissions: @"r"];
sandbox.allowsUnveil = false;
[OFApplication of_activateSandbox: sandbox];
#endif
_outputPath = [outputPath copy];
_URIs = [optionsParser.remainingArguments copy];
_IRIs = [optionsParser.remainingArguments copy];
if (_URIs.count < 1)
if (_IRIs.count < 1)
help(OFStdErr, false, 1);
if (_quiet && _verbose) {
[OFStdErr writeLine: OF_LOCALIZED(@"quiet_xor_verbose",
@"%[prog]: -q / --quiet and -v / --verbose are mutually "
@"exclusive!",
@"prog", [OFApplication programName])];
[OFApplication terminateWithStatus: 1];
}
if (_outputPath != nil && _detectFileName) {
[OFStdErr writeLine: OF_LOCALIZED(
@"output_xor_detect_filename",
@"%[prog]: -o / --output and -O / --detect-filename are "
@"mutually exclusive!",
@"prog", [OFApplication programName])];
[OFApplication terminateWithStatus: 1];
}
if (_outputPath != nil && _URIs.count > 1) {
if (_outputPath != nil && _IRIs.count > 1) {
[OFStdErr writeLine:
OF_LOCALIZED(@"output_only_with_one_uri",
@"%[prog]: Cannot use -o / --output when more than one URI "
OF_LOCALIZED(@"output_only_with_one_iri",
@"%[prog]: Cannot use -o / --output when more than one IRI "
@"has been specified!",
@"prog", [OFApplication programName])];
[OFApplication terminateWithStatus: 1];
}
if (_insecure)
_HTTPClient.allowsInsecureRedirects = true;
#ifdef OF_WINDOWS
_useUnicode = [OFSystemInfo isWindowsNT];
#else
_useUnicode = ([OFLocale encoding] == OFStringEncodingUTF8);
#endif
[self performSelector: @selector(downloadNextURI) afterDelay: 0];
[self performSelector: @selector(downloadNextIRI) afterDelay: 0];
}
- (void)client: (OFHTTPClient *)client
didCreateTLSStream: (OFTLSStream *)stream
request: (OFHTTPRequest *)request
{
/* Use setter instead of property access to work around GCC bug. */
|
︙ | | |
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
|
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
|
-
+
|
char buffer[4096];
size_t length = [_body readIntoBuffer: buffer length: 4096];
[body writeBuffer: buffer length: length];
}
}
- (bool)client: (OFHTTPClient *)client
shouldFollowRedirectToURI: (OFURI *)URI
shouldFollowRedirectToIRI: (OFIRI *)IRI
statusCode: (short)statusCode
request: (OFHTTPRequest *)request
response: (OFHTTPResponse *)response
{
if (_verbose) {
void *pool = objc_autoreleasePoolPush();
OFDictionary OF_GENERIC(OFString *, OFString *) *headers =
|
︙ | | |
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
|
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
|
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
[OFStdOut writeFormat: @" %@: %@\n", key, object];
objc_autoreleasePoolPop(pool);
}
if (!_quiet) {
if (_useUnicode)
[OFStdOut writeFormat: @"☇ %@", URI.string];
[OFStdOut writeFormat: @"☇ %@", IRI.string];
else
[OFStdOut writeFormat: @"< %@", URI.string];
[OFStdOut writeFormat: @"< %@", IRI.string];
}
_length = 0;
return true;
}
- (bool)stream: (OFStream *)response
didReadIntoBuffer: (void *)buffer
length: (size_t)length
exception: (id)exception
{
if (exception != nil) {
OFString *URI;
OFString *IRI;
[_progressBar stop];
[_progressBar draw];
[_progressBar release];
_progressBar = nil;
if (!_quiet) {
[OFStdOut writeString: @"\n "];
[OFStdOut writeLine: OF_LOCALIZED(@"download_error",
@"Error!")];
}
URI = [_URIs objectAtIndex: _URIIndex - 1];
IRI = [_IRIs objectAtIndex: _IRIIndex - 1];
[OFStdErr writeLine: OF_LOCALIZED(
@"download_failed_exception",
@"%[prog]: Failed to download <%[uri]>!\n"
@"%[prog]: Failed to download <%[iri]>!\n"
@" %[exception]",
@"prog", [OFApplication programName],
@"uri", URI,
@"iri", IRI,
@"exception", exception)];
_errorCode = 1;
[self performSelector: @selector(downloadNextURI)
[self performSelector: @selector(downloadNextIRI)
afterDelay: 0];
return false;
}
[_output writeBuffer: buffer length: length];
_received += length;
|
︙ | | |
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
|
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
|
-
+
|
if (!_quiet) {
[OFStdOut writeString: @"\n "];
[OFStdOut writeLine:
OF_LOCALIZED(@"download_done", @"Done!")];
}
[self performSelector: @selector(downloadNextURI)
[self performSelector: @selector(downloadNextIRI)
afterDelay: 0];
return false;
}
return true;
}
|
︙ | | |
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
|
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
|
-
+
-
+
-
+
-
+
-
+
-
+
|
if ([exception isKindOfClass:
[OFResolveHostFailedException class]]) {
if (!_quiet)
[OFStdOut writeString: @"\n"];
[OFStdErr writeLine:
OF_LOCALIZED(@"download_resolve_host_failed",
@"%[prog]: Failed to download <%[uri]>!\n"
@"%[prog]: Failed to download <%[iri]>!\n"
@" Failed to resolve host: %[exception]",
@"prog", [OFApplication programName],
@"uri", request.URI.string,
@"iri", request.IRI.string,
@"exception", exception)];
} else if ([exception isKindOfClass:
[OFConnectSocketFailedException class]]) {
if (!_quiet)
[OFStdOut writeString: @"\n"];
[OFStdErr writeLine:
OF_LOCALIZED(@"download_failed_connection_failed",
@"%[prog]: Failed to download <%[uri]>!\n"
@"%[prog]: Failed to download <%[iri]>!\n"
@" Connection failed: %[exception]",
@"prog", [OFApplication programName],
@"uri", request.URI.string,
@"iri", request.IRI.string,
@"exception", exception)];
} else if ([exception isKindOfClass:
[OFInvalidServerResponseException class]]) {
if (!_quiet)
[OFStdOut writeString: @"\n"];
[OFStdErr writeLine: OF_LOCALIZED(
@"download_failed_invalid_server_response",
@"%[prog]: Failed to download <%[uri]>!\n"
@"%[prog]: Failed to download <%[iri]>!\n"
@" Invalid server response!",
@"prog", [OFApplication programName],
@"uri", request.URI.string)];
@"iri", request.IRI.string)];
} else if ([exception isKindOfClass:
[OFUnsupportedProtocolException class]]) {
if (!_quiet)
[OFStdOut writeString: @"\n"];
[OFStdErr writeLine: OF_LOCALIZED(@"no_tls_support",
@"%[prog]: No TLS support in ObjFW!\n"
|
︙ | | |
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
|
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
|
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
|
error = OF_LOCALIZED(
@"download_failed_read_or_write_failed_"
@"write",
@"Write failed");
[OFStdErr writeLine: OF_LOCALIZED(
@"download_failed_read_or_write_failed",
@"%[prog]: Failed to download <%[uri]>!\n"
@"%[prog]: Failed to download <%[iri]>!\n"
@" %[error]: %[exception]",
@"prog", [OFApplication programName],
@"uri", request.URI.string,
@"iri", request.IRI.string,
@"error", error,
@"exception", exception)];
} else if ([exception isKindOfClass:
[OFHTTPRequestFailedException class]]) {
short statusCode;
OFString *codeString;
if (_ignoreStatus) {
exception = nil;
goto after_exception_handling;
}
statusCode = response.statusCode;
codeString = [OFString stringWithFormat: @"%hd %@",
statusCode, OFHTTPStatusCodeString(statusCode)];
[OFStdErr writeLine: OF_LOCALIZED(@"download_failed",
@"%[prog]: Failed to download <%[uri]>!\n"
@"%[prog]: Failed to download <%[iri]>!\n"
@" HTTP status code: %[code]",
@"prog", [OFApplication programName],
@"uri", request.URI.string,
@"iri", request.IRI.string,
@"code", codeString)];
} else
@throw exception;
_errorCode = 1;
[self performSelector: @selector(downloadNextURI)
[self performSelector: @selector(downloadNextIRI)
afterDelay: 0];
return;
}
after_exception_handling:
if (_method == OFHTTPRequestMethodHead)
goto next;
if (_detectFileNameRequest) {
_currentFileName = [fileNameFromContentDisposition(
[response.headers objectForKey: @"Content-Disposition"])
copy];
_detectedFileName = true;
/* Handle this URI on the next -[downloadNextURI] call */
_URIIndex--;
/* Handle this IRI on the next -[downloadNextIRI] call */
_IRIIndex--;
[self performSelector: @selector(downloadNextURI)
[self performSelector: @selector(downloadNextIRI)
afterDelay: 0];
return;
}
if ([_outputPath isEqual: @"-"])
_output = [OFStdOut copy];
else {
|
︙ | | |
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
|
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
|
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
|
[response asyncReadIntoBuffer: _buffer length: [OFSystemInfo pageSize]];
return;
next:
[_currentFileName release];
_currentFileName = nil;
[self performSelector: @selector(downloadNextURI) afterDelay: 0];
[self performSelector: @selector(downloadNextIRI) afterDelay: 0];
}
- (void)downloadNextURI
- (void)downloadNextIRI
{
OFString *URIString = nil;
OFURI *URI;
OFString *IRIString = nil;
OFIRI *IRI;
OFMutableDictionary *clientHeaders;
OFHTTPRequest *request;
_received = _length = _resumedFrom = 0;
if (_output != OFStdOut)
[_output release];
_output = nil;
if (_URIIndex >= _URIs.count)
if (_IRIIndex >= _IRIs.count)
[OFApplication terminateWithStatus: _errorCode];
@try {
URIString = [_URIs objectAtIndex: _URIIndex++];
URI = [OFURI URIWithString: URIString];
IRIString = [_IRIs objectAtIndex: _IRIIndex++];
IRI = [OFIRI IRIWithString: IRIString];
} @catch (OFInvalidFormatException *e) {
[OFStdErr writeLine: OF_LOCALIZED(@"invalid_uri",
@"%[prog]: Invalid URI: <%[uri]>!",
[OFStdErr writeLine: OF_LOCALIZED(@"invalid_iri",
@"%[prog]: Invalid IRI: <%[iri]>!",
@"prog", [OFApplication programName],
@"uri", URIString)];
@"iri", IRIString)];
_errorCode = 1;
goto next;
}
if (![URI.scheme isEqual: @"http"] && ![URI.scheme isEqual: @"https"]) {
if (![IRI.scheme isEqual: @"http"] && ![IRI.scheme isEqual: @"https"]) {
[OFStdErr writeLine: OF_LOCALIZED(@"invalid_scheme",
@"%[prog]: Invalid scheme: <%[uri]>!",
@"%[prog]: Invalid scheme: <%[iri]>!",
@"prog", [OFApplication programName],
@"uri", URIString)];
@"iri", IRIString)];
_errorCode = 1;
goto next;
}
clientHeaders = [[_clientHeaders mutableCopy] autorelease];
if (_detectFileName && !_detectedFileName) {
if (!_quiet) {
if (_useUnicode)
[OFStdOut writeFormat: @"⠒ %@", URI.string];
[OFStdOut writeFormat: @"⠒ %@", IRI.string];
else
[OFStdOut writeFormat: @"? %@", URI.string];
[OFStdOut writeFormat: @"? %@", IRI.string];
}
request = [OFHTTPRequest requestWithURI: URI];
request = [OFHTTPRequest requestWithIRI: IRI];
request.headers = clientHeaders;
request.method = OFHTTPRequestMethodHead;
_detectFileNameRequest = true;
[_HTTPClient asyncPerformRequest: request];
return;
}
if (!_detectedFileName) {
[_currentFileName release];
_currentFileName = nil;
} else
_detectedFileName = false;
if (_currentFileName == nil)
_currentFileName = [_outputPath copy];
if (_currentFileName == nil)
_currentFileName = [URI.path.lastPathComponent copy];
_currentFileName = [IRI.path.lastPathComponent copy];
if ([_currentFileName isEqual: @"/"]) {
[_currentFileName release];
_currentFileName = nil;
}
if (_currentFileName == nil)
|
︙ | | |
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
|
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
|
-
+
-
+
-
+
-
+
|
[clientHeaders setObject: range forKey: @"Range"];
} @catch (OFGetItemAttributesFailedException *e) {
}
}
if (!_quiet) {
if (_useUnicode)
[OFStdOut writeFormat: @"⇣ %@", URI.string];
[OFStdOut writeFormat: @"⇣ %@", IRI.string];
else
[OFStdOut writeFormat: @"< %@", URI.string];
[OFStdOut writeFormat: @"< %@", IRI.string];
}
request = [OFHTTPRequest requestWithURI: URI];
request = [OFHTTPRequest requestWithIRI: IRI];
request.headers = clientHeaders;
request.method = _method;
_detectFileNameRequest = false;
[_HTTPClient asyncPerformRequest: request];
return;
next:
[self performSelector: @selector(downloadNextURI) afterDelay: 0];
[self performSelector: @selector(downloadNextIRI) afterDelay: 0];
}
@end
|
Modified utils/ofhttp/localization/de.json
from [839a028930]
to [d50b9e554d].
1
2
3
4
5
6
7
8
9
|
1
2
3
4
5
6
7
8
9
|
-
+
|
{
"usage": "Benutzung: %[prog] -[cehHmoOPqv] uri1 [uri2 ...]",
"usage": "Benutzung: %[prog] -[cehHmoOPqv] iri1 [iri2 ...]",
"full_usage": [
"Optionen:\n",
" -b --body Angegebene Datei als Body übergeben\n",
" (- für Standard-Eingabe)\n",
" -c --continue Download von existierender Datei ",
"fortsetzen\n",
" -f --force Existierende Datei überschreiben\n",
|
︙ | | |
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
|
"%[prog]: -q / --quiet und -v / --verbose schließen sich gegenseitig ",
"aus!"
],
"output_xor_detect_filename": [
"%[prog]: -o / --output und -O / --detect-filename schließen sich ",
"gegenseitig aus!"
],
"output_only_with_one_uri": [
"%[prog]: -o / --output kann nicht mit mehr als einer URI benutzt ",
"output_only_with_one_iri": [
"%[prog]: -o / --output kann nicht mit mehr als einer IRI benutzt ",
"werden!"
],
"download_resolve_host_failed": [
"%[prog]: Fehler beim Download von <%[uri]>!\n",
"%[prog]: Fehler beim Download von <%[iri]>!\n",
" Host auflösen fehlgeschlagen: %[exception]"
],
"download_failed_connection_failed": [
"%[prog]: Fehler beim Download von <%[uri]>!\n",
"%[prog]: Fehler beim Download von <%[iri]>!\n",
" Verbindung fehlgeschlagen: %[exception]"
],
"download_failed_invalid_server_response": [
"%[prog]: Fehler beim Download von <%[uri]>!\n",
"%[prog]: Fehler beim Download von <%[iri]>!\n",
" Ungültige Antwort vom Server!"
],
"no_tls_support": [
"%[prog]: Keine TLS-Unterstützung in ObjFW!\n",
" Um via HTTPS runterzuladen müssen Sie entweder ObjFW mit TLS-",
"Unterstützung\n",
" kompilieren oder eine Bibliothek mittels „preload” laden, welche ",
"TLS-Support\n",
" zu ObjFW hinzufügt!"
],
"download_failed_read_or_write_failed_any": "Lesen oder Schreiben",
"download_failed_read_or_write_failed_read": "Lesen",
"download_failed_read_or_write_failed_write": "Schreiben",
"download_failed_read_or_write_failed": [
"%[prog]: Fehler beim Download von <%[uri]>!\n",
"%[prog]: Fehler beim Download von <%[iri]>!\n",
" %[error]: %[exception]"
],
"download_failed": [
"%[prog]: Fehler beim Download von <%[uri]>!\n",
"%[prog]: Fehler beim Download von <%[iri]>!\n",
" HTTP Status-Code: %[code]"
],
"download_error": "Fehler!",
"download_failed_exception": [
"%[prog]: Fehler beim Download von <%[uri]>!\n",
"%[prog]: Fehler beim Download von <%[iri]>!\n",
" %[exception]"
],
"download_done": "Fertig!",
"invalid_uri": "%[prog]: Ungültige URI: <%[uri]>!",
"invalid_scheme": "%[prog]: Ungültiges Schema: <%[uri]>!",
"invalid_iri": "%[prog]: Ungültige IRI: <%[iri]>!",
"invalid_scheme": "%[prog]: Ungültiges Schema: <%[iri]>!",
"type_unknown": "unbekannt",
"size_gib": "%[num] GiB",
"size_mib": "%[num] MiB",
"size_kib": "%[num] KiB",
"size_bytes": [
[
{"num == 1": "1 Byte"},
|
︙ | | |