Differences From Artifact [3c453bb2f0]:
- File src/OFLHAArchive.m — part of check-in [fee2316eca] at 2022-08-15 23:02:10 on branch trunk — OF{LHA,Tar,ZIP}Archive: Use URL instead of path (user: js, size: 12039) [annotate] [blame] [check-ins using]
To Artifact [39715cb197]:
- File
src/OFLHAArchive.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: 12091) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
42 43 44 45 46 47 48 |
};
OF_DIRECT_MEMBERS
@interface OFLHAArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
{
OFStream *_stream, *_decompressedStream;
OFLHAArchiveEntry *_entry;
| | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 |
};
OF_DIRECT_MEMBERS
@interface OFLHAArchiveFileReadStream: OFStream <OFReadyForReadingObserving>
{
OFStream *_stream, *_decompressedStream;
OFLHAArchiveEntry *_entry;
unsigned long long _toRead;
uint16_t _CRC16;
bool _atEndOfStream, _skipped;
}
- (instancetype)of_initWithStream: (OFStream *)stream
entry: (OFLHAArchiveEntry *)entry;
- (void)of_skip;
|
| ︙ | ︙ | |||
329 330 331 332 333 334 335 | if (_atEndOfStream) return 0; if (_stream.atEndOfStream && !_decompressedStream.hasDataInReadBuffer) @throw [OFTruncatedDataException exception]; if (length > _toRead) | | | 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 |
if (_atEndOfStream)
return 0;
if (_stream.atEndOfStream && !_decompressedStream.hasDataInReadBuffer)
@throw [OFTruncatedDataException exception];
if (length > _toRead)
length = (size_t)_toRead;
ret = [_decompressedStream readIntoBuffer: buffer length: length];
_toRead -= ret;
_CRC16 = OFCRC16(_CRC16, buffer, ret);
if (_toRead == 0) {
|
| ︙ | ︙ | |||
369 370 371 372 373 374 375 |
return ((id <OFReadyForReadingObserving>)_decompressedStream)
.fileDescriptorForReading;
}
- (void)of_skip
{
OFStream *stream;
| | | 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 |
return ((id <OFReadyForReadingObserving>)_decompressedStream)
.fileDescriptorForReading;
}
- (void)of_skip
{
OFStream *stream;
unsigned long long toRead;
if (_stream == nil || _skipped)
return;
stream = _stream;
toRead = _toRead;
|
| ︙ | ︙ | |||
394 395 396 397 398 399 400 | toRead = _entry.compressedSize - decompressingStream.bytesConsumed; stream = _stream; } if ([stream isKindOfClass: [OFSeekableStream class]] && | | | | > | 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 |
toRead =
_entry.compressedSize - decompressingStream.bytesConsumed;
stream = _stream;
}
if ([stream isKindOfClass: [OFSeekableStream class]] &&
(sizeof(OFFileOffset) > 4 || toRead != (OFFileOffset)toRead))
[(OFSeekableStream *)stream seekToOffset: (OFFileOffset)toRead
whence: SEEK_CUR];
else {
while (toRead > 0) {
char buffer[512];
unsigned long long min = toRead;
if (min > 512)
min = 512;
toRead -= [stream readIntoBuffer: buffer
length: (size_t)min];
}
}
_toRead = 0;
_skipped = true;
}
|
| ︙ | ︙ |