Overview
Context
Changes
Modified src/OFArchiveIRIHandler.m
from [4c05cb75e3]
to [504e6ffdaf].
| ︙ | | |
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
|
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
|
-
-
+
+
-
+
-
+
-
+
-
+
|
/*
* GZIP only compresses one file and thus has no path inside an
* archive.
*/
if ([scheme isEqual: @"gzip"]) {
stream = [OFIRIHandler openItemAtIRI: [OFIRI IRIWithString:
IRI.path]
mode: @"r"];
stream = [OFGZIPStream streamWithStream: stream mode: @"r"];
mode: mode];
stream = [OFGZIPStream streamWithStream: stream mode: mode];
goto end;
}
percentEncodedPath = IRI.percentEncodedPath;
pos = [percentEncodedPath rangeOfString: @"!"].location;
if (pos == OFNotFound)
@throw [OFInvalidArgumentException exception];
archiveIRI = [OFIRI IRIWithString:
[percentEncodedPath substringWithRange: OFMakeRange(0, pos)]
.stringByRemovingPercentEncoding];
path = [percentEncodedPath substringWithRange:
OFMakeRange(pos + 1, percentEncodedPath.length - pos - 1)]
.stringByRemovingPercentEncoding;
if ([scheme isEqual: @"lha-archive"]) {
OFLHAArchive *archive = [OFLHAArchive archiveWithIRI: archiveIRI
mode: @"r"];
mode: mode];
OFLHAArchiveEntry *entry;
while ((entry = [archive nextEntry]) != nil) {
if ([entry.fileName isEqual: path]) {
stream = [archive streamForReadingCurrentEntry];
goto end;
}
}
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: mode
errNo: ENOENT];
} else if ([scheme isEqual: @"tar-archive"]) {
OFTarArchive *archive = [OFTarArchive archiveWithIRI: archiveIRI
mode: @"r"];
mode: mode];
OFTarArchiveEntry *entry;
while ((entry = [archive nextEntry]) != nil) {
if ([entry.fileName isEqual: path]) {
stream = [archive streamForReadingCurrentEntry];
goto end;
}
}
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: mode
errNo: ENOENT];
} else if ([scheme isEqual: @"zip-archive"]) {
OFZIPArchive *archive = [OFZIPArchive archiveWithIRI: archiveIRI
mode: @"r"];
mode: mode];
stream = [archive streamForReadingFile: path];
} else if ([scheme isEqual: @"zoo-archive"]) {
OFZooArchive *archive = [OFZooArchive archiveWithIRI: archiveIRI
mode: @"r"];
mode: mode];
OFZooArchiveEntry *entry;
while ((entry = [archive nextEntry]) != nil) {
if ([entry.fileName isEqual: path]) {
stream = [archive streamForReadingCurrentEntry];
goto end;
}
|
| ︙ | | |
Modified src/OFFileIRIHandler.m
from [a48795d357]
to [7d64a7fa27].
| ︙ | | |
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
|
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
701
|
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
|
return S_ISDIR(s.st_mode);
}
- (OFStream *)openItemAtIRI: (OFIRI *)IRI mode: (OFString *)mode
{
void *pool = objc_autoreleasePoolPush();
OFFile *file = [[OFFile alloc]
initWithPath: IRI.fileSystemRepresentation
mode: mode];
OFFile *file;
@try {
file = [OFFile fileWithPath: IRI.fileSystemRepresentation
mode: mode];
} @catch (OFOpenItemFailedException *e) {
/* The thrown one has a path instead of an IRI set. */
@throw [OFOpenItemFailedException exceptionWithIRI: IRI
mode: mode
errNo: e.errNo];
}
[file retain];
objc_autoreleasePoolPop(pool);
return [file autorelease];
}
- (OFFileAttributes)attributesOfItemAtIRI: (OFIRI *)IRI
|
| ︙ | | |