Differences From Artifact [b1f97cb82f]:
- File
src/OFZIPArchive.m
— part of check-in
[1ce5d53f93]
at
2013-10-29 18:00:08
on branch trunk
— OFZIPArchive: Only check lower byte of minVersion.
The higher byte identifies the OS and is not helpful in the comparison,
as it's better to just try to decompress it instead of checking if we
are on the specified OS. (user: js, size: 9924) [annotate] [blame] [check-ins using]
To Artifact [dd9b24a859]:
- File src/OFZIPArchive.m — part of check-in [95f6035588] at 2013-10-30 17:06:48 on branch trunk — OFZIPArchive: Return entries in a sorted array. (user: js, size: 10121) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #include <stdio.h> #import "OFZIPArchive.h" #import "OFZIPArchiveEntry.h" #import "OFZIPArchiveEntry+Private.h" #import "OFDataArray.h" #import "OFDictionary.h" #import "OFFile.h" #import "OFDeflateStream.h" #import "OFChecksumFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" | > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #include <stdio.h> #import "OFZIPArchive.h" #import "OFZIPArchiveEntry.h" #import "OFZIPArchiveEntry+Private.h" #import "OFDataArray.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFFile.h" #import "OFDeflateStream.h" #import "OFChecksumFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" |
| ︙ | ︙ | |||
139 140 141 142 143 144 145 146 147 148 149 150 151 152 |
- (void)dealloc
{
[_file release];
[_path release];
[_archiveComment release];
[_entries release];
[super dealloc];
}
- (void)OF_readZIPInfo
{
void *pool = objc_autoreleasePoolPush();
| > | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 |
- (void)dealloc
{
[_file release];
[_path release];
[_archiveComment release];
[_entries release];
[_pathToEntryMap release];
[super dealloc];
}
- (void)OF_readZIPInfo
{
void *pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ | |||
188 189 190 191 192 193 194 |
{
void *pool = objc_autoreleasePoolPush();
size_t i;
[_file seekToOffset: _centralDirectoryOffset
whence: SEEK_SET];
| > | | > | | > > | | | 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 |
{
void *pool = objc_autoreleasePoolPush();
size_t i;
[_file seekToOffset: _centralDirectoryOffset
whence: SEEK_SET];
_entries = [[OFMutableArray alloc] init];
_pathToEntryMap = [[OFMutableDictionary alloc] init];
for (i = 0; i < _centralDirectoryEntries; i++) {
OFZIPArchiveEntry *entry = [[[OFZIPArchiveEntry alloc]
OF_initWithFile: _file] autorelease];
if ([_pathToEntryMap objectForKey: [entry fileName]] != nil)
@throw [OFInvalidFormatException exception];
[_entries addObject: entry];
[_pathToEntryMap setObject: entry
forKey: [entry fileName]];
}
[_entries sort];
[_entries makeImmutable];
[_pathToEntryMap makeImmutable];
objc_autoreleasePoolPop(pool);
}
- (OFArray*)entries
{
OF_GETTER(_entries, true)
}
- (OFString*)archiveComment
{
OF_GETTER(_archiveComment, true)
}
- (OFStream*)streamForReadingFile: (OFString*)path
{
OFStream *ret;
void *pool = objc_autoreleasePoolPush();
OFZIPArchiveEntry *entry = [_pathToEntryMap objectForKey: path];
OFZIPArchive_LocalFileHeader *localFileHeader;
if (entry == nil) {
errno = ENOENT;
@throw [OFOpenFileFailedException exceptionWithPath: path
mode: @"rb"];
}
|
| ︙ | ︙ |