Differences From Artifact [cb4c96888d]:
- File
src/OFTarArchive.m
— part of check-in
[c404c33cf1]
at
2017-08-05 18:00:22
on branch trunk
— OFZIPArchive: Don't require an OFSeekableStream
This is now only necessary for reading and appending. (user: js, size: 10365) [annotate] [blame] [check-ins using]
To Artifact [4feff55415]:
- File src/OFTarArchive.m — part of check-in [ddfb995c90] at 2017-08-05 21:39:59 on branch trunk — ofzip: Support for creating / appending tar files (user: js, size: 10429) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
291 292 293 294 295 296 297 298 299 300 301 302 303 304 |
objc_autoreleasePoolPop(pool);
return [[_lastReturnedStream retain] autorelease];
}
- (void)close
{
[_lastReturnedStream close];
[_lastReturnedStream release];
_lastReturnedStream = nil;
if (_mode == OF_TAR_ARCHIVE_MODE_WRITE ||
_mode == OF_TAR_ARCHIVE_MODE_APPEND) {
char buffer[1024];
| > > > | 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 |
objc_autoreleasePoolPop(pool);
return [[_lastReturnedStream retain] autorelease];
}
- (void)close
{
if (_stream == nil)
return;
[_lastReturnedStream close];
[_lastReturnedStream release];
_lastReturnedStream = nil;
if (_mode == OF_TAR_ARCHIVE_MODE_WRITE ||
_mode == OF_TAR_ARCHIVE_MODE_APPEND) {
char buffer[1024];
|
| ︙ | ︙ | |||
473 474 475 476 477 478 479 480 481 482 483 484 485 486 |
- (int)fileDescriptorForWriting
{
return [_stream fileDescriptorForWriting];
}
- (void)close
{
uint64_t remainder = 512 - [_entry size] % 512;
if (_toWrite > 0)
@throw [OFTruncatedDataException exception];
if (remainder != 512) {
bool wasWriteBuffered = [_stream isWriteBuffered];
| > > > | 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 |
- (int)fileDescriptorForWriting
{
return [_stream fileDescriptorForWriting];
}
- (void)close
{
if (_stream == nil)
return;
uint64_t remainder = 512 - [_entry size] % 512;
if (_toWrite > 0)
@throw [OFTruncatedDataException exception];
if (remainder != 512) {
bool wasWriteBuffered = [_stream isWriteBuffered];
|
| ︙ | ︙ |