Overview
| Comment: | ofarc: Support for std{in,out} when specifying "-" |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
1bcd504f42a5356a140d69f85dd9a292 |
| User & Date: | js on 2019-07-27 00:19:48 |
| Other Links: | manifest | tags |
Context
|
2019-07-27
| ||
| 10:15 | OFEpollKernelEventObserver: Minor cleanup check-in: aa5b44f36e user: js tags: trunk | |
| 00:19 | ofarc: Support for std{in,out} when specifying "-" check-in: 1bcd504f42 user: js tags: trunk | |
|
2019-06-27
| ||
| 23:01 | configure: Don't use -g with amiga-gcc check-in: ceed953f64 user: js tags: trunk | |
Changes
Modified utils/ofarc/OFArc.m from [d8150d466e] to [9b09288785].
| ︙ | ︙ | |||
317 318 319 320 321 322 323 | if (remainingArguments.count < 1) help(of_stderr, false, 1); files = [remainingArguments objectsInRange: of_range(1, remainingArguments.count - 1)]; #ifdef OF_HAVE_SANDBOX | > | | | 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 | if (remainingArguments.count < 1) help(of_stderr, false, 1); files = [remainingArguments objectsInRange: of_range(1, remainingArguments.count - 1)]; #ifdef OF_HAVE_SANDBOX if (![remainingArguments.firstObject isEqual: @"-"]) [sandbox unveilPath: remainingArguments.firstObject permissions: (mode == 'a' ? @"rwc" : @"wc")]; for (OFString *path in files) [sandbox unveilPath: path permissions: @"r"]; sandbox.allowsUnveil = false; [OFApplication activateSandbox: sandbox]; |
| ︙ | ︙ | |||
341 342 343 344 345 346 347 | [archive addFiles: files]; break; case 'l': if (remainingArguments.count != 1) help(of_stderr, false, 1); #ifdef OF_HAVE_SANDBOX | > | | > > | | > | 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | [archive addFiles: files]; break; case 'l': if (remainingArguments.count != 1) help(of_stderr, false, 1); #ifdef OF_HAVE_SANDBOX if (![remainingArguments.firstObject isEqual: @"-"]) [sandbox unveilPath: remainingArguments.firstObject permissions: @"r"]; sandbox.allowsUnveil = false; [OFApplication activateSandbox: sandbox]; #endif archive = [self openArchiveWithPath: remainingArguments.firstObject type: type mode: mode encoding: encoding]; [archive listFiles]; break; case 'p': if (remainingArguments.count < 1) help(of_stderr, false, 1); #ifdef OF_HAVE_SANDBOX if (![remainingArguments.firstObject isEqual: @"-"]) [sandbox unveilPath: remainingArguments.firstObject permissions: @"r"]; sandbox.allowsUnveil = false; [OFApplication activateSandbox: sandbox]; #endif files = [remainingArguments objectsInRange: of_range(1, remainingArguments.count - 1)]; |
| ︙ | ︙ | |||
385 386 387 388 389 390 391 | if (remainingArguments.count < 1) help(of_stderr, false, 1); files = [remainingArguments objectsInRange: of_range(1, remainingArguments.count - 1)]; #ifdef OF_HAVE_SANDBOX | > | | | 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 |
if (remainingArguments.count < 1)
help(of_stderr, false, 1);
files = [remainingArguments objectsInRange:
of_range(1, remainingArguments.count - 1)];
#ifdef OF_HAVE_SANDBOX
if (![remainingArguments.firstObject isEqual: @"-"])
[sandbox unveilPath: remainingArguments.firstObject
permissions: @"r"];
if (files.count > 0)
for (OFString *path in files)
[sandbox unveilPath: path
permissions: @"wc"];
else {
OFString *path = (outputDir != nil
|
| ︙ | ︙ | |||
462 463 464 465 466 467 468 |
- (id <Archive>)openArchiveWithPath: (OFString *)path
type: (OFString *)type
mode: (char)mode
encoding: (of_string_encoding_t)encoding
{
OFString *modeString, *fileModeString;
| | | 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 |
- (id <Archive>)openArchiveWithPath: (OFString *)path
type: (OFString *)type
mode: (char)mode
encoding: (of_string_encoding_t)encoding
{
OFString *modeString, *fileModeString;
OFStream *file = nil;
id <Archive> archive = nil;
[_archivePath release];
_archivePath = [path copy];
if (path == nil)
return nil;
|
| ︙ | ︙ | |||
488 489 490 491 492 493 494 | case 'x': modeString = fileModeString = @"r"; break; default: @throw [OFInvalidArgumentException exception]; } | > > > > > > > > > > > > > > > | | | | | | | | | | | | | | > | 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 |
case 'x':
modeString = fileModeString = @"r";
break;
default:
@throw [OFInvalidArgumentException exception];
}
if ([path isEqual: @"-"]) {
switch (mode) {
case 'a':
case 'c':
file = of_stdout;
break;
case 'l':
case 'p':
case 'x':
file = of_stdin;
break;
default:
@throw [OFInvalidArgumentException exception];
}
} else {
@try {
file = [OFFile fileWithPath: path
mode: fileModeString];
} @catch (OFOpenItemFailedException *e) {
OFString *error = [OFString
stringWithCString: strerror(e.errNo)
encoding: [OFLocale encoding]];
[of_stderr writeString: @"\r"];
[of_stderr writeLine: OF_LOCALIZED(
@"failed_to_open_file",
@"Failed to open file %[file]: %[error]",
@"file", e.path,
@"error", error)];
[OFApplication terminateWithStatus: 1];
}
}
if (type == nil || [type isEqual: @"auto"]) {
/* This one has to be first for obvious reasons */
if ([path hasSuffix: @".tar.gz"] || [path hasSuffix: @".tgz"] ||
[path hasSuffix: @".TAR.GZ"] || [path hasSuffix: @".TGZ"])
type = @"tgz";
|
| ︙ | ︙ |