Differences From Artifact [0a34c90b44]:
- File
src/OFZIPArchiveEntry.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: 6844) [annotate] [blame] [check-ins using]
To Artifact [96e189c829]:
- File src/OFZIPArchiveEntry.m — part of check-in [c1d665c395] at 2014-05-26 15:41:57 on branch trunk — OFZIPArchiveEntry: Make more properties public (user: js, size: 6696) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
29 30 31 32 33 34 35 | #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" extern uint32_t of_zip_archive_read_field32(uint8_t**, uint16_t*); extern uint64_t of_zip_archive_read_field64(uint8_t**, uint16_t*); void | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 |
#import "OFInvalidArgumentException.h"
#import "OFInvalidFormatException.h"
extern uint32_t of_zip_archive_read_field32(uint8_t**, uint16_t*);
extern uint64_t of_zip_archive_read_field64(uint8_t**, uint16_t*);
void
of_zip_archive_entry_extra_field_find(OFDataArray *extraField, uint16_t tag,
uint8_t **data, uint16_t *size)
{
uint8_t *bytes;
size_t i, count;
bytes = [extraField items];
count = [extraField count];
|
| ︙ | ︙ | |||
78 79 80 81 82 83 84 | of_string_encoding_t encoding; uint8_t *ZIP64 = NULL; uint16_t ZIP64Size; if ([file readLittleEndianInt32] != 0x02014B50) @throw [OFInvalidFormatException exception]; | | | | | | | 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 |
of_string_encoding_t encoding;
uint8_t *ZIP64 = NULL;
uint16_t ZIP64Size;
if ([file readLittleEndianInt32] != 0x02014B50)
@throw [OFInvalidFormatException exception];
_versionMadeBy = [file readLittleEndianInt16];
_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];
fileCommentLength = [file readLittleEndianInt16];
_startDiskNumber = [file readLittleEndianInt16];
_internalAttributes = [file readLittleEndianInt16];
_versionSpecificAttributes = [file readLittleEndianInt32];
_localFileHeaderOffset = [file readLittleEndianInt32];
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];
_fileComment = [[file readStringWithLength: fileCommentLength
encoding: encoding] copy];
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(
|
| ︙ | ︙ | |||
155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
OF_GETTER(_fileName, true)
}
- (OFString*)fileComment
{
OF_GETTER(_fileComment, true)
}
- (uint64_t)compressedSize
{
return _compressedSize;
}
- (uint64_t)uncompressedSize
| > > > > > > > > > > > > > > > | 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 |
OF_GETTER(_fileName, true)
}
- (OFString*)fileComment
{
OF_GETTER(_fileComment, true)
}
- (uint16_t)versionMadeBy
{
return _versionMadeBy;
}
- (uint16_t)minVersionNeeded
{
return _minVersionNeeded;
}
- (uint16_t)compressionMethod
{
return _compressionMethod;
}
- (uint64_t)compressedSize
{
return _compressedSize;
}
- (uint64_t)uncompressedSize
|
| ︙ | ︙ | |||
194 195 196 197 198 199 200 201 202 203 204 205 206 207 |
return [date autorelease];
}
- (uint32_t)CRC32
{
return _CRC32;
}
- (OFDataArray*)extraField
{
return [[_extraField copy] autorelease];
}
- (OFString*)description
| > > > > > | 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 |
return [date autorelease];
}
- (uint32_t)CRC32
{
return _CRC32;
}
- (uint32_t)versionSpecificAttributes
{
return _versionSpecificAttributes;
}
- (OFDataArray*)extraField
{
return [[_extraField copy] autorelease];
}
- (OFString*)description
|
| ︙ | ︙ | |||
226 227 228 229 230 231 232 | (intmax_t)_uncompressedSize, modificationDate, _CRC32, _extraField]; objc_autoreleasePoolPop(pool); return [ret autorelease]; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 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 |
(intmax_t)_uncompressedSize, modificationDate, _CRC32, _extraField];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
- (uint16_t)OF_generalPurposeBitFlag
{
return _generalPurposeBitFlag;
}
- (uint16_t)OF_lastModifiedFileTime
{
return _lastModifiedFileTime;
}
- (uint16_t)OF_lastModifiedFileDate
{
return _lastModifiedFileDate;
}
- (uint64_t)OF_localFileHeaderOffset
{
return _localFileHeaderOffset;
}
@end
|