Differences From Artifact [596d16c180]:
- File
src/OFLHAArchiveEntry.m
— part of check-in
[1a6e3816c1]
at
2018-05-27 07:32:22
on branch trunk
— OFLHAArchiveEntry: Keep the method as a string
It is only necessary to extract files, so it makes sense to keep it as
is to be able to list files using an unknown method. (user: js, size: 9089) [annotate] [blame] [check-ins using]
To Artifact [5976df7f2a]:
- File src/OFLHAArchiveEntry.m — part of check-in [57f9bc6ace] at 2018-05-27 11:07:03 on branch trunk — OFLHAArchiveEntry: Add support for LHA level 0 (user: js, size: 10092) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 |
#import "OFDate.h"
#import "OFNumber.h"
#import "OFStream.h"
#import "OFString.h"
#import "OFInvalidFormatException.h"
#import "OFUnsupportedVersionException.h"
static void
parseFileNameExtension(OFLHAArchiveEntry *entry, OFData *extension,
of_string_encoding_t encoding)
{
[entry->_fileName release];
entry->_fileName = nil;
| > > > > > > > > > > > > > > > > > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 |
#import "OFDate.h"
#import "OFNumber.h"
#import "OFStream.h"
#import "OFString.h"
#import "OFInvalidFormatException.h"
#import "OFUnsupportedVersionException.h"
static OFDate *
parseMSDOSDate(uint32_t MSDOSDate)
{
uint16_t year = ((MSDOSDate & 0xFE000000) >> 25) + 1980;
uint8_t month = (MSDOSDate & 0x1E00000) >> 21;
uint8_t day = (MSDOSDate & 0x1F);
uint8_t hour = (MSDOSDate & 0xF800) >> 11;
uint8_t minute = (MSDOSDate & 0x7E0) >> 5;
uint8_t second = (MSDOSDate & 0x1F) << 1;
OFString *dateString;
dateString = [OFString
stringWithFormat: @"%04u-%02u-%02u %02u:%02u:%02u",
year, month, day, hour, minute, second];
return [OFDate dateWithLocalDateString: dateString
format: @"%Y-%m-%d %H:%M:%S"];
}
static void
parseFileNameExtension(OFLHAArchiveEntry *entry, OFData *extension,
of_string_encoding_t encoding)
{
[entry->_fileName release];
entry->_fileName = nil;
|
| ︙ | ︙ | |||
212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 |
if (function == NULL)
return false;
function(entry, extension, encoding);
return true;
}
@implementation OFLHAArchiveEntry
@synthesize method = _method, compressedSize = _compressedSize;
@synthesize uncompressedSize = _uncompressedSize, date = _date;
@synthesize level = _level, CRC16 = _CRC16;
@synthesize operatingSystemIdentifier = _operatingSystemIdentifier;
@synthesize fileComment = _fileComment, mode = _mode, UID = _UID, GID = _GID;
@synthesize owner = _owner, group = _group;
@synthesize modificationDate = _modificationDate, extensions = _extensions;
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
| > > > > > > > > > > > > > > > > > > > | | | < < < < < < < < < | | | | | > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < | | 231 232 233 234 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 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 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 |
if (function == NULL)
return false;
function(entry, extension, encoding);
return true;
}
static void
readExtensions(OFLHAArchiveEntry *entry, OFStream *stream,
of_string_encoding_t encoding)
{
uint16_t nextSize;
while ((nextSize = [stream readLittleEndianInt16]) > 0) {
OFData *extension;
if (nextSize < 2)
@throw [OFInvalidFormatException exception];
extension = [stream readDataWithCount: nextSize - 2];
if (!parseExtension(entry, extension, encoding))
[entry->_extensions addObject: extension];
}
}
@implementation OFLHAArchiveEntry
@synthesize method = _method, compressedSize = _compressedSize;
@synthesize uncompressedSize = _uncompressedSize, date = _date;
@synthesize level = _level, CRC16 = _CRC16;
@synthesize operatingSystemIdentifier = _operatingSystemIdentifier;
@synthesize fileComment = _fileComment, mode = _mode, UID = _UID, GID = _GID;
@synthesize owner = _owner, group = _group;
@synthesize modificationDate = _modificationDate, extensions = _extensions;
- (instancetype)init
{
OF_INVALID_INIT_METHOD
}
- (instancetype)of_initWithHeader: (char [21])header
stream: (OFStream *)stream
encoding: (of_string_encoding_t)encoding
{
self = [super init];
@try {
uint32_t date;
_method = [[OFString alloc]
initWithCString: header + 2
encoding: OF_STRING_ENCODING_ASCII
length: 5];
memcpy(&_compressedSize, header + 7, 4);
_compressedSize = OF_BSWAP32_IF_BE(_compressedSize);
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:;
void *pool = objc_autoreleasePoolPush();
uint16_t fileNameLength = [stream readInt8];
OFString *tmp;
_date = [parseMSDOSDate(date) retain];
tmp = [stream readStringWithLength: fileNameLength
encoding: encoding];
tmp = [tmp stringByReplacingOccurrencesOfString: @"\\"
withString: @"/"];
_fileName = [tmp copy];
_CRC16 = [stream readLittleEndianInt16];
objc_autoreleasePoolPop(pool);
break;
case 2:
_date = [[OFDate alloc]
initWithTimeIntervalSince1970: date];
_CRC16 = [stream readLittleEndianInt16];
_operatingSystemIdentifier = [stream readInt8];
readExtensions(self, stream, encoding);
break;
default:;
OFString *version = [OFString
stringWithFormat: @"%u", _level];
@throw [OFUnsupportedVersionException
exceptionWithVersion: version];
}
[_extensions makeImmutable];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
|
| ︙ | ︙ |