Differences From Artifact [c71c080e0a]:
- File
src/OFLHAArchiveEntry.m
— part of check-in
[6f13f74134]
at
2022-08-27 20:23:24
on branch trunk
— OFLHAArchiveEntry: Make (un)compressedSize ull
There's newer, less common LHA versions that allow 64 bit for the size.
However, for consistency with OFTarArchiveEntry, use unsigned long long
instead of uint64_t. (user: js, size: 18267) [annotate] [blame] [check-ins using]
To Artifact [b338459827]:
- File src/OFLHAArchiveEntry.m — part of check-in [406134b5e2] at 2022-08-27 23:53:22 on branch trunk — OFArchiveEntry: Add more properties (user: js, size: 19396) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
109 110 111 112 113 114 115 |
length: extension.count - 1];
}
static void
parsePermissionsExtension(OFLHAArchiveEntry *entry, OFData *extension,
OFStringEncoding encoding)
{
| | | | | | > | | | | | | | | | | > | > | | | | | | | | 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 |
length: extension.count - 1];
}
static void
parsePermissionsExtension(OFLHAArchiveEntry *entry, OFData *extension,
OFStringEncoding encoding)
{
uint16_t POSIXPermissions;
if (extension.count != 3)
@throw [OFInvalidFormatException exception];
memcpy(&POSIXPermissions, (char *)extension.items + 1, 2);
POSIXPermissions = OFFromLittleEndian16(POSIXPermissions);
[entry->_POSIXPermissions release];
entry->_POSIXPermissions = nil;
entry->_POSIXPermissions =
[[OFNumber alloc] initWithUnsignedShort: POSIXPermissions];
}
static void
parseGIDUIDExtension(OFLHAArchiveEntry *entry, OFData *extension,
OFStringEncoding encoding)
{
uint16_t ownerAccountID, groupOwnerAccountID;
if (extension.count != 5)
@throw [OFInvalidFormatException exception];
memcpy(&groupOwnerAccountID, (char *)extension.items + 1, 2);
groupOwnerAccountID = OFFromLittleEndian16(groupOwnerAccountID);
memcpy(&ownerAccountID, (char *)extension.items + 3, 2);
ownerAccountID = OFFromLittleEndian16(ownerAccountID);
[entry->_groupOwnerAccountID release];
entry->_groupOwnerAccountID = nil;
[entry->_ownerAccountID release];
entry->_ownerAccountID = nil;
entry->_groupOwnerAccountID =
[[OFNumber alloc] initWithUnsignedShort: groupOwnerAccountID];
entry->_ownerAccountID =
[[OFNumber alloc] initWithUnsignedShort: ownerAccountID];
}
static void
parseGroupExtension(OFLHAArchiveEntry *entry, OFData *extension,
OFStringEncoding encoding)
{
[entry->_groupOwnerAccountName release];
entry->_groupOwnerAccountName = nil;
entry->_groupOwnerAccountName = [[OFString alloc]
initWithCString: (char *)extension.items + 1
encoding: encoding
length: extension.count - 1];
}
static void
parseOwnerExtension(OFLHAArchiveEntry *entry, OFData *extension,
OFStringEncoding encoding)
{
[entry->_ownerAccountName release];
entry->_ownerAccountName = nil;
entry->_ownerAccountName = [[OFString alloc]
initWithCString: (char *)extension.items + 1
encoding: encoding
length: extension.count - 1];
}
static void
parseModificationDateExtension(OFLHAArchiveEntry *entry, OFData *extension,
|
| ︙ | ︙ | |||
414 415 416 417 418 419 420 |
- (void)dealloc
{
[_compressionMethod release];
[_fileName release];
[_directoryName release];
[_modificationDate release];
[_fileComment release];
| | | | | | | 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 |
- (void)dealloc
{
[_compressionMethod release];
[_fileName release];
[_directoryName release];
[_modificationDate release];
[_fileComment release];
[_POSIXPermissions release];
[_ownerAccountID release];
[_groupOwnerAccountID release];
[_ownerAccountName release];
[_groupOwnerAccountName release];
[_extensions release];
[super dealloc];
}
- (id)copy
{
|
| ︙ | ︙ | |||
450 451 452 453 454 455 456 | copy->_compressedSize = _compressedSize; copy->_uncompressedSize = _uncompressedSize; copy->_modificationDate = [_modificationDate copy]; copy->_headerLevel = _headerLevel; copy->_CRC16 = _CRC16; copy->_operatingSystemIdentifier = _operatingSystemIdentifier; copy->_fileComment = [_fileComment copy]; | | | | | | | 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 |
copy->_compressedSize = _compressedSize;
copy->_uncompressedSize = _uncompressedSize;
copy->_modificationDate = [_modificationDate copy];
copy->_headerLevel = _headerLevel;
copy->_CRC16 = _CRC16;
copy->_operatingSystemIdentifier = _operatingSystemIdentifier;
copy->_fileComment = [_fileComment copy];
copy->_POSIXPermissions = [_POSIXPermissions retain];
copy->_ownerAccountID = [_ownerAccountID retain];
copy->_groupOwnerAccountID = [_groupOwnerAccountID retain];
copy->_ownerAccountName = [_ownerAccountName copy];
copy->_groupOwnerAccountName = [_groupOwnerAccountName copy];
copy->_extensions = [_extensions copy];
} @catch (id e) {
[copy release];
@throw e;
}
return copy;
|
| ︙ | ︙ | |||
512 513 514 515 516 517 518 |
}
- (OFString *)fileComment
{
return _fileComment;
}
| | | | | | | | | | | | 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 |
}
- (OFString *)fileComment
{
return _fileComment;
}
- (OFNumber *)POSIXPermissions
{
return _POSIXPermissions;
}
- (OFNumber *)ownerAccountID
{
return _ownerAccountID;
}
- (OFNumber *)groupOwnerAccountID
{
return _groupOwnerAccountID;
}
- (OFString *)ownerAccountName
{
return _ownerAccountName;
}
- (OFString *)groupOwnerAccountName
{
return _groupOwnerAccountName;
}
- (OFArray OF_GENERIC(OFData *) *)extensions
{
return _extensions;
}
|
| ︙ | ︙ | |||
627 628 629 630 631 632 633 | tmp16 = OFToLittleEndian16((uint16_t)fileCommentLength + 3); [data addItems: &tmp16 count: sizeof(tmp16)]; [data addItem: "\x3F"]; [data addItems: [_fileComment cStringWithEncoding: encoding] count: fileCommentLength]; } | | > | | | | > | | | | | | | > | | | | | | | > | | 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 |
tmp16 = OFToLittleEndian16((uint16_t)fileCommentLength + 3);
[data addItems: &tmp16 count: sizeof(tmp16)];
[data addItem: "\x3F"];
[data addItems: [_fileComment cStringWithEncoding: encoding]
count: fileCommentLength];
}
if (_POSIXPermissions != nil) {
tmp16 = OFToLittleEndian16(5);
[data addItems: &tmp16 count: sizeof(tmp16)];
[data addItem: "\x50"];
tmp16 =
OFToLittleEndian16(_POSIXPermissions.unsignedShortValue);
[data addItems: &tmp16 count: sizeof(tmp16)];
}
if (_ownerAccountID != nil || _groupOwnerAccountID != nil) {
if (_ownerAccountID == nil || _groupOwnerAccountID == nil)
@throw [OFInvalidArgumentException exception];
tmp16 = OFToLittleEndian16(7);
[data addItems: &tmp16 count: sizeof(tmp16)];
[data addItem: "\x51"];
tmp16 = OFToLittleEndian16(
_groupOwnerAccountID.unsignedShortValue);
[data addItems: &tmp16 count: sizeof(tmp16)];
tmp16 = OFToLittleEndian16(_ownerAccountID.unsignedShortValue);
[data addItems: &tmp16 count: sizeof(tmp16)];
}
if (_groupOwnerAccountName != nil) {
size_t length = [_groupOwnerAccountName
cStringLengthWithEncoding: encoding];
if (length > UINT16_MAX - 3)
@throw [OFOutOfRangeException exception];
tmp16 = OFToLittleEndian16((uint16_t)length + 3);
[data addItems: &tmp16 count: sizeof(tmp16)];
[data addItem: "\x52"];
[data addItems: [_groupOwnerAccountName
cStringWithEncoding: encoding]
count: length];
}
if (_ownerAccountName != nil) {
size_t length =
[_ownerAccountName cStringLengthWithEncoding: encoding];
if (length > UINT16_MAX - 3)
@throw [OFOutOfRangeException exception];
tmp16 = OFToLittleEndian16((uint16_t)length + 3);
[data addItems: &tmp16 count: sizeof(tmp16)];
[data addItem: "\x53"];
[data addItems: [_ownerAccountName
cStringWithEncoding: encoding]
count: length];
}
for (OFData *extension in _extensions) {
size_t extensionLength = extension.count;
if (extension.itemSize != 1)
@throw [OFInvalidArgumentException exception];
|
| ︙ | ︙ | |||
717 718 719 720 721 722 723 |
objc_autoreleasePoolPop(pool);
}
- (OFString *)description
{
void *pool = objc_autoreleasePoolPush();
| | < > > > > > > | | | | | | | > | | 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 |
objc_autoreleasePoolPop(pool);
}
- (OFString *)description
{
void *pool = objc_autoreleasePoolPush();
OFString *POSIXPermissions = nil;
OFString *extensions = [_extensions.description
stringByReplacingOccurrencesOfString: @"\n"
withString: @"\n\t"];
OFString *ret;
if (_POSIXPermissions != nil)
POSIXPermissions = [OFString stringWithFormat: @"%ho",
_POSIXPermissions.unsignedShortValue];
ret = [OFString stringWithFormat:
@"<%@:\n"
@"\tFile name = %@\n"
@"\tCompression method = %@\n"
@"\tCompressed size = %llu\n"
@"\tUncompressed size = %llu\n"
@"\tModification date = %@\n"
@"\tHeader level = %u\n"
@"\tCRC16 = %04" @PRIX16 @"\n"
@"\tOperating system identifier = %c\n"
@"\tComment = %@\n"
@"\tPOSIX permissions = %@\n"
@"\tOwner account ID = %@\n"
@"\tGroup owner account ID = %@\n"
@"\tOwner account name = %@\n"
@"\tGroup owner accounut name = %@\n"
@"\tExtensions: %@"
@">",
self.class, self.fileName, _compressionMethod, _compressedSize,
_uncompressedSize, _modificationDate, _headerLevel, _CRC16,
_operatingSystemIdentifier, _fileComment, POSIXPermissions,
_ownerAccountID, _groupOwnerAccountID, _ownerAccountName,
_groupOwnerAccountName, extensions];
[ret retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
@end
|