Differences From Artifact [1dffeceb89]:
- File
src/OFFileManager.m
— part of check-in
[f119b9dc07]
at
2017-06-10 21:08:14
on branch trunk
— OFFileManager: More use of native APIs on MorphOS
This uses native AmigaDOS APIs for directory-related operations. (user: js, size: 27990) [annotate] [blame] [check-ins using]
To Artifact [0288fa6217]:
- File
src/OFFileManager.m
— part of check-in
[749855ed2b]
at
2017-06-10 22:20:19
on branch trunk
— OFFileManager: More use of native APIs on MorphOS
This uses native AmigaDOS APIs for listing directory contents. (user: js, size: 29058) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
424 425 426 427 428 429 430 | [currentPath autorelease]; } } - (OFArray *)contentsOfDirectoryAtPath: (OFString *)path { OFMutableArray *files; | < < < | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < > | > > > > > < | 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 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 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 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 | [currentPath autorelease]; } } - (OFArray *)contentsOfDirectoryAtPath: (OFString *)path { OFMutableArray *files; if (path == nil) @throw [OFInvalidArgumentException exception]; files = [OFMutableArray array]; #if defined(OF_WINDOWS) void *pool = objc_autoreleasePoolPush(); HANDLE handle; WIN32_FIND_DATAW fd; path = [path stringByAppendingString: @"\\*"]; if ((handle = FindFirstFileW([path UTF16String], &fd)) == INVALID_HANDLE_VALUE) { int errNo = 0; if (GetLastError() == ERROR_FILE_NOT_FOUND) errNo = ENOENT; @throw [OFOpenItemFailedException exceptionWithPath: path mode: nil errNo: errNo]; } @try { do { OFString *file; if (!wcscmp(fd.cFileName, L".") || !wcscmp(fd.cFileName, L"..")) continue; file = [OFString stringWithUTF16String: fd.cFileName]; @try { [files addObject: file]; } @finally { [file release]; } } while (FindNextFileW(handle, &fd)); if (GetLastError() != ERROR_NO_MORE_FILES) @throw [OFReadFailedException exceptionWithObject: self requestedLength: 0 errNo: EIO]; } @finally { FindClose(handle); } objc_autoreleasePoolPop(pool); #elif defined(OF_MORPHOS) of_string_encoding_t encoding = [OFLocalization encoding]; BPTR lock; struct FileInfoBlock fib; if ((lock = Lock([path cStringWithEncoding: encoding], SHARED_LOCK)) == 0) { int errNo; switch (IoErr()) { case ERROR_OBJECT_IN_USE: case ERROR_DISK_NOT_VALIDATED: errNo = EBUSY; break; case ERROR_OBJECT_NOT_FOUND: errNo = ENOENT; break; default: errNo = 0; break; } @throw [OFOpenItemFailedException exceptionWithPath: path mode: nil errNo: errNo]; } @try { if (!Examine(lock, &fib)) @throw [OFOpenItemFailedException exceptionWithPath: path mode: nil errNo: 0]; while (ExNext(lock, &fib)) { OFString *file; file = [[OFString alloc] initWithCString: fib.fib_FileName encoding: encoding]; @try { [files addObject: file]; } @finally { [file release]; } } if (IoErr() != ERROR_NO_MORE_ENTRIES) @throw [OFReadFailedException exceptionWithObject: self requestedLength: 0 errNo: EIO]; } @finally { UnLock(lock); } #else of_string_encoding_t encoding = [OFLocalization encoding]; DIR *dir; if ((dir = opendir([path cStringWithEncoding: encoding])) == NULL) @throw [OFOpenItemFailedException exceptionWithPath: path mode: nil errNo: errno]; # if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) @try { [readdirMutex lock]; } @catch (id e) { closedir(dir); @throw e; } # endif @try { for (;;) { struct dirent *dirent; # ifdef HAVE_READDIR_R struct dirent buffer; # endif OFString *file; # ifdef HAVE_READDIR_R if (readdir_r(dir, &buffer, &dirent) != 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: 0 |
︙ | ︙ | |||
480 481 482 483 484 485 486 | } # endif if (strcmp(dirent->d_name, ".") == 0 || strcmp(dirent->d_name, "..") == 0) continue; | < < | | > | > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 | } # endif if (strcmp(dirent->d_name, ".") == 0 || strcmp(dirent->d_name, "..") == 0) continue; file = [[OFString alloc] initWithCString: dirent->d_name encoding: encoding]; @try { [files addObject: file]; } @finally { [file release]; } } } @finally { closedir(dir); # if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) [readdirMutex unlock]; # endif } #endif [files makeImmutable]; return files; } |
︙ | ︙ |