Overview
| Comment: | ofzip: Delete incomplete files in create mode |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
bd0957cdee9f3f7ae7ca3346ebcb9832 |
| User & Date: | js on 2017-08-05 18:08:22 |
| Other Links: | manifest | tags |
Context
|
2017-08-05
| ||
| 21:14 | OFMutableTarArchiveEntry: Fix typo check-in: d755a2d6ca user: js tags: trunk | |
| 18:08 | ofzip: Delete incomplete files in create mode check-in: bd0957cdee user: js tags: trunk | |
| 18:00 | OFZIPArchive: Don't require an OFSeekableStream check-in: c404c33cf1 user: js tags: trunk | |
Changes
Modified utils/ofzip/OFZIP.m from [8ac0b34839] to [a1e700c9d6].
| ︙ | ︙ | |||
135 136 137 138 139 140 141 |
static void
writingNotSupported(OFString *type)
{
[of_stderr writeLine: OF_LOCALIZED(
@"writing_not_supported",
@"Writing archives of type %[type] is not (yet) supported!",
@"type", type)];
| < | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 |
static void
writingNotSupported(OFString *type)
{
[of_stderr writeLine: OF_LOCALIZED(
@"writing_not_supported",
@"Writing archives of type %[type] is not (yet) supported!",
@"type", type)];
}
@implementation OFZIP
- (void)applicationDidFinishLaunching
{
OFString *outputDir = nil, *type = nil;
const of_options_parser_option_t options[] = {
|
| ︙ | ︙ | |||
411 412 413 414 415 416 417 |
archive = [ZIPArchive archiveWithStream: file
mode: modeString];
else {
[of_stderr writeLine: OF_LOCALIZED(
@"unknown_archive_type",
@"Unknown archive type: %[type]",
@"type", type)];
| | | > > > | | | | > | > > > > > > > | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 |
archive = [ZIPArchive archiveWithStream: file
mode: modeString];
else {
[of_stderr writeLine: OF_LOCALIZED(
@"unknown_archive_type",
@"Unknown archive type: %[type]",
@"type", type)];
goto error;
}
} @catch (OFNotImplementedException *e) {
if ((mode == 'a' || mode == 'c') &&
sel_isEqual([e selector],
@selector(initWithStream:mode:))) {
writingNotSupported(type);
goto error;
}
@throw e;
} @catch (OFReadFailedException *e) {
OFString *error = [OFString
stringWithCString: strerror([e errNo])
encoding: [OFLocalization encoding]];
[of_stderr writeLine: OF_LOCALIZED(@"failed_to_read_file",
@"Failed to read file %[file]: %[error]",
@"file", path,
@"error", error)];
goto error;
} @catch (OFSeekFailedException *e) {
OFString *error = [OFString
stringWithCString: strerror([e errNo])
encoding: [OFLocalization encoding]];
[of_stderr writeLine: OF_LOCALIZED(@"failed_to_seek_in_file",
@"Failed to seek in file %[file]: %[error]",
@"file", path,
@"error", error)];
goto error;
} @catch (OFInvalidFormatException *e) {
[of_stderr writeLine: OF_LOCALIZED(
@"file_is_not_a_valid_archive",
@"File %[file] is not a valid archive!",
@"file", path)];
goto error;
}
if ((mode == 'a' || mode == 'c') &&
![archive respondsToSelector: @selector(addFiles:)]) {
writingNotSupported(type);
goto error;
}
return archive;
error:
if (mode == 'c')
[[OFFileManager defaultManager] removeItemAtPath: path];
[OFApplication terminateWithStatus: 1];
}
- (bool)shouldExtractFile: (OFString *)fileName
outFileName: (OFString *)outFileName
{
OFString *line;
|
| ︙ | ︙ |