Overview
| Comment: | OFLHAArchiveEntry: Add support for LHA level 1 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
f0edbd81c35682c9342e603889e7b4a5 |
| User & Date: | js on 2018-05-27 12:34:02 |
| Other Links: | manifest | tags |
Context
|
2018-06-03
| ||
| 18:15 | OFLHAArchive: Support for -lh[4567]- compression check-in: 6cbc2253b8 user: js tags: trunk | |
|
2018-05-27
| ||
| 12:34 | OFLHAArchiveEntry: Add support for LHA level 1 check-in: f0edbd81c3 user: js tags: trunk | |
| 11:14 | ofzip: Only print OS identifier if it exists check-in: bfc99fa4ac user: js tags: trunk | |
Changes
Modified src/OFLHAArchiveEntry.m from [5976df7f2a] to [8228378a63].
| ︙ | ︙ | |||
193 194 195 196 197 198 199 | entry->_modificationDate = [[OFDate alloc] initWithTimeIntervalSince1970: modificationDate]; } static bool parseExtension(OFLHAArchiveEntry *entry, OFData *extension, | | > | | 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 |
entry->_modificationDate = [[OFDate alloc]
initWithTimeIntervalSince1970: modificationDate];
}
static bool
parseExtension(OFLHAArchiveEntry *entry, OFData *extension,
of_string_encoding_t encoding, bool allowFileName)
{
void (*function)(OFLHAArchiveEntry *, OFData *, of_string_encoding_t) =
NULL;
switch (*(char *)[extension itemAtIndex: 0]) {
case 0x01:
if (allowFileName)
function = parseFileNameExtension;
break;
case 0x02:
function = parseDirectoryNameExtension;
break;
case 0x3F:
function = parseCommentExtension;
break;
|
| ︙ | ︙ | |||
234 235 236 237 238 239 240 | function(entry, extension, encoding); return true; } static void readExtensions(OFLHAArchiveEntry *entry, OFStream *stream, | | | | | | | > > > > > > > | 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 |
function(entry, extension, encoding);
return true;
}
static void
readExtensions(OFLHAArchiveEntry *entry, OFStream *stream,
of_string_encoding_t encoding, bool allowFileName)
{
uint16_t size;
while ((size = [stream readLittleEndianInt16]) > 0) {
OFData *extension;
if (size < 2)
@throw [OFInvalidFormatException exception];
extension = [stream readDataWithCount: size - 2];
if (!parseExtension(entry, extension, encoding, allowFileName))
[entry->_extensions addObject: extension];
if (entry->_level == 1) {
if (entry->_compressedSize < size)
@throw [OFInvalidFormatException exception];
entry->_compressedSize -= size;
}
}
}
@implementation OFLHAArchiveEntry
@synthesize method = _method, compressedSize = _compressedSize;
@synthesize uncompressedSize = _uncompressedSize, date = _date;
@synthesize level = _level, CRC16 = _CRC16;
|
| ︙ | ︙ | |||
289 290 291 292 293 294 295 | memcpy(&_uncompressedSize, header + 11, 4); _uncompressedSize = OF_BSWAP32_IF_BE(_uncompressedSize); memcpy(&date, header + 15, 4); date = OF_BSWAP32_IF_BE(date); _level = header[20]; | < | > | > > > > > > > | | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 |
memcpy(&_uncompressedSize, header + 11, 4);
_uncompressedSize = OF_BSWAP32_IF_BE(_uncompressedSize);
memcpy(&date, header + 15, 4);
date = OF_BSWAP32_IF_BE(date);
_level = header[20];
_extensions = [[OFMutableArray alloc] init];
switch (_level) {
case 0:
case 1:;
void *pool = objc_autoreleasePoolPush();
uint8_t fileNameLength;
OFString *tmp;
_date = [parseMSDOSDate(date) retain];
fileNameLength = [stream readInt8];
tmp = [stream readStringWithLength: fileNameLength
encoding: encoding];
tmp = [tmp stringByReplacingOccurrencesOfString: @"\\"
withString: @"/"];
_fileName = [tmp copy];
_CRC16 = [stream readLittleEndianInt16];
if (_level == 1) {
_operatingSystemIdentifier = [stream readInt8];
readExtensions(self, stream, encoding, false);
}
objc_autoreleasePoolPop(pool);
break;
case 2:
_date = [[OFDate alloc]
initWithTimeIntervalSince1970: date];
_CRC16 = [stream readLittleEndianInt16];
_operatingSystemIdentifier = [stream readInt8];
readExtensions(self, stream, encoding, true);
break;
default:;
OFString *version = [OFString
stringWithFormat: @"%u", _level];
@throw [OFUnsupportedVersionException
|
| ︙ | ︙ |