Differences From Artifact [3ed67d1bc6]:
- File
src/OFZIPArchive.m
— part of check-in
[adf754d5fc]
at
2014-05-25 22:58:08
on branch trunk
— Move of_zip_archive_find_extra_field()
This belongs to OFZIPArchiveEntry. Consequently, it has been renamed to
of_zip_archive_entry_find_extra_field() and made public, so that it can
be used by applications that got the extra field from the
OFZIPArchiveEntry. (user: js, size: 13256) [annotate] [blame] [check-ins using]
To Artifact [dff17fc4c0]:
- File src/OFZIPArchive.m — part of check-in [c1d665c395] at 2014-05-26 15:41:57 on branch trunk — OFZIPArchiveEntry: Make more properties public (user: js, size: 13410) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
53 54 55 56 57 58 59 |
- (void)OF_readZIPInfo;
- (void)OF_readEntries;
@end
@interface OFZIPArchive_LocalFileHeader: OFObject
{
@public
| | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 |
- (void)OF_readZIPInfo;
- (void)OF_readEntries;
@end
@interface OFZIPArchive_LocalFileHeader: OFObject
{
@public
uint16_t _minVersionNeeded, _generalPurposeBitFlag, _compressionMethod;
uint16_t _lastModifiedFileTime, _lastModifiedFileDate;
uint32_t _CRC32;
uint64_t _compressedSize, _uncompressedSize;
OFString *_fileName;
OFDataArray *_extraField;
}
|
| ︙ | ︙ | |||
337 338 339 340 341 342 343 | whence: SEEK_SET]; localFileHeader = [[[OFZIPArchive_LocalFileHeader alloc] initWithFile: _file] autorelease]; if (![localFileHeader matchesEntry: entry]) @throw [OFInvalidFormatException exception]; | | | | | 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 |
whence: SEEK_SET];
localFileHeader = [[[OFZIPArchive_LocalFileHeader alloc]
initWithFile: _file] autorelease];
if (![localFileHeader matchesEntry: entry])
@throw [OFInvalidFormatException exception];
if ((localFileHeader->_minVersionNeeded & 0xFF) > 45) {
OFString *version = [OFString stringWithFormat: @"%u.%u",
(localFileHeader->_minVersionNeeded & 0xFF) / 10,
(localFileHeader->_minVersionNeeded & 0xFF) % 10];
@throw [OFUnsupportedVersionException
exceptionWithVersion: version];
}
ret = [[OFZIPArchive_FileStream alloc]
initWithArchiveFile: _path
|
| ︙ | ︙ | |||
372 373 374 375 376 377 378 | of_string_encoding_t encoding; uint8_t *ZIP64; uint16_t ZIP64Size; if ([file readLittleEndianInt32] != 0x04034B50) @throw [OFInvalidFormatException exception]; | | | | | 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 |
of_string_encoding_t encoding;
uint8_t *ZIP64;
uint16_t ZIP64Size;
if ([file readLittleEndianInt32] != 0x04034B50)
@throw [OFInvalidFormatException exception];
_minVersionNeeded = [file readLittleEndianInt16];
_generalPurposeBitFlag = [file readLittleEndianInt16];
_compressionMethod = [file readLittleEndianInt16];
_lastModifiedFileTime = [file readLittleEndianInt16];
_lastModifiedFileDate = [file readLittleEndianInt16];
_CRC32 = [file readLittleEndianInt32];
_compressedSize = [file readLittleEndianInt32];
_uncompressedSize = [file readLittleEndianInt32];
fileNameLength = [file readLittleEndianInt16];
extraFieldLength = [file readLittleEndianInt16];
encoding = (_generalPurposeBitFlag & (1 << 11)
? OF_STRING_ENCODING_UTF_8
: OF_STRING_ENCODING_CODEPAGE_437);
_fileName = [[file readStringWithLength: fileNameLength
encoding: encoding] copy];
_extraField = [[file
readDataArrayWithCount: extraFieldLength] retain];
of_zip_archive_entry_extra_field_find(_extraField,
OF_ZIP_ARCHIVE_ENTRY_EXTRA_FIELD_ZIP64, &ZIP64, &ZIP64Size);
if (ZIP64 != NULL) {
if (_uncompressedSize == 0xFFFFFFFF)
_uncompressedSize = of_zip_archive_read_field64(
&ZIP64, &ZIP64Size);
if (_compressedSize == 0xFFFFFFFF)
_compressedSize = of_zip_archive_read_field64(
|
| ︙ | ︙ | |||
423 424 425 426 427 428 429 |
[_extraField release];
[super dealloc];
}
- (bool)matchesEntry: (OFZIPArchiveEntry*)entry
{
| | | | 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 |
[_extraField release];
[super dealloc];
}
- (bool)matchesEntry: (OFZIPArchiveEntry*)entry
{
if (_minVersionNeeded != [entry minVersionNeeded] ||
_generalPurposeBitFlag != [entry OF_generalPurposeBitFlag] ||
_compressionMethod != [entry compressionMethod] ||
_lastModifiedFileTime != [entry OF_lastModifiedFileTime] ||
_lastModifiedFileDate != [entry OF_lastModifiedFileDate])
return false;
if (!(_generalPurposeBitFlag & (1 << 3)))
if (_CRC32 != [entry CRC32] ||
_compressedSize != [entry compressedSize] ||
|
| ︙ | ︙ | |||
457 458 459 460 461 462 463 |
@try {
_file = [[OFFile alloc] initWithPath: path
mode: @"rb"];
[_file seekToOffset: offset
whence: SEEK_SET];
switch (localFileHeader->_compressionMethod) {
| | | | | 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 |
@try {
_file = [[OFFile alloc] initWithPath: path
mode: @"rb"];
[_file seekToOffset: offset
whence: SEEK_SET];
switch (localFileHeader->_compressionMethod) {
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_NONE:
_stream = [_file retain];
break;
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_DEFLATE:
_stream = [[OFDeflateStream alloc]
initWithStream: _file];
break;
case OF_ZIP_ARCHIVE_ENTRY_COMPRESSION_METHOD_DEFLATE64:
_stream = [[OFDeflate64Stream alloc]
initWithStream: _file];
break;
default:
@throw [OFNotImplementedException
exceptionWithSelector: _cmd
object: self];
|
| ︙ | ︙ |