Comment: | Explicitly pass errno to exceptions
The old behaviour where the exception would access errno directly on This also greatly increases errno handling on Win32, especially in |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
62e2de30b90a84e880b0e0f41c526ae7 |
User & Date: | js on 2015-02-16 08:39:17 |
Other Links: | manifest | tags |
2015-02-18
| ||
22:56 | Add of_getsockname() and make use of it check-in: f18615e057 user: js tags: trunk | |
2015-02-16
| ||
08:39 | Explicitly pass errno to exceptions check-in: 62e2de30b9 user: js tags: trunk | |
2015-02-01
| ||
14:42 | of_resolve_host(): Place inet_addr() inside mutex check-in: 2e176bc500 user: js tags: trunk | |
Modified ObjFW.xcodeproj/project.pbxproj from [e18fb0f89b] to [ea821de98c].
︙ | ︙ | |||
268 269 270 271 272 273 274 | 4B552555147AA5DB0003BF47 /* OFString_UTF8.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B552551147AA5DB0003BF47 /* OFString_UTF8.m */; }; 4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0F9133ABEA900B58A93 /* OFThreadJoinFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A100133ABEA900B58A93 /* OFThreadJoinFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FA133ABEA900B58A93 /* OFThreadJoinFailedException.m */; }; 4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FB133ABEA900B58A93 /* OFThreadStartFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A102133ABEA900B58A93 /* OFThreadStartFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FC133ABEA900B58A93 /* OFThreadStartFailedException.m */; }; 4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FD133ABEA900B58A93 /* OFThreadStillRunningException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A104133ABEA900B58A93 /* OFThreadStillRunningException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FE133ABEA900B58A93 /* OFThreadStillRunningException.m */; }; | < | 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | 4B552555147AA5DB0003BF47 /* OFString_UTF8.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B552551147AA5DB0003BF47 /* OFString_UTF8.m */; }; 4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0F9133ABEA900B58A93 /* OFThreadJoinFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A100133ABEA900B58A93 /* OFThreadJoinFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FA133ABEA900B58A93 /* OFThreadJoinFailedException.m */; }; 4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FB133ABEA900B58A93 /* OFThreadStartFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A102133ABEA900B58A93 /* OFThreadStartFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FC133ABEA900B58A93 /* OFThreadStartFailedException.m */; }; 4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A0FD133ABEA900B58A93 /* OFThreadStillRunningException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A104133ABEA900B58A93 /* OFThreadStillRunningException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A0FE133ABEA900B58A93 /* OFThreadStillRunningException.m */; }; 4B55A10A133AC05100B58A93 /* OFOpenFileFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A107133AC05100B58A93 /* OFOpenFileFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A10B133AC05100B58A93 /* OFOpenFileFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A108133AC05100B58A93 /* OFOpenFileFailedException.m */; }; 4B55A112133AC24600B58A93 /* OFReadFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A10C133AC24500B58A93 /* OFReadFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A113133AC24600B58A93 /* OFReadFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A10D133AC24500B58A93 /* OFReadFailedException.m */; }; 4B55A114133AC24600B58A93 /* OFReadOrWriteFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A10E133AC24500B58A93 /* OFReadOrWriteFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4B55A115133AC24600B58A93 /* OFReadOrWriteFailedException.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B55A10F133AC24500B58A93 /* OFReadOrWriteFailedException.m */; }; 4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A110133AC24500B58A93 /* OFWriteFailedException.h */; settings = {ATTRIBUTES = (Public, ); }; }; |
︙ | ︙ | |||
693 694 695 696 697 698 699 | 4B552551147AA5DB0003BF47 /* OFString_UTF8.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFString_UTF8.m; path = src/OFString_UTF8.m; sourceTree = "<group>"; }; 4B55A0F9133ABEA900B58A93 /* OFThreadJoinFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFThreadJoinFailedException.h; path = src/exceptions/OFThreadJoinFailedException.h; sourceTree = "<group>"; }; 4B55A0FA133ABEA900B58A93 /* OFThreadJoinFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFThreadJoinFailedException.m; path = src/exceptions/OFThreadJoinFailedException.m; sourceTree = "<group>"; }; 4B55A0FB133ABEA900B58A93 /* OFThreadStartFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFThreadStartFailedException.h; path = src/exceptions/OFThreadStartFailedException.h; sourceTree = "<group>"; }; 4B55A0FC133ABEA900B58A93 /* OFThreadStartFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFThreadStartFailedException.m; path = src/exceptions/OFThreadStartFailedException.m; sourceTree = "<group>"; }; 4B55A0FD133ABEA900B58A93 /* OFThreadStillRunningException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFThreadStillRunningException.h; path = src/exceptions/OFThreadStillRunningException.h; sourceTree = "<group>"; }; 4B55A0FE133ABEA900B58A93 /* OFThreadStillRunningException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFThreadStillRunningException.m; path = src/exceptions/OFThreadStillRunningException.m; sourceTree = "<group>"; }; | < | 692 693 694 695 696 697 698 699 700 701 702 703 704 705 | 4B552551147AA5DB0003BF47 /* OFString_UTF8.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFString_UTF8.m; path = src/OFString_UTF8.m; sourceTree = "<group>"; }; 4B55A0F9133ABEA900B58A93 /* OFThreadJoinFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFThreadJoinFailedException.h; path = src/exceptions/OFThreadJoinFailedException.h; sourceTree = "<group>"; }; 4B55A0FA133ABEA900B58A93 /* OFThreadJoinFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFThreadJoinFailedException.m; path = src/exceptions/OFThreadJoinFailedException.m; sourceTree = "<group>"; }; 4B55A0FB133ABEA900B58A93 /* OFThreadStartFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFThreadStartFailedException.h; path = src/exceptions/OFThreadStartFailedException.h; sourceTree = "<group>"; }; 4B55A0FC133ABEA900B58A93 /* OFThreadStartFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFThreadStartFailedException.m; path = src/exceptions/OFThreadStartFailedException.m; sourceTree = "<group>"; }; 4B55A0FD133ABEA900B58A93 /* OFThreadStillRunningException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFThreadStillRunningException.h; path = src/exceptions/OFThreadStillRunningException.h; sourceTree = "<group>"; }; 4B55A0FE133ABEA900B58A93 /* OFThreadStillRunningException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFThreadStillRunningException.m; path = src/exceptions/OFThreadStillRunningException.m; sourceTree = "<group>"; }; 4B55A107133AC05100B58A93 /* OFOpenFileFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFOpenFileFailedException.h; path = src/exceptions/OFOpenFileFailedException.h; sourceTree = "<group>"; }; 4B55A108133AC05100B58A93 /* OFOpenFileFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFOpenFileFailedException.m; path = src/exceptions/OFOpenFileFailedException.m; sourceTree = "<group>"; }; 4B55A10C133AC24500B58A93 /* OFReadFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFReadFailedException.h; path = src/exceptions/OFReadFailedException.h; sourceTree = "<group>"; }; 4B55A10D133AC24500B58A93 /* OFReadFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFReadFailedException.m; path = src/exceptions/OFReadFailedException.m; sourceTree = "<group>"; }; 4B55A10E133AC24500B58A93 /* OFReadOrWriteFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFReadOrWriteFailedException.h; path = src/exceptions/OFReadOrWriteFailedException.h; sourceTree = "<group>"; }; 4B55A10F133AC24500B58A93 /* OFReadOrWriteFailedException.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OFReadOrWriteFailedException.m; path = src/exceptions/OFReadOrWriteFailedException.m; sourceTree = "<group>"; }; 4B55A110133AC24500B58A93 /* OFWriteFailedException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OFWriteFailedException.h; path = src/exceptions/OFWriteFailedException.h; sourceTree = "<group>"; }; |
︙ | ︙ | |||
1131 1132 1133 1134 1135 1136 1137 | 4B6743F0163C384A00EB1E59 /* OFUnlockFailedException.m */, 4B17FFAF133A3658003E6DCD /* OFUnsupportedProtocolException.h */, 4B17FFB0133A365C003E6DCD /* OFUnsupportedProtocolException.m */, 4BA4846015CC9F1E00D75360 /* OFUnsupportedVersionException.h */, 4BA4846115CC9F1E00D75360 /* OFUnsupportedVersionException.m */, 4B55A110133AC24500B58A93 /* OFWriteFailedException.h */, 4B55A111133AC24600B58A93 /* OFWriteFailedException.m */, | < | 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 | 4B6743F0163C384A00EB1E59 /* OFUnlockFailedException.m */, 4B17FFAF133A3658003E6DCD /* OFUnsupportedProtocolException.h */, 4B17FFB0133A365C003E6DCD /* OFUnsupportedProtocolException.m */, 4BA4846015CC9F1E00D75360 /* OFUnsupportedVersionException.h */, 4BA4846115CC9F1E00D75360 /* OFUnsupportedVersionException.m */, 4B55A110133AC24500B58A93 /* OFWriteFailedException.h */, 4B55A111133AC24600B58A93 /* OFWriteFailedException.m */, ); name = Exceptions; sourceTree = "<group>"; }; 4B17FF95133A31F9003E6DCD /* Supporting Files */ = { isa = PBXGroup; children = ( |
︙ | ︙ | |||
1760 1761 1762 1763 1764 1765 1766 | 4B17FFB5133A375B003E6DCD /* OFUnboundNamespaceException.h in Headers */, 4BD77FDE176E4BC40031C497 /* OFUnboundPrefixException.h in Headers */, 4B91FD12196B4F5900C5C25E /* OFUnknownXMLEntityException.h in Headers */, 4B6743F5163C384A00EB1E59 /* OFUnlockFailedException.h in Headers */, 4B17FFB1133A3664003E6DCD /* OFUnsupportedProtocolException.h in Headers */, 4BA4846215CC9F1E00D75360 /* OFUnsupportedVersionException.h in Headers */, 4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */, | < | 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 | 4B17FFB5133A375B003E6DCD /* OFUnboundNamespaceException.h in Headers */, 4BD77FDE176E4BC40031C497 /* OFUnboundPrefixException.h in Headers */, 4B91FD12196B4F5900C5C25E /* OFUnknownXMLEntityException.h in Headers */, 4B6743F5163C384A00EB1E59 /* OFUnlockFailedException.h in Headers */, 4B17FFB1133A3664003E6DCD /* OFUnsupportedProtocolException.h in Headers */, 4BA4846215CC9F1E00D75360 /* OFUnsupportedVersionException.h in Headers */, 4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */, 4B2B3E7D140D430500EC2F7C /* OFArray_adjacent.h in Headers */, 4B9BB7BD141CDE2D000AD1CC /* OFArray_adjacentSubarray.h in Headers */, 4B1473CB17E6391900B46BB8 /* OFAutoreleasePool+Private.h in Headers */, 4BA85BCA140ECCE800E91D51 /* OFCountedSet_hashtable.h in Headers */, 4B2B3E7F140D430500EC2F7C /* OFDictionary_hashtable.h in Headers */, 4B06855518B2AD3800FC731A /* OFINICategory+Private.h in Headers */, 4B0EA9231898690E00F573A4 /* OFKernelEventObserver+Private.h in Headers */, |
︙ | ︙ |
Modified configure.ac from [073f94a1b8] to [c29aae2dde].
︙ | ︙ | |||
452 453 454 455 456 457 458 459 460 461 462 463 464 465 | AC_DEFINE(HAVE_VFP2, 1, [Whether we have VFP2 or above]) AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no) ]) ;; esac AC_CHECK_LIB(m, fmod, LIBS="$LIBS -lm") AC_CHECK_FUNC(asprintf, [ case "$host" in *-psp-*) dnl asprintf is broken on the PSP, but snprintf works. | > > | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 | AC_DEFINE(HAVE_VFP2, 1, [Whether we have VFP2 or above]) AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no) ]) ;; esac AC_CHECK_FUNCS(strerror_r) AC_CHECK_LIB(m, fmod, LIBS="$LIBS -lm") AC_CHECK_FUNC(asprintf, [ case "$host" in *-psp-*) dnl asprintf is broken on the PSP, but snprintf works. |
︙ | ︙ | |||
851 852 853 854 855 856 857 | ]) AC_MSG_RESULT($have_threadsafe_getaddrinfo) ]) ], [ AC_MSG_RESULT(no) ]) | < < | 853 854 855 856 857 858 859 860 861 862 863 864 865 866 | ]) AC_MSG_RESULT($have_threadsafe_getaddrinfo) ]) ], [ AC_MSG_RESULT(no) ]) ]) AS_IF([test x"$enable_sockets" != x"no" -a x"$enable_threads" != x"no"], [ AC_SUBST(OFHTTPCLIENTTESTS_M, "OFHTTPClientTests.m") ]) AC_DEFUN([CHECK_BUILTIN_BSWAP], [ |
︙ | ︙ |
Modified src/OFFile.m from [864c3ff8dd] to [43dd30c121].
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 | #include "config.h" /* Work around a bug with Clang + glibc */ #ifdef __clang__ # define _HAVE_STRING_ARCH_strcmp #endif #include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> | > > < | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | #include "config.h" /* Work around a bug with Clang + glibc */ #ifdef __clang__ # define _HAVE_STRING_ARCH_strcmp #endif #include <errno.h> #include <stdarg.h> #include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> /* Work around __block being used by glibc */ #ifdef __GLIBC__ # undef __USE_XOPEN #endif #include <unistd.h> |
︙ | ︙ | |||
324 325 326 327 328 329 330 | #ifndef _WIN32 if (mkdir([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]], DIR_MODE) != 0) #else if (_wmkdir([path UTF16String]) != 0) #endif @throw [OFCreateDirectoryFailedException | | > | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | #ifndef _WIN32 if (mkdir([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]], DIR_MODE) != 0) #else if (_wmkdir([path UTF16String]) != 0) #endif @throw [OFCreateDirectoryFailedException exceptionWithPath: path errNo: errno]; } + (void)createDirectoryAtPath: (OFString*)path createParents: (bool)createParents { void *pool; OFArray *pathComponents; |
︙ | ︙ | |||
389 390 391 392 393 394 395 | #ifndef _WIN32 DIR *dir; encoding = [OFSystemInfo native8BitEncoding]; if ((dir = opendir([path cStringWithEncoding: encoding])) == NULL) @throw [OFOpenFileFailedException exceptionWithPath: path | | > | | < < > > > > > > > > > > > | 391 392 393 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 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 | #ifndef _WIN32 DIR *dir; encoding = [OFSystemInfo native8BitEncoding]; if ((dir = opendir([path cStringWithEncoding: encoding])) == NULL) @throw [OFOpenFileFailedException exceptionWithPath: path mode: @"r" errNo: errno]; # if !defined(HAVE_READDIR_R) && defined(OF_HAVE_THREADS) if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; # endif @try { for (;;) { struct dirent *dirent; # ifdef HAVE_READDIR_R struct dirent buffer; # endif void *pool; OFString *file; # ifdef HAVE_READDIR_R if (readdir_r(dir, &buffer, &dirent) != 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: 0 errNo: errno]; if (dirent == NULL) break; # else if ((dirent = readdir(dir)) == NULL) { if (errno == 0) break; else @throw [OFReadFailedException exceptionWithObject: self requestedLength: 0 errNo: errno]; } # endif if (strcmp(dirent->d_name, ".") == 0 || strcmp(dirent->d_name, "..") == 0) continue; pool = objc_autoreleasePoolPush(); |
︙ | ︙ | |||
444 445 446 447 448 449 450 | void *pool = objc_autoreleasePoolPush(); HANDLE handle; WIN32_FIND_DATAW fd; path = [path stringByAppendingString: @"\\*"]; if ((handle = FindFirstFileW([path UTF16String], | | > > > > > | > > > > > > | 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 | 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 [OFOpenFileFailedException exceptionWithPath: path mode: @"r" errNo: errNo]; } @try { do { void *pool2 = objc_autoreleasePoolPush(); OFString *file; if (!wcscmp(fd.cFileName, L".") || !wcscmp(fd.cFileName, L"..")) continue; file = [OFString stringWithUTF16String: fd.cFileName]; [files addObject: file]; objc_autoreleasePoolPop(pool2); } while (FindNextFileW(handle, &fd)); if (GetLastError() != ERROR_NO_MORE_FILES) @throw [OFReadFailedException exceptionWithObject: self requestedLength: 0]; } @finally { FindClose(handle); } objc_autoreleasePoolPop(pool); #endif |
︙ | ︙ | |||
486 487 488 489 490 491 492 | #ifndef _WIN32 if (chdir([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]]) != 0) #else if (_wchdir([path UTF16String]) != 0) #endif @throw [OFChangeCurrentDirectoryPathFailedException | | > | | > | | > | > | 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 567 568 569 570 571 572 573 574 575 576 | #ifndef _WIN32 if (chdir([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]]) != 0) #else if (_wchdir([path UTF16String]) != 0) #endif @throw [OFChangeCurrentDirectoryPathFailedException exceptionWithPath: path errNo: errno]; } + (of_offset_t)sizeOfFileAtPath: (OFString*)path { of_stat_t s; if (path == nil) @throw [OFInvalidArgumentException exception]; if (of_stat(path, &s) != 0) /* FIXME: Maybe use another exception? */ @throw [OFOpenFileFailedException exceptionWithPath: path mode: @"r" errNo: errno]; return s.st_size; } + (OFDate*)modificationDateOfFileAtPath: (OFString*)path { of_stat_t s; if (path == nil) @throw [OFInvalidArgumentException exception]; if (of_stat(path, &s) != 0) /* FIXME: Maybe use another exception? */ @throw [OFOpenFileFailedException exceptionWithPath: path mode: @"r" errNo: errno]; /* FIXME: We could be more precise on some OSes */ return [OFDate dateWithTimeIntervalSince1970: s.st_mtime]; } #ifdef OF_HAVE_CHMOD + (void)changePermissionsOfItemAtPath: (OFString*)path permissions: (mode_t)permissions { if (path == nil) @throw [OFInvalidArgumentException exception]; # ifndef _WIN32 if (chmod([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]], permissions) != 0) # else if (_wchmod([path UTF16String], permissions) != 0) # endif @throw [OFChangePermissionsFailedException exceptionWithPath: path permissions: permissions errNo: errno]; } #endif #ifdef OF_HAVE_CHOWN + (void)changeOwnerOfItemAtPath: (OFString*)path owner: (OFString*)owner group: (OFString*)group |
︙ | ︙ | |||
567 568 569 570 571 572 573 | struct passwd *passwd; if ((passwd = getpwnam([owner cStringWithEncoding: encoding])) == NULL) @throw [OFChangeOwnerFailedException exceptionWithPath: path owner: owner | | > | > | > | < | < > | > > > > > > > > | | | > > > | 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 | struct passwd *passwd; if ((passwd = getpwnam([owner cStringWithEncoding: encoding])) == NULL) @throw [OFChangeOwnerFailedException exceptionWithPath: path owner: owner group: group errNo: errno]; uid = passwd->pw_uid; } if (group != nil) { struct group *group_; if ((group_ = getgrnam([group cStringWithEncoding: encoding])) == NULL) @throw [OFChangeOwnerFailedException exceptionWithPath: path owner: owner group: group errNo: errno]; gid = group_->gr_gid; } # ifdef OF_HAVE_THREADS } @finally { if (!of_mutex_unlock(&mutex)) @throw [OFUnlockFailedException exception]; } # endif if (chown([path cStringWithEncoding: encoding], uid, gid) != 0) @throw [OFChangeOwnerFailedException exceptionWithPath: path owner: owner group: group errNo: errno]; } #endif + (void)copyItemAtPath: (OFString*)source toPath: (OFString*)destination { void *pool; of_stat_t s; if (source == nil || destination == nil) @throw [OFInvalidArgumentException exception]; pool = objc_autoreleasePoolPush(); if (of_lstat(destination, &s) == 0) @throw [OFCopyItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: EEXIST]; if (of_lstat(source, &s) != 0) @throw [OFCopyItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: errno]; if (S_ISDIR(s.st_mode)) { OFArray *contents; OFEnumerator *enumerator; OFString *item; @try { [OFFile createDirectoryAtPath: destination]; #ifdef OF_HAVE_CHMOD [OFFile changePermissionsOfItemAtPath: destination permissions: s.st_mode]; #endif contents = [OFFile contentsOfDirectoryAtPath: source]; } @catch (id e) { /* * Only convert exceptions to OFCopyItemFailedException * that have an errNo property. This covers all I/O * related exceptions from the operations used to copy * an item, all others should be left as is. */ if ([e respondsToSelector: @selector(errNo)]) @throw [OFCopyItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: [e errNo]]; @throw e; } enumerator = [contents objectEnumerator]; while ((item = [enumerator nextObject]) != nil) { void *pool2 = objc_autoreleasePoolPush(); OFString *sourcePath, *destinationPath; |
︙ | ︙ | |||
685 686 687 688 689 690 691 | } #ifdef OF_HAVE_CHMOD [self changePermissionsOfItemAtPath: destination permissions: s.st_mode]; #endif } @catch (id e) { | > > > > > > > | | | > > > > > > > > > > | | | > > > | > | < | < > | > > | > | > | > > > > > > > > > | | > > > | > | 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 | } #ifdef OF_HAVE_CHMOD [self changePermissionsOfItemAtPath: destination permissions: s.st_mode]; #endif } @catch (id e) { /* * Only convert exceptions to OFCopyItemFailedException * that have an errNo property. This covers all I/O * related exceptions from the operations used to copy * an item, all others should be left as is. */ if ([e respondsToSelector: @selector(errNo)]) @throw [OFCopyItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: [e errNo]]; @throw e; } @finally { [sourceFile close]; [destinationFile close]; free(buffer); } #ifdef OF_HAVE_SYMLINK } else if (S_ISLNK(s.st_mode)) { @try { source = [OFFile destinationOfSymbolicLinkAtPath: source]; [OFFile createSymbolicLinkAtPath: destination withDestinationPath: source]; } @catch (id e) { /* * Only convert exceptions to OFCopyItemFailedException * that have an errNo property. This covers all I/O * related exceptions from the operations used to copy * an item, all others should be left as is. */ if ([e respondsToSelector: @selector(errNo)]) @throw [OFCopyItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: [e errNo]]; @throw e; } #endif } else @throw [OFCopyItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: ENOTSUP]; objc_autoreleasePoolPop(pool); } + (void)moveItemAtPath: (OFString*)source toPath: (OFString*)destination { void *pool; of_stat_t s; #ifndef _WIN32 of_string_encoding_t encoding; #endif if (source == nil || destination == nil) @throw [OFInvalidArgumentException exception]; pool = objc_autoreleasePoolPush(); if (of_lstat(destination, &s) == 0) @throw [OFCopyItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: EEXIST]; #ifndef _WIN32 encoding = [OFSystemInfo native8BitEncoding]; if (rename([source cStringWithEncoding: encoding], [destination cStringWithEncoding: encoding]) != 0) { #else if (_wrename([source UTF16String], [destination UTF16String]) != 0) { #endif if (errno != EXDEV) @throw [OFMoveItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: errno]; @try { [OFFile copyItemAtPath: source toPath: destination]; } @catch (OFCopyItemFailedException *e) { [OFFile removeItemAtPath: destination]; @throw [OFMoveItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: [e errNo]]; } @try { [OFFile removeItemAtPath: source]; } @catch (OFRemoveItemFailedException *e) { @throw [OFMoveItemFailedException exceptionWithSourcePath: source destinationPath: destination errNo: [e errNo]]; } } objc_autoreleasePoolPop(pool); } + (void)removeItemAtPath: (OFString*)path { void *pool; of_stat_t s; if (path == nil) @throw [OFInvalidArgumentException exception]; pool = objc_autoreleasePoolPush(); if (of_lstat(path, &s) != 0) @throw [OFRemoveItemFailedException exceptionWithPath: path errNo: errno]; if (S_ISDIR(s.st_mode)) { OFArray *contents; OFEnumerator *enumerator; OFString *item; @try { contents = [OFFile contentsOfDirectoryAtPath: path]; } @catch (id e) { /* * Only convert exceptions to * OFRemoveItemFailedException that have an errNo * property. This covers all I/O related exceptions * from the operations used to remove an item, all * others should be left as is. */ if ([e respondsToSelector: @selector(errNo)]) @throw [OFRemoveItemFailedException exceptionWithPath: path errNo: [e errNo]]; @throw e; } enumerator = [contents objectEnumerator]; while ((item = [enumerator nextObject]) != nil) { void *pool2 = objc_autoreleasePoolPush(); [OFFile removeItemAtPath: [path stringByAppendingPathComponent: item]]; objc_autoreleasePoolPop(pool2); } } #ifndef _WIN32 if (remove([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]]) != 0) #else if (_wremove([path UTF16String]) != 0) #endif @throw [OFRemoveItemFailedException exceptionWithPath: path errNo: errno]; objc_autoreleasePoolPop(pool); } #ifdef OF_HAVE_LINK + (void)linkItemAtPath: (OFString*)source toPath: (OFString*)destination |
︙ | ︙ | |||
835 836 837 838 839 840 841 | pool = objc_autoreleasePoolPush(); encoding = [OFSystemInfo native8BitEncoding]; if (link([source cStringWithEncoding: encoding], [destination cStringWithEncoding: encoding]) != 0) @throw [OFLinkFailedException exceptionWithSourcePath: source | | > | 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 | pool = objc_autoreleasePoolPush(); encoding = [OFSystemInfo native8BitEncoding]; if (link([source cStringWithEncoding: encoding], [destination cStringWithEncoding: encoding]) != 0) @throw [OFLinkFailedException exceptionWithSourcePath: source destinationPath: destination errNo: errno]; objc_autoreleasePoolPop(pool); } #endif #ifdef OF_HAVE_SYMLINK + (void)createSymbolicLinkAtPath: (OFString*)destination |
︙ | ︙ | |||
858 859 860 861 862 863 864 | pool = objc_autoreleasePoolPush(); encoding = [OFSystemInfo native8BitEncoding]; if (symlink([source cStringWithEncoding: encoding], [destination cStringWithEncoding: encoding]) != 0) @throw [OFCreateSymbolicLinkFailedException exceptionWithSourcePath: source | | > | > | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 | pool = objc_autoreleasePoolPush(); encoding = [OFSystemInfo native8BitEncoding]; if (symlink([source cStringWithEncoding: encoding], [destination cStringWithEncoding: encoding]) != 0) @throw [OFCreateSymbolicLinkFailedException exceptionWithSourcePath: source destinationPath: destination errNo: errno]; objc_autoreleasePoolPop(pool); } + (OFString*)destinationOfSymbolicLinkAtPath: (OFString*)path { char destination[PATH_MAX]; ssize_t length; of_string_encoding_t encoding; if (path == nil) @throw [OFInvalidArgumentException exception]; encoding = [OFSystemInfo native8BitEncoding]; length = readlink([path cStringWithEncoding: encoding], destination, PATH_MAX); if (length < 0) @throw [OFOpenFileFailedException exceptionWithPath: path mode: @"r" errNo: errno]; return [OFString stringWithCString: destination encoding: encoding length: length]; } #endif |
︙ | ︙ | |||
916 917 918 919 920 921 922 | native8BitEncoding]], flags, DEFAULT_MODE)) == -1) #else if ((_fd = open([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]], flags, DEFAULT_MODE)) == -1) #endif @throw [OFOpenFileFailedException exceptionWithPath: path | | > | 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 | native8BitEncoding]], flags, DEFAULT_MODE)) == -1) #else if ((_fd = open([path cStringWithEncoding: [OFSystemInfo native8BitEncoding]], flags, DEFAULT_MODE)) == -1) #endif @throw [OFOpenFileFailedException exceptionWithPath: path mode: mode errNo: errno]; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
947 948 949 950 951 952 953 | } - (size_t)lowlevelReadIntoBuffer: (void*)buffer length: (size_t)length { ssize_t ret; | | | > > > > | | > < | | > > > > > | | > < | | > | > | 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 | } - (size_t)lowlevelReadIntoBuffer: (void*)buffer length: (size_t)length { ssize_t ret; if (_fd == -1 || _atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; #ifndef _WIN32 if ((ret = read(_fd, buffer, length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #else if (length > UINT_MAX) @throw [OFOutOfRangeException exception]; if ((ret = read(_fd, buffer, (unsigned int)length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #endif if (ret == 0) _atEndOfStream = true; return ret; } - (void)lowlevelWriteBuffer: (const void*)buffer length: (size_t)length { if (_fd == -1 || _atEndOfStream) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length]; #ifndef _WIN32 if (write(_fd, buffer, length) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #else if (length > UINT_MAX) @throw [OFOutOfRangeException exception]; if (write(_fd, buffer, (unsigned int)length) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #endif } - (of_offset_t)lowlevelSeekToOffset: (of_offset_t)offset whence: (int)whence { #if defined(_WIN32) of_offset_t ret = _lseeki64(_fd, offset, whence); #elif defined(OF_HAVE_OFF64_T) of_offset_t ret = lseek64(_fd, offset, whence); #else of_offset_t ret = lseek(_fd, offset, whence); #endif if (ret == -1) @throw [OFSeekFailedException exceptionWithStream: self offset: offset whence: whence errNo: errno]; _atEndOfStream = false; return ret; } - (int)fileDescriptorForReading |
︙ | ︙ |
Modified src/OFHTTPClient.m from [777515ef21] to [24ccd00731].
︙ | ︙ | |||
12 13 14 15 16 17 18 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" | | | < | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <ctype.h> #include <errno.h> #include <string.h> #import "OFHTTPClient.h" #import "OFHTTPRequest.h" #import "OFHTTPResponse.h" #import "OFString.h" #import "OFURL.h" #import "OFTCPSocket.h" |
︙ | ︙ | |||
117 118 119 120 121 122 123 | } } } - (size_t)lowlevelReadIntoBuffer: (void*)buffer length: (size_t)length { | | < < | | | < < | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 | } } } - (size_t)lowlevelReadIntoBuffer: (void*)buffer length: (size_t)length { if (_atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: ENOTCONN]; if (!_hasContentLength && !_chunked) return [_socket readIntoBuffer: buffer length: length]; /* Content-Length */ if (!_chunked) { |
︙ | ︙ |
Modified src/OFINIFile.m from [423c3c64eb] to [f3f3f87feb].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFINIFile.h" #import "OFArray.h" #import "OFString.h" #import "OFFile.h" #import "OFINICategory.h" #import "OFINICategory+Private.h" | > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #import "OFINIFile.h" #import "OFArray.h" #import "OFString.h" #import "OFFile.h" #import "OFINICategory.h" #import "OFINICategory+Private.h" |
︙ | ︙ |
Modified src/OFKernelEventObserver.m from [d24665c090] to [83e01ba01e].
︙ | ︙ | |||
61 62 63 64 65 66 67 | @implementation OFKernelEventObserver + (void)initialize { if (self != [OFKernelEventObserver class]) return; | | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | @implementation OFKernelEventObserver + (void)initialize { if (self != [OFKernelEventObserver class]) return; if (!of_socket_init()) @throw [OFInitializationFailedException exceptionWithClass: self]; } + (instancetype)observer { return [[[self alloc] init] autorelease]; |
︙ | ︙ |
Modified src/OFKernelEventObserver_kqueue.m from [254cd34c13] to [d49b28d198].
︙ | ︙ | |||
12 13 14 15 16 17 18 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" | | < | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <assert.h> #include <errno.h> #include <math.h> #include <sys/types.h> #include <sys/event.h> #include <sys/time.h> #import "OFKernelEventObserver.h" #import "OFKernelEventObserver+Private.h" |
︙ | ︙ |
Modified src/OFProcess.m from [957d79c2fa] to [5b951c5966].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <string.h> /* Work around __block being used by glibc */ #ifdef __GLIBC__ # undef __USE_XOPEN #endif | > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #include <string.h> /* Work around __block being used by glibc */ #ifdef __GLIBC__ # undef __USE_XOPEN #endif |
︙ | ︙ | |||
452 453 454 455 456 457 458 | #ifndef _WIN32 ssize_t ret; #else DWORD ret; #endif #ifndef _WIN32 | | > > > | | > | > > > | | > > > | | > | > > > | | > > > > > | > > | 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 | #ifndef _WIN32 ssize_t ret; #else DWORD ret; #endif #ifndef _WIN32 if (_readPipe[0] == -1 || _atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; if ((ret = read(_readPipe[0], buffer, length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #else if (length > UINT32_MAX) @throw [OFOutOfRangeException exception]; if (_readPipe[0] == NULL || _atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; if (!ReadFile(_readPipe[0], buffer, (DWORD)length, &ret, NULL)) { if (GetLastError() == ERROR_BROKEN_PIPE) { _atEndOfStream = true; return 0; } @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; } #endif if (ret == 0) _atEndOfStream = true; return ret; } - (void)lowlevelWriteBuffer: (const void*)buffer length: (size_t)length { #ifndef _WIN32 if (_writePipe[1] == -1 || _atEndOfStream) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length]; if (write(_writePipe[1], buffer, length) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #else DWORD ret; if (length > UINT32_MAX) @throw [OFOutOfRangeException exception]; if (_writePipe[1] == NULL || _atEndOfStream) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length]; if (!WriteFile(_writePipe[1], buffer, (DWORD)length, &ret, NULL) || ret < length) { int errNo = 0; if (GetLastError() == ERROR_BROKEN_PIPE) errNo = EPIPE; @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errNo]; } #endif } - (int)fileDescriptorForReading { #ifndef _WIN32 return _readPipe[0]; |
︙ | ︙ |
Modified src/OFStdIOStream.m from [ba7c43016e] to [a3654b4d40].
︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 | /* Work around __block being used by glibc */ #include <stdlib.h> /* include any libc header to get the libc defines */ #ifdef __GLIBC__ # undef __USE_XOPEN #endif #include <unistd.h> #import "OFStdIOStream.h" #import "OFDate.h" #import "OFApplication.h" #import "OFOutOfRangeException.h" | > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | /* Work around __block being used by glibc */ #include <stdlib.h> /* include any libc header to get the libc defines */ #ifdef __GLIBC__ # undef __USE_XOPEN #endif #include <errno.h> #include <unistd.h> #import "OFStdIOStream.h" #import "OFDate.h" #import "OFApplication.h" #import "OFOutOfRangeException.h" |
︙ | ︙ | |||
94 95 96 97 98 99 100 101 | } - (size_t)lowlevelReadIntoBuffer: (void*)buffer length: (size_t)length { ssize_t ret; #ifndef _WIN32 | > > > > < | | > < | | > > > > > | | > < | | > | 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 | } - (size_t)lowlevelReadIntoBuffer: (void*)buffer length: (size_t)length { ssize_t ret; if (_fd == -1 || _atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; #ifndef _WIN32 if ((ret = read(_fd, buffer, length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #else if (length > UINT_MAX) @throw [OFOutOfRangeException exception]; if ((ret = read(_fd, buffer, (unsigned int)length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #endif if (ret == 0) _atEndOfStream = true; return ret; } - (void)lowlevelWriteBuffer: (const void*)buffer length: (size_t)length { if (_fd == -1 || _atEndOfStream) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length]; #ifndef _WIN32 if (write(_fd, buffer, length) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #else if (length > UINT_MAX) @throw [OFOutOfRangeException exception]; if (write(_fd, buffer, (unsigned int)length) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: errno]; #endif } - (int)fileDescriptorForReading { return _fd; } |
︙ | ︙ |
Modified src/OFStream.m from [2daf8ca68b] to [298e596b16].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 | * file. */ #define __NO_EXT_QNX #include "config.h" #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> | > > < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | * file. */ #define __NO_EXT_QNX #include "config.h" #include <assert.h> #include <errno.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <fcntl.h> #ifndef _WIN32 # include <signal.h> #endif #import "OFStream.h" |
︙ | ︙ | |||
1482 1483 1484 1485 1486 1487 1488 | readFlags = fcntl([self fileDescriptorForReading], F_GETFL); readImplemented = true; if (readFlags == -1) @throw [OFSetOptionFailedException | | > | > | > | > | 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 | readFlags = fcntl([self fileDescriptorForReading], F_GETFL); readImplemented = true; if (readFlags == -1) @throw [OFSetOptionFailedException exceptionWithStream: self errNo: errno]; if (enable) readFlags &= ~O_NONBLOCK; else readFlags |= O_NONBLOCK; if (fcntl([self fileDescriptorForReading], F_SETFL, readFlags) == -1) @throw [OFSetOptionFailedException exceptionWithStream: self errNo: errno]; } @catch (OFNotImplementedException *e) { } @try { int writeFlags; writeFlags = fcntl([self fileDescriptorForWriting], F_GETFL); writeImplemented = true; if (writeFlags == -1) @throw [OFSetOptionFailedException exceptionWithStream: self errNo: errno]; if (enable) writeFlags &= ~O_NONBLOCK; else writeFlags |= O_NONBLOCK; if (fcntl([self fileDescriptorForWriting], F_SETFL, writeFlags) == -1) @throw [OFSetOptionFailedException exceptionWithStream: self errNo: errno]; } @catch (OFNotImplementedException *e) { } if (!readImplemented && !writeImplemented) @throw [OFNotImplementedException exceptionWithSelector: _cmd object: self]; |
︙ | ︙ |
Modified src/OFStreamSocket.m from [70d50e1c9d] to [c547367b26].
︙ | ︙ | |||
14 15 16 17 18 19 20 | * file. */ #define __NO_EXT_QNX #include "config.h" | | < | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | * file. */ #define __NO_EXT_QNX #include "config.h" #include <errno.h> #include <string.h> #import "OFStreamSocket.h" #import "OFInitializationFailedException.h" #import "OFNotConnectedException.h" #import "OFOutOfRangeException.h" #import "OFReadFailedException.h" #import "OFSetOptionFailedException.h" #import "OFWriteFailedException.h" #import "socket_helpers.h" @implementation OFStreamSocket + (void)initialize { if (self != [OFStreamSocket class]) return; if (!of_socket_init()) @throw [OFInitializationFailedException exceptionWithClass: self]; } + (instancetype)socket { return [[[self alloc] init] autorelease]; |
︙ | ︙ | |||
58 59 60 61 62 63 64 | length: (size_t)length { ssize_t ret; if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithSocket: self]; | | < < | | | < < | > | > | > | > | < < | | | < < | > | > | > | > | > > | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 | length: (size_t)length { ssize_t ret; if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithSocket: self]; if (_atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: ENOTCONN]; #ifndef _WIN32 if ((ret = recv(_socket, buffer, length, 0)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #else if (length > UINT_MAX) @throw [OFOutOfRangeException exception]; if ((ret = recv(_socket, buffer, (unsigned int)length, 0)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #endif if (ret == 0) _atEndOfStream = true; return ret; } - (void)lowlevelWriteBuffer: (const void*)buffer length: (size_t)length { if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithSocket: self]; if (_atEndOfStream) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: ENOTCONN]; #ifndef _WIN32 if (send(_socket, buffer, length, 0) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #else if (length > UINT_MAX) @throw [OFOutOfRangeException exception]; if (send(_socket, buffer, (unsigned int)length, 0) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #endif } #ifdef _WIN32 - (void)setBlocking: (bool)enable { u_long v = enable; _blocking = enable; if (ioctlsocket(_socket, FIONBIO, &v) == SOCKET_ERROR) @throw [OFSetOptionFailedException exceptionWithStream: self errNo: of_socket_errno()]; } #endif - (int)fileDescriptorForReading { #ifndef _WIN32 return _socket; |
︙ | ︙ |
Modified src/OFString.m from [e0dd905710] to [52d4d85f15].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdarg.h> #include <stdlib.h> #include <string.h> | > > < < | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <ctype.h> #include <errno.h> #include <stdarg.h> #include <stdlib.h> #include <string.h> #include <sys/stat.h> #import "OFString.h" #import "OFString_UTF8.h" #import "OFString_UTF8+Private.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFDataArray.h" #ifdef OF_HAVE_FILES # import "OFFile.h" #endif #import "OFURL.h" #ifdef OF_HAVE_SOCKETS # import "OFHTTPClient.h" # import "OFHTTPRequest.h" |
︙ | ︙ | |||
817 818 819 820 821 822 823 | encoding: OF_STRING_ENCODING_UTF_8]; } - initWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding { char *tmp; | | < | | > | 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 | encoding: OF_STRING_ENCODING_UTF_8]; } - initWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding { char *tmp; of_stat_t st; @try { OFFile *file; /* Make sure the file system is initialized */ [OFFile class]; if (of_stat(path, &st) != 0) @throw [OFOpenFileFailedException exceptionWithPath: path mode: @"rb" errNo: errno]; if (st.st_size > SIZE_MAX) @throw [OFOutOfRangeException exception]; file = [[OFFile alloc] initWithPath: path mode: @"rb"]; |
︙ | ︙ |
Modified src/OFTCPSocket.m from [a985ec70c8] to [f120fb3aeb].
︙ | ︙ | |||
16 17 18 19 20 21 22 23 24 25 26 | #define OF_TCP_SOCKET_M #define __NO_EXT_QNX #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> | > > < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #define OF_TCP_SOCKET_M #define __NO_EXT_QNX #include "config.h" #include <assert.h> #include <errno.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #import "OFTCPSocket.h" #import "OFTCPSocket+SOCKS5.h" #import "OFString.h" #import "OFThread.h" #import "OFTimer.h" #import "OFRunLoop.h" #import "OFRunLoop+Private.h" |
︙ | ︙ | |||
265 266 267 268 269 270 271 272 273 274 275 276 277 278 | - (void)connectToHost: (OFString*)host port: (uint16_t)port { OFString *destinationHost = host; uint16_t destinationPort = port; of_resolver_result_t **results, **iter; if (_socket != INVALID_SOCKET) @throw [OFAlreadyConnectedException exceptionWithSocket: self]; _listening = false; /* Make sure to clear the read buffer in case the socket is reused */ | > | 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | - (void)connectToHost: (OFString*)host port: (uint16_t)port { OFString *destinationHost = host; uint16_t destinationPort = port; of_resolver_result_t **results, **iter; int errNo = 0; if (_socket != INVALID_SOCKET) @throw [OFAlreadyConnectedException exceptionWithSocket: self]; _listening = false; /* Make sure to clear the read buffer in case the socket is reused */ |
︙ | ︙ | |||
292 293 294 295 296 297 298 | of_resolver_result_t *result = *iter; #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if ((_socket = socket(result->family, result->type | SOCK_CLOEXEC, | | > > > > > > | > | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 | of_resolver_result_t *result = *iter; #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if ((_socket = socket(result->family, result->type | SOCK_CLOEXEC, result->protocol)) == INVALID_SOCKET) { errNo = of_socket_errno(); continue; } #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) if ((flags = fcntl(_socket, F_GETFD, 0)) != -1) fcntl(_socket, F_SETFD, flags | FD_CLOEXEC); #endif if (connect(_socket, result->address, result->addressLength) == -1) { errNo = of_socket_errno(); close(_socket); _socket = INVALID_SOCKET; continue; } break; } of_resolver_free(results); if (_socket == INVALID_SOCKET) @throw [OFConnectionFailedException exceptionWithHost: host port: port socket: self errNo: errNo]; if (_SOCKS5Host != nil) [self OF_SOCKS5ConnectToHost: destinationHost port: destinationPort]; } #ifdef OF_HAVE_THREADS |
︙ | ︙ | |||
397 398 399 400 401 402 403 | #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if ((_socket = socket(results[0]->family, results[0]->type | SOCK_CLOEXEC, results[0]->protocol)) == INVALID_SOCKET) | | > | | > | | < < > > > | > > > > | > | > | > | > | > > | > > | > > | 405 406 407 408 409 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 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 | #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if ((_socket = socket(results[0]->family, results[0]->type | SOCK_CLOEXEC, results[0]->protocol)) == INVALID_SOCKET) @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: of_socket_errno()]; #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) if ((flags = fcntl(_socket, F_GETFD, 0)) != -1) fcntl(_socket, F_SETFD, flags | FD_CLOEXEC); #endif setsockopt(_socket, SOL_SOCKET, SO_REUSEADDR, (const char*)&one, (socklen_t)sizeof(one)); if (bind(_socket, results[0]->address, results[0]->addressLength) == -1) { int errNo = of_socket_errno(); close(_socket); _socket = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: errNo]; } } @finally { of_resolver_free(results); } if (port > 0) return port; #ifndef __wii__ addrLen = (socklen_t)sizeof(addr.storage); if (getsockname(_socket, (struct sockaddr*)&addr.storage, &addrLen)) { int errNo = of_socket_errno(); close(_socket); _socket = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: errNo]; } if (addr.storage.ss_family == AF_INET) return OF_BSWAP16_IF_LE(addr.in.sin_port); # ifdef AF_INET6 if (addr.storage.ss_family == AF_INET6) return OF_BSWAP16_IF_LE(addr.in6.sin6_port); # endif #endif close(_socket); _socket = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: EAFNOSUPPORT]; } - (void)listen { [self listenWithBackLog: SOMAXCONN]; } - (void)listenWithBackLog: (int)backLog { if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithSocket: self]; if (listen(_socket, backLog) == -1) @throw [OFListenFailedException exceptionWithSocket: self backLog: backLog errNo: of_socket_errno()]; _listening = true; } - (instancetype)accept { OFTCPSocket *client = [[[[self class] alloc] init] autorelease]; #if (!defined(HAVE_PACCEPT) && !defined(HAVE_ACCEPT4)) || !defined(SOCK_CLOEXEC) # if defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; # endif #endif client->_address = [client allocMemoryWithSize: sizeof(struct sockaddr_storage)]; client->_addressLength = (socklen_t)sizeof(struct sockaddr_storage); #if defined(HAVE_PACCEPT) && defined(SOCK_CLOEXEC) if ((client->_socket = paccept(_socket, client->_address, &client->_addressLength, NULL, SOCK_CLOEXEC)) == INVALID_SOCKET) @throw [OFAcceptFailedException exceptionWithSocket: self errNo: of_socket_errno()]; #elif defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) if ((client->_socket = accept4(_socket, client->_address, &client->_addressLength, SOCK_CLOEXEC)) == INVALID_SOCKET) @throw [OFAcceptFailedException exceptionWithSocket: self errNo: of_socket_errno()]; #else if ((client->_socket = accept(_socket, client->_address, &client->_addressLength)) == INVALID_SOCKET) @throw [OFAcceptFailedException exceptionWithSocket: self errNo: of_socket_errno()]; # if defined(HAVE_FCNTL) && defined(FD_CLOEXEC) if ((flags = fcntl(client->_socket, F_GETFD, 0)) != -1) fcntl(client->_socket, F_SETFD, flags | FD_CLOEXEC); # endif #endif |
︙ | ︙ | |||
537 538 539 540 541 542 543 | - (void)setKeepAlivesEnabled: (bool)enable { int v = enable; if (setsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE, (char*)&v, (socklen_t)sizeof(v))) | | > > | 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 | - (void)setKeepAlivesEnabled: (bool)enable { int v = enable; if (setsockopt(_socket, SOL_SOCKET, SO_KEEPALIVE, (char*)&v, (socklen_t)sizeof(v))) @throw [OFSetOptionFailedException exceptionWithStream: self errNo: of_socket_errno()]; } - (OFString*)remoteAddress { OFString *ret; if (_socket == INVALID_SOCKET) |
︙ | ︙ |
Modified src/OFUDPSocket.m from [386cfc0afe] to [3c38516b1b].
︙ | ︙ | |||
12 13 14 15 16 17 18 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" | | | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <assert.h> #include <errno.h> #include <string.h> #import "OFUDPSocket.h" #ifdef OF_HAVE_THREADS # import "OFThread.h" #endif #import "OFRunLoop.h" #import "OFRunLoop+Private.h" |
︙ | ︙ | |||
277 278 279 280 281 282 283 | @implementation OFUDPSocket + (void)initialize { if (self != [OFUDPSocket class]) return; | | | 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 | @implementation OFUDPSocket + (void)initialize { if (self != [OFUDPSocket class]) return; if (!of_socket_init()) @throw [OFInitializationFailedException exceptionWithClass: self]; } + (instancetype)socket { return [[[self alloc] init] autorelease]; |
︙ | ︙ | |||
398 399 400 401 402 403 404 | #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if ((_socket = socket(results[0]->family, results[0]->type | SOCK_CLOEXEC, results[0]->protocol)) == INVALID_SOCKET) | | > | | > > > > | > > > > | > | > | > | > | > | > | 398 399 400 401 402 403 404 405 406 407 408 409 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 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 | #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) int flags; #endif if ((_socket = socket(results[0]->family, results[0]->type | SOCK_CLOEXEC, results[0]->protocol)) == INVALID_SOCKET) @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: of_socket_errno()]; #if SOCK_CLOEXEC == 0 && defined(HAVE_FCNTL) && defined(FD_CLOEXEC) if ((flags = fcntl(_socket, F_GETFD, 0)) != -1) fcntl(_socket, F_SETFD, flags | FD_CLOEXEC); #endif if (bind(_socket, results[0]->address, results[0]->addressLength) == -1) { int errNo = of_socket_errno(); close(_socket); _socket = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: errNo]; } } @finally { of_resolver_free(results); } if (port > 0) return port; #ifndef __wii__ addrLen = (socklen_t)sizeof(addr.storage); if (getsockname(_socket, (struct sockaddr*)&addr.storage, &addrLen)) { int errNo = of_socket_errno(); close(_socket); _socket = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: errNo]; } if (addr.storage.ss_family == AF_INET) return OF_BSWAP16_IF_LE(addr.in.sin_port); # ifdef AF_INET6 if (addr.storage.ss_family == AF_INET6) return OF_BSWAP16_IF_LE(addr.in6.sin6_port); # endif #endif close(_socket); _socket = INVALID_SOCKET; @throw [OFBindFailedException exceptionWithHost: host port: port socket: self errNo: EAFNOSUPPORT]; } - (size_t)receiveIntoBuffer: (void*)buffer length: (size_t)length sender: (of_udp_socket_address_t*)sender { ssize_t ret; if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithSocket: self]; sender->length = (socklen_t)sizeof(sender->address); #ifndef _WIN32 if ((ret = recvfrom(_socket, buffer, length, 0, (struct sockaddr*)&sender->address, &sender->length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #else if (length > INT_MAX) @throw [OFOutOfRangeException exception]; if ((ret = recvfrom(_socket, buffer, (int)length, 0, (struct sockaddr*)&sender->address, &sender->length)) < 0) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #endif return ret; } - (void)asyncReceiveIntoBuffer: (void*)buffer length: (size_t)length |
︙ | ︙ | |||
510 511 512 513 514 515 516 | { if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithSocket: self]; #ifndef _WIN32 if (sendto(_socket, buffer, length, 0, (struct sockaddr*)&receiver->address, receiver->length) < length) | | > | > | > | > | 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 | { if (_socket == INVALID_SOCKET) @throw [OFNotConnectedException exceptionWithSocket: self]; #ifndef _WIN32 if (sendto(_socket, buffer, length, 0, (struct sockaddr*)&receiver->address, receiver->length) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #else if (length > INT_MAX) @throw [OFOutOfRangeException exception]; if (sendto(_socket, buffer, (int)length, 0, (struct sockaddr*)&receiver->address, receiver->length) < length) @throw [OFWriteFailedException exceptionWithObject: self requestedLength: length errNo: of_socket_errno()]; #endif } - (void)cancelAsyncRequests { [OFRunLoop OF_cancelAsyncRequestsForObject: self]; } |
︙ | ︙ |
Modified src/OFZIPArchive.m from [31589af3b0] to [f5b578d7a5].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "OFZIPArchive.h" #import "OFZIPArchiveEntry.h" #import "OFZIPArchiveEntry+Private.h" #import "OFDataArray.h" #import "OFArray.h" #import "OFDictionary.h" | > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #import "OFZIPArchive.h" #import "OFZIPArchiveEntry.h" #import "OFZIPArchiveEntry+Private.h" #import "OFDataArray.h" #import "OFArray.h" #import "OFDictionary.h" |
︙ | ︙ | |||
317 318 319 320 321 322 323 | { OFStream *ret; void *pool = objc_autoreleasePoolPush(); OFZIPArchiveEntry *entry = [_pathToEntryMap objectForKey: path]; OFZIPArchive_LocalFileHeader *localFileHeader; uint64_t offset64; | | < | < > | 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 | { OFStream *ret; void *pool = objc_autoreleasePoolPush(); OFZIPArchiveEntry *entry = [_pathToEntryMap objectForKey: path]; OFZIPArchive_LocalFileHeader *localFileHeader; uint64_t offset64; if (entry == nil) @throw [OFOpenFileFailedException exceptionWithPath: path mode: @"rb" errNo: ENOENT]; offset64 = [entry OF_localFileHeaderOffset]; if ((of_offset_t)offset64 != offset64) @throw [OFOutOfRangeException exception]; [_file seekToOffset: (of_offset_t)offset64 whence: SEEK_SET]; |
︙ | ︙ |
Modified src/exceptions/OFAcceptFailedException.h from [9c145d6316] to [8ed051874b].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifndef OF_HAVE_SOCKETS # error No sockets available! #endif /*! |
︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 | @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased accept failed exception. * * @param socket The socket which could not accept a connection * @return A new, autoreleased accept failed exception */ | > | > > | > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased accept failed exception. * * @param socket The socket which could not accept a connection * @param errNo The errno for the error * @return A new, autoreleased accept failed exception */ + (instancetype)exceptionWithSocket: (id)socket errNo: (int)errNo; /*! * @brief Initializes an already allocated accept failed exception. * * @param socket The socket which could not accept a connection * @param errNo The errno for the error * @return An initialized accept failed exception */ - initWithSocket: (id)socket errNo: (int)errNo; /*! * @brief Returns the socket which could not accept a connection. * * @return The socket which could not accept a connection */ - (id)socket; |
︙ | ︙ |
Modified src/exceptions/OFAcceptFailedException.m from [6b5a7fb707] to [8e3daf4a3e].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFAcceptFailedException.h" #import "OFString.h" | < < > | > > | | | < < < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | */ #include "config.h" #import "OFAcceptFailedException.h" #import "OFString.h" @implementation OFAcceptFailedException + (instancetype)exceptionWithSocket: (id)socket errNo: (int)errNo { return [[[self alloc] initWithSocket: socket errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithSocket: (id)socket errNo: (int)errNo { self = [super init]; _socket = [socket retain]; _errNo = errNo; return self; } - (void)dealloc { [_socket release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Failed to accept connection in socket of class %@: %@", [_socket class], of_strerror(_errNo)]; } - (id)socket { OF_GETTER(_socket, true) } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFAddressTranslationFailedException.h from [d22c46e79d] to [10dbec0388].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | < > > > > > > > > < < < < < < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifndef OF_HAVE_SOCKETS # error No sockets available! #endif /*! * @class OFAddressTranslationFailedException \ * OFAddressTranslationFailedException.h \ * ObjFW/OFAddressTranslationFailedException.h * * @brief An exception indicating the translation of an address failed. */ @interface OFAddressTranslationFailedException: OFException { OFString *_host; int _error; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFString *host; #endif /*! * @brief Creates a new, autoreleased address translation failed exception. * * @param host The host for which translation was requested * @return A new, autoreleased address translation failed exception */ + (instancetype)exceptionWithHost: (OFString*)host; + (instancetype)exceptionWithHost: (OFString*)host error: (int)error; + (instancetype)exceptionWithError: (int)error; /*! * @brief Initializes an already allocated address translation failed exception. * * @param host The host for which translation was requested * @return An initialized address translation failed exception */ - initWithHost: (OFString*)host; - initWithHost: (OFString*)host error: (int)error; - initWithError: (int)error; /*! * @brief Returns the host for which the address translation was requested. * * @return The host for which the address translation was requested */ - (OFString*)host; @end |
Modified src/exceptions/OFAddressTranslationFailedException.m from [77d11f6554] to [f2e2a2e8ce].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFAddressTranslationFailedException.h" #import "OFString.h" | > | > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > | | | > | > > > > | < > > > > | | > > > > > | > > > > > > > > > > > > > > > > > > > < < < < < < < < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 | */ #include "config.h" #import "OFAddressTranslationFailedException.h" #import "OFString.h" #import "OFInitializationFailedException.h" #import "OFLockFailedException.h" #import "OFUnlockFailedException.h" #include "socket_helpers.h" #if !defined(HAVE_GETADDRINFO) && defined(OF_HAVE_THREADS) # include "threading.h" static of_mutex_t mutex; #endif @implementation OFAddressTranslationFailedException #if !defined(HAVE_GETADDRINFO) && defined(OF_HAVE_THREADS) + (void)initialize { if (self != [OFAddressTranslationFailedException class]) return; if (!of_mutex_new(&mutex)) @throw [OFInitializationFailedException exception]; } #endif + (instancetype)exceptionWithHost: (OFString*)host { return [[[self alloc] initWithHost: host] autorelease]; } + (instancetype)exceptionWithHost: (OFString*)host error: (int)error { return [[[self alloc] initWithHost: host error: error] autorelease]; } + (instancetype)exceptionWithError: (int)error { return [[[self alloc] initWithError: error] autorelease]; } - initWithHost: (OFString*)host { self = [super init]; @try { _host = [host copy]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithHost: (OFString*)host error: (int)error { self = [super init]; @try { _host = [host copy]; _error = error; } @catch (id e) { [self release]; @throw e; } return self; } - initWithError: (int)error { self = [super init]; _error = error; return self; } - (void)dealloc { [_host release]; [super dealloc]; } - (OFString*)description { /* FIXME: Add proper description for Win32 */ #ifndef _WIN32 if (_error == 0) { #endif if (_host != nil) return [OFString stringWithFormat: @"The host %@ could not be translated to an " @"address!", _host]; else return @"An address could not be translated!"; #ifndef _WIN32 } # ifdef HAVE_GETADDRINFO if (_host != nil) return [OFString stringWithFormat: @"The host %@ could not be translated to an address: %s", _host, gai_strerror(_error)]; else return [OFString stringWithFormat: @"An address could not be translated: %s", gai_strerror(_error)]; # else # ifdef OF_HAVE_THREADS if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif if (_host != nil) return [OFString stringWithFormat: @"The host %@ could not be translated to an " "address: %s", _host, hstrerror(_error)]; else return [OFString stringWithFormat: @"An address could not be translated: %s", hstrerror(_error)]; # ifdef OF_HAVE_THREADS } @finally { if (!of_mutex_unlock(&mutex)) @throw [OFUnlockFailedException exception]; } # endif # endif #endif } - (OFString*)host { OF_GETTER(_host, true) } @end |
Modified src/exceptions/OFAlreadyConnectedException.m from [066c417ccd] to [bf8b387998].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFAlreadyConnectedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFAlreadyConnectedException.h" #import "OFString.h" @implementation OFAlreadyConnectedException + (instancetype)exceptionWithSocket: (id)socket { return [[[self alloc] initWithSocket: socket] autorelease]; } - initWithSocket: (id)socket |
︙ | ︙ |
Modified src/exceptions/OFBindFailedException.h from [3618bd7263] to [e8368795dc].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifndef OF_HAVE_SOCKETS # error No sockets available! #endif /*! |
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 | /*! * @brief Creates a new, autoreleased bind failed exception. * * @param host The host on which binding failed * @param port The port on which binding failed * @param socket The socket which could not be bound * @return A new, autoreleased bind failed exception */ + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port | > | > > | > | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | /*! * @brief Creates a new, autoreleased bind failed exception. * * @param host The host on which binding failed * @param port The port on which binding failed * @param socket The socket which could not be bound * @param errNo The errno of the error * @return A new, autoreleased bind failed exception */ + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; /*! * @brief Initializes an already allocated bind failed exception. * * @param host The host on which binding failed * @param port The port on which binding failed * @param socket The socket which could not be bound * @param errNo The errno of the error * @return An initialized bind failed exception */ - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; /*! * @brief Returns the host on which binding failed. * * @return The host on which binding failed */ - (OFString*)host; |
︙ | ︙ |
Modified src/exceptions/OFBindFailedException.m from [efaadf4326] to [eae71b417b].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFBindFailedException.h" #import "OFString.h" | < < > | > > | | | > | < < < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | */ #include "config.h" #import "OFBindFailedException.h" #import "OFString.h" @implementation OFBindFailedException + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { return [[[self alloc] initWithHost: host port: port socket: socket errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { self = [super init]; @try { _host = [host copy]; _port = port; _socket = [socket retain]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_host release]; [_socket release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Binding to port %" @PRIu16 @" on host %@ failed in socket of " @"type %@: %@", _port, _host, [_socket class], of_strerror(_errNo)]; } - (OFString*)host { OF_GETTER(_host, true) } - (uint16_t)port { return _port; } - (id)socket { OF_GETTER(_socket, true) } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFChangeCurrentDirectoryPathFailedException.h from [8e1fb069a3] to [ceef029863].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" /*! * @class OFChangeCurrentDirectoryPathFailedException \ * OFChangeCurrentDirectoryPathFailedException.h \ * ObjFW/OFChangeCurrentDirectoryPathFailedException.h * |
︙ | ︙ | |||
39 40 41 42 43 44 45 46 47 | /*! * @brief Creates a new, autoreleased change current directory path failed * exception. * * @param path The path of the directory to which the current path could not be * changed * @return A new, autoreleased change current directory path failed exception */ | > | > > | > | 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | /*! * @brief Creates a new, autoreleased change current directory path failed * exception. * * @param path The path of the directory to which the current path could not be * changed * @param errNo The errno of the error * @return A new, autoreleased change current directory path failed exception */ + (instancetype)exceptionWithPath: (OFString*)path errNo: (int)errNo; /*! * @brief Initializes an already allocated change directory failed exception. * * @param path The path of the directory to which the current path could not be * changed * @param errNo The errno of the error * @return An initialized change current directory path failed exception */ - initWithPath: (OFString*)path errNo: (int)errNo; /*! * @brief Returns the path of the directory to which the current path could not * be changed. * * @return The path of the directory to which the current path could not be * changed |
︙ | ︙ |
Modified src/exceptions/OFChangeCurrentDirectoryPathFailedException.m from [dce8eb235d] to [1fb33d2cc1].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFChangeCurrentDirectoryPathFailedException.h" #import "OFString.h" | < < > | > > | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | */ #include "config.h" #import "OFChangeCurrentDirectoryPathFailedException.h" #import "OFString.h" @implementation OFChangeCurrentDirectoryPathFailedException + (instancetype)exceptionWithPath: (OFString*)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithPath: (OFString*)path errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_path release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Failed to change the current directory path to %@: %@", _path, of_strerror(_errNo)]; } - (OFString*)path { OF_GETTER(_path, true) } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFChangeOwnerFailedException.h from [9462af8540] to [ccba6648e0].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifdef OF_HAVE_CHOWN /*! * @class OFChangeOwnerFailedException \ * OFChangeOwnerFailedException.h ObjFW/OFChangeOwnerFailedException.h * |
︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 | /*! * @brief Creates a new, autoreleased change owner failed exception. * * @param path The path of the item * @param owner The new owner for the item * @param group The new group for the item * @return A new, autoreleased change owner failed exception */ + (instancetype)exceptionWithPath: (OFString*)path owner: (OFString*)owner | > | > > | > | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | /*! * @brief Creates a new, autoreleased change owner failed exception. * * @param path The path of the item * @param owner The new owner for the item * @param group The new group for the item * @param errNo The errno of the error * @return A new, autoreleased change owner failed exception */ + (instancetype)exceptionWithPath: (OFString*)path owner: (OFString*)owner group: (OFString*)group errNo: (int)errNo; /*! * @brief Initializes an already allocated change owner failed exception. * * @param path The path of the item * @param owner The new owner for the item * @param group The new group for the item * @param errNo The errno of the error * @return An initialized change owner failed exception */ - initWithPath: (OFString*)path owner: (OFString*)owner group: (OFString*)group errNo: (int)errNo; /*! * @brief Returns the path of the item. * * @return The path of the item */ - (OFString*)path; |
︙ | ︙ |
Modified src/exceptions/OFChangeOwnerFailedException.m from [1ddfaee79f] to [5e180f7511].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFChangeOwnerFailedException.h" #import "OFString.h" | < < > | > > | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | */ #include "config.h" #import "OFChangeOwnerFailedException.h" #import "OFString.h" #ifdef OF_HAVE_CHOWN @implementation OFChangeOwnerFailedException + (instancetype)exceptionWithPath: (OFString*)path owner: (OFString*)owner group: (OFString*)group errNo: (int)errNo { return [[[self alloc] initWithPath: path owner: owner group: group errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithPath: (OFString*)path owner: (OFString*)owner group: (OFString*)group errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _owner = [owner copy]; _group = [group copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } |
︙ | ︙ | |||
65 66 67 68 69 70 71 | [super dealloc]; } - (OFString*)description { if (_group == nil) return [OFString stringWithFormat: | | | | | | | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | [super dealloc]; } - (OFString*)description { if (_group == nil) return [OFString stringWithFormat: @"Failed to change owner of item at path %@ to %@: %@", _path, _owner, of_strerror(_errNo)]; else if (_owner == nil) return [OFString stringWithFormat: @"Failed to change group of item at path %@ to %@: %@", _path, _group, of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to change owner of item at path %@ to %@:%@: %@", _path, _owner, _group, of_strerror(_errNo)]; } - (OFString*)path { OF_GETTER(_path, true) } |
︙ | ︙ |
Modified src/exceptions/OFChangePermissionsFailedException.h from [41fb78b8c0] to [822684a5ba].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include <sys/types.h> #import "OFException.h" /*! * @class OFChangePermissionsFailedException \ * OFChangePermissionsFailedException.h \ |
︙ | ︙ | |||
42 43 44 45 46 47 48 49 50 51 | #endif /*! * @brief Creates a new, autoreleased change permissions failed exception. * * @param path The path of the item * @param permissions The new permissions for the item * @return A new, autoreleased change permissions failed exception */ + (instancetype)exceptionWithPath: (OFString*)path | > | > > | > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | #endif /*! * @brief Creates a new, autoreleased change permissions failed exception. * * @param path The path of the item * @param permissions The new permissions for the item * @param errNo The errno of the error * @return A new, autoreleased change permissions failed exception */ + (instancetype)exceptionWithPath: (OFString*)path permissions: (mode_t)permissions errNo: (int)errNo; /*! * @brief Initializes an already allocated change permissions failed exception. * * @param path The path of the item * @param permissions The new permissions for the item * @param errNo The errno of the error * @return An initialized change permissions failed exception */ - initWithPath: (OFString*)path permissions: (mode_t)permissions errNo: (int)errNo; /*! * @brief Returns the path of the item. * * @return The path of the item */ - (OFString*)path; |
︙ | ︙ |
Modified src/exceptions/OFChangePermissionsFailedException.m from [50ffef8dad] to [ee8d14e7c5].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFChangePermissionsFailedException.h" #import "OFString.h" | < < > | > > | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | */ #include "config.h" #import "OFChangePermissionsFailedException.h" #import "OFString.h" @implementation OFChangePermissionsFailedException + (instancetype)exceptionWithPath: (OFString*)path permissions: (mode_t)permissions errNo: (int)errNo { return [[[self alloc] initWithPath: path permissions: permissions errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithPath: (OFString*)path permissions: (mode_t)permissions errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _permissions = permissions; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_path release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Failed to change permissions of item at path %@ to %d: %@", _path, _permissions, of_strerror(_errNo)]; } - (OFString*)path { OF_GETTER(_path, true) } |
︙ | ︙ |
Modified src/exceptions/OFConnectionFailedException.h from [e298d451ea] to [61b9685104].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifndef OF_HAVE_SOCKETS # error No sockets available! #endif /*! |
︙ | ︙ | |||
51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | * @param socket The socket which could not connect * @return A new, autoreleased connection failed exception */ + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket; /*! * @brief Initializes an already allocated connection failed exception. * * @param host The host to which the connection failed * @param port The port on the host to which the connection failed * @param socket The socket which could not connect * @return An initialized connection failed exception */ - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket; /*! * @brief Returns the socket which could not connect. * * @return The socket which could not connect */ - (id)socket; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | * @param socket The socket which could not connect * @return A new, autoreleased connection failed exception */ + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket; /*! * @brief Creates a new, autoreleased connection failed exception. * * @param host The host to which the connection failed * @param port The port on the host to which the connection failed * @param socket The socket which could not connect * @param errNo The errno of the error * @return A new, autoreleased connection failed exception */ + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; /*! * @brief Initializes an already allocated connection failed exception. * * @param host The host to which the connection failed * @param port The port on the host to which the connection failed * @param socket The socket which could not connect * @return An initialized connection failed exception */ - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket; /*! * @brief Initializes an already allocated connection failed exception. * * @param host The host to which the connection failed * @param port The port on the host to which the connection failed * @param socket The socket which could not connect * @param errNo The errno of the error * @return An initialized connection failed exception */ - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo; /*! * @brief Returns the socket which could not connect. * * @return The socket which could not connect */ - (id)socket; |
︙ | ︙ |
Modified src/exceptions/OFConnectionFailedException.m from [03825848e7] to [77019ce3e4].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFConnectionFailedException.h" #import "OFString.h" | < < > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > | > | | | > > > > > | < < < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | */ #include "config.h" #import "OFConnectionFailedException.h" #import "OFString.h" @implementation OFConnectionFailedException + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket { return [[[self alloc] initWithHost: host port: port socket: socket] autorelease]; } + (instancetype)exceptionWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { return [[[self alloc] initWithHost: host port: port socket: socket errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket { self = [super init]; @try { _host = [host copy]; _socket = [socket retain]; _port = port; } @catch (id e) { [self release]; @throw e; } return self; } - initWithHost: (OFString*)host port: (uint16_t)port socket: (id)socket errNo: (int)errNo { self = [super init]; @try { _host = [host copy]; _socket = [socket retain]; _port = port; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_host release]; [_socket release]; [super dealloc]; } - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"A connection to %@ on port %" @PRIu16 @" could not be " @"established in socket of type %@: %@", _host, _port, [_socket class], of_strerror(_errNo)]; else return [OFString stringWithFormat: @"A connection to %@ on port %" @PRIu16 @" could not be " @"established in socket of type %@!", _host, _port, [_socket class]]; } - (OFString*)host { OF_GETTER(_host, true) } - (uint16_t)port { return _port; } - (id)socket { OF_GETTER(_socket, true) } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFCopyItemFailedException.h from [bce67d81dc] to [a38994cfde].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" /*! * @class OFCopyItemFailedException \ * OFCopyItemFailedException.h ObjFW/OFCopyItemFailedException.h * * @brief An exception indicating that copying a item failed. |
︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 | #endif /*! * @brief Creates a new, autoreleased copy item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @return A new, autoreleased copy item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath | > | > > | > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | #endif /*! * @brief Creates a new, autoreleased copy item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @param errNo The errno of the error * @return A new, autoreleased copy item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Initializes an already allocated copy item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @param errNo The errno of the error * @return An initialized copy item failed exception */ - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Returns the path of the source item. * * @return The path of the source item */ - (OFString*)sourcePath; |
︙ | ︙ |
Modified src/exceptions/OFCopyItemFailedException.m from [5c98735b80] to [31714a2509].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFCopyItemFailedException.h" #import "OFString.h" | < < > | > > | > | | > > > > | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | */ #include "config.h" #import "OFCopyItemFailedException.h" #import "OFString.h" @implementation OFCopyItemFailedException + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_sourcePath release]; [_destinationPath release]; [super dealloc]; } - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"Failed to copy item %@ to %@: %@", _sourcePath, _destinationPath, of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to copy item %@ to %@!", _sourcePath, _destinationPath]; } - (OFString*)sourcePath { OF_GETTER(_sourcePath, true) } |
︙ | ︙ |
Modified src/exceptions/OFCreateDirectoryFailedException.h from [03b95f70a4] to [447307d92e].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" /*! * @class OFCreateDirectoryFailedException \ * OFCreateDirectoryFailedException.h \ * ObjFW/OFCreateDirectoryFailedException.h * |
︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 | #endif /*! * @brief Creates a new, autoreleased create directory failed exception. * * @param path A string with the path of the directory which could not be * created * @return A new, autoreleased create directory failed exception */ | > | > > | > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | #endif /*! * @brief Creates a new, autoreleased create directory failed exception. * * @param path A string with the path of the directory which could not be * created * @param errNo The errno of the error * @return A new, autoreleased create directory failed exception */ + (instancetype)exceptionWithPath: (OFString*)path errNo: (int)errNo; /*! * @brief Initializes an already allocated create directory failed exception. * * @param path A string with the path of the directory which could not be * created * @param errNo The errno of the error * @return An initialized create directory failed exception */ - initWithPath: (OFString*)path errNo: (int)errNo; /*! * @brief Returns a string with the path of the directory which couldn't be * created. * * @return A string with the path of the directory which couldn't be created */ |
︙ | ︙ |
Modified src/exceptions/OFCreateDirectoryFailedException.m from [b368ad7360] to [7442d8e670].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFCreateDirectoryFailedException.h" #import "OFString.h" | < < > | > > | | > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | */ #include "config.h" #import "OFCreateDirectoryFailedException.h" #import "OFString.h" @implementation OFCreateDirectoryFailedException + (instancetype)exceptionWithPath: (OFString*)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithPath: (OFString*)path errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_path release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Failed to create directory %@: %@", _path, of_strerror(_errNo)]; } - (OFString*)path { OF_GETTER(_path, true) } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFCreateSymbolicLinkFailedException.h from [68e5a962d1] to [090e3b7afe].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifdef OF_HAVE_SYMLINK /*! * @class OFCreateSymbolicLinkFailedException \ * OFCreateSymbolicLinkFailedException.h \ * ObjFW/OFCreateSymbolicLinkFailedException.h |
︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 | #endif /*! * @brief Creates a new, autoreleased create symbolic link failed exception. * * @param sourcePath The source for the symbolic link * @param destinationPath The destination for the symbolic link * @return A new, autoreleased create symbolic link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath | > | > > | > | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | #endif /*! * @brief Creates a new, autoreleased create symbolic link failed exception. * * @param sourcePath The source for the symbolic link * @param destinationPath The destination for the symbolic link * @param errNo The errno of the error * @return A new, autoreleased create symbolic link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Initializes an already allocated create symbolic link failed * exception. * * @param sourcePath The source for the symbolic link * @param destinationPath The destination for the symbolic link * @param errNo The errno of the error * @return An initialized create symbolic link failed exception */ - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Returns a string with the source for the symlink. * * @return A string with the source for the symlink */ - (OFString*)sourcePath; |
︙ | ︙ |
Modified src/exceptions/OFCreateSymbolicLinkFailedException.m from [3a276fc80a] to [e23d5c4909].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFCreateSymbolicLinkFailedException.h" #import "OFString.h" | < < > | > > | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | */ #include "config.h" #import "OFCreateSymbolicLinkFailedException.h" #import "OFString.h" #ifdef OF_HAVE_SYMLINK @implementation OFCreateSymbolicLinkFailedException + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_sourcePath release]; [_destinationPath release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Failed to symlink file %@ to %@: %@", _sourcePath, _destinationPath, of_strerror(_errNo)]; } - (OFString*)sourcePath { OF_GETTER(_sourcePath, true) } |
︙ | ︙ |
Modified src/exceptions/OFEnumerationMutationException.m from [35427b9bc0] to [d96cb108f1].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFEnumerationMutationException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFEnumerationMutationException.h" #import "OFString.h" @implementation OFEnumerationMutationException + (instancetype)exceptionWithObject: (id)object { return [[[self alloc] initWithObject: object] autorelease]; } - init |
︙ | ︙ |
Modified src/exceptions/OFException.h from [f58935f385] to [81451deb50].
︙ | ︙ | |||
162 163 164 165 166 167 168 | * @brief Returns a backtrace of when the exception was created or nil if no * backtrace is available. * * @return A backtrace of when the exception was created */ - (OFArray*)backtrace; @end | > > > > > > > > | 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 | * @brief Returns a backtrace of when the exception was created or nil if no * backtrace is available. * * @return A backtrace of when the exception was created */ - (OFArray*)backtrace; @end #ifdef __cplusplus extern "C" { #endif extern OFString* of_strerror(int errNo); #ifdef __cplusplus } #endif |
Modified src/exceptions/OFException.m from [f35f997d0d] to [23bfa51fc4].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdlib.h> #ifdef HAVE_DLFCN_H # include <dlfcn.h> #endif #import "OFException.h" #import "OFString.h" #import "OFArray.h" #if defined(_WIN32) && defined(OF_HAVE_SOCKETS) | > > > > > > > > > > < | < | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> #include <stdlib.h> #ifdef HAVE_DLFCN_H # include <dlfcn.h> #endif #import "OFException.h" #import "OFString.h" #import "OFArray.h" #import "OFSystemInfo.h" #import "OFInitializationFailedException.h" #import "OFLockFailedException.h" #import "OFUnlockFailedException.h" #if !defined(HAVE_STRERROR_R) && defined(OF_HAVE_THREADS) # import "threading.h" #endif #if defined(_WIN32) && defined(OF_HAVE_SOCKETS) # include <winerror.h> #endif /* * Define HAVE_DWARF_EXCEPTIONS if OBJC_ZEROCOST_EXCEPTIONS is defined, but * don't do so on iOS, as it is defined there even if SjLj exceptions are used. */ #ifndef HAVE_DWARF_EXCEPTIONS # if defined(OBJC_ZEROCOST_EXCEPTIONS) && !defined(OF_IOS) # define HAVE_DWARF_EXCEPTIONS # endif #endif /* * Define HAVE_DWARF_EXCEPTIONS if HAVE_SEH_EXCEPTIONS is defined, as SEH * exceptions are implemented as a wrapper around DWARF exceptions. |
︙ | ︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | extern _Unwind_Reason_Code _Unwind_Backtrace( _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*); # if defined(__arm__) || defined(__ARM__) extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*); # else extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*); # endif static _Unwind_Reason_Code backtrace_callback(struct _Unwind_Context *ctx, void *data) { struct backtrace_ctx *bt = data; if (bt->i < OF_BACKTRACE_SIZE) { # if defined(__arm__) || defined(__ARM__) uintptr_t ip; _Unwind_VRS_Get(ctx, 0, 15, 0, &ip); bt->backtrace[bt->i++] = (void*)(ip & ~1); # else bt->backtrace[bt->i++] = (void*)_Unwind_GetIP(ctx); # endif return _URC_OK; } return _URC_END_OF_STACK; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | extern _Unwind_Reason_Code _Unwind_Backtrace( _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*); # if defined(__arm__) || defined(__ARM__) extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*); # else extern uintptr_t _Unwind_GetIP(struct _Unwind_Context*); # endif #if !defined(HAVE_STRERROR_R) && defined(OF_HAVE_THREADS) static of_mutex_t mutex; static void __attribute__((__constructor__)) init(void) { if (!of_mutex_new(&mutex)) @throw [OFInitializationFailedException exception]; } #endif OFString* of_strerror(int errNo) { OFString *ret; #ifdef HAVE_STRERROR_R char buffer[256]; #endif #ifdef _WIN32 /* * These were translated from WSAE* errors to errno and thus Win32's * strerror_r() does not know about them. * * FIXME: These could have better descriptions! */ switch (errNo) { case EADDRINUSE: return @"EADDRINUSE"; case EADDRNOTAVAIL: return @"EADDRNOTAVAIL"; case EAFNOSUPPORT: return @"EAFNOSUPPORT"; case EALREADY: return @"EALREADY"; case ECONNABORTED: return @"ECONNABORTED"; case ECONNREFUSED: return @"ECONNREFUSED"; case ECONNRESET: return @"ECONNRESET"; case EDESTADDRREQ: return @"EDESTADDRREQ"; case EDQUOT: return @"EDQUOT"; case EHOSTDOWN: return @"EHOSTDOWN"; case EHOSTUNREACH: return @"EHOSTUNREACH"; case EINPROGRESS: return @"EINPROGRESS"; case EISCONN: return @"EISCONN"; case ELOOP: return @"ELOOP"; case EMSGSIZE: return @"EMSGSIZE"; case ENETDOWN: return @"ENETDOWN"; case ENETRESET: return @"ENETRESET"; case ENETUNREACH: return @"ENETUNREACH"; case ENOBUFS: return @"ENOBUFS"; case ENOPROTOOPT: return @"ENOPROTOOPT"; case ENOTCONN: return @"ENOTCONN"; case ENOTSOCK: return @"ENOTSOCK"; case EOPNOTSUPP: return @"EOPNOTSUPP"; case EPFNOSUPPORT: return @"EPFNOSUPPORT"; case EPROCLIM: return @"EPROCLIM"; case EPROTONOSUPPORT: return @"EPROTONOSUPPORT"; case EPROTOTYPE: return @"EPROTOTYPE"; case EREMOTE: return @"EREMOTE"; case ESHUTDOWN: return @"ESHUTDOWN"; case ESOCKTNOSUPPORT: return @"ESOCKTNOSUPPORT"; case ESTALE: return @"ESTALE"; case ETIMEDOUT: return @"ETIMEDOUT"; case ETOOMANYREFS: return @"ETOOMANYREFS"; case EUSERS: return @"EUSERS"; case EWOULDBLOCK: return @"EWOULDBLOCK"; } #endif #ifdef HAVE_STRERROR_R if (strerror_r(errNo, buffer, 256) != 0) return @"Unknown error (strerror_r failed)"; ret = [OFString stringWithCString: buffer encoding: [OFSystemInfo native8BitEncoding]]; #else # ifdef OF_HAVE_THREADS if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif ret = [OFString stringWithCString: strerror(errNo) encoding: [OFSystemInfo native8BitEncoding]]; # ifdef OF_HAVE_THREADS } @finally { if (!of_mutex_unlock(&mutex)) @throw [OFUnlockFailedException exception]; } # endif #endif return ret; } static _Unwind_Reason_Code backtrace_callback(struct _Unwind_Context *ctx, void *data) { struct backtrace_ctx *bt = data; if (bt->i < OF_BACKTRACE_SIZE) { # if defined(__arm__) || defined(__ARM__) uintptr_t ip; _Unwind_VRS_Get(ctx, 0, 15, 0, &ip); bt->backtrace[bt->i++] = (void*)(ip & ~1); # else bt->backtrace[bt->i++] = (void*)_Unwind_GetIP(ctx); # endif return _URC_OK; } return _URC_END_OF_STACK; } #endif @implementation OFException + (instancetype)exception { return [[[self alloc] init] autorelease]; } |
︙ | ︙ |
Modified src/exceptions/OFHTTPRequestFailedException.m from [cf0d86a98b] to [df276b3585].
︙ | ︙ | |||
17 18 19 20 21 22 23 | #include "config.h" #import "OFHTTPRequestFailedException.h" #import "OFString.h" #import "OFHTTPRequest.h" #import "OFHTTPResponse.h" | < < | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include "config.h" #import "OFHTTPRequestFailedException.h" #import "OFString.h" #import "OFHTTPRequest.h" #import "OFHTTPResponse.h" @implementation OFHTTPRequestFailedException + (instancetype)exceptionWithRequest: (OFHTTPRequest*)request response: (OFHTTPResponse*)response { return [[[self alloc] initWithRequest: request response: response] autorelease]; } |
︙ | ︙ |
Modified src/exceptions/OFHashAlreadyCalculatedException.m from [95cce9d5a5] to [9bf5548117].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFHashAlreadyCalculatedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFHashAlreadyCalculatedException.h" #import "OFString.h" @implementation OFHashAlreadyCalculatedException + (instancetype)exceptionWithHash: (id <OFHash>)hash { return [[[self alloc] initWithHash: hash] autorelease]; } - init |
︙ | ︙ |
Modified src/exceptions/OFInitializationFailedException.m from [26c9c44c2d] to [80689772fb].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFInitializationFailedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFInitializationFailedException.h" #import "OFString.h" @implementation OFInitializationFailedException + (instancetype)exceptionWithClass: (Class)class { return [[[self alloc] initWithClass: class] autorelease]; } - init |
︙ | ︙ |
Modified src/exceptions/OFLinkFailedException.h from [869469c410] to [4ee2fb6264].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifdef OF_HAVE_LINK /*! * @class OFLinkFailedException \ * OFLinkFailedException.h ObjFW/OFLinkFailedException.h * |
︙ | ︙ | |||
37 38 39 40 41 42 43 44 45 46 | # endif /*! * @brief Creates a new, autoreleased link failed exception. * * @param sourcePath The source for the link * @param destinationPath The destination for the link * @return A new, autoreleased link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath | > | > > | > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | # endif /*! * @brief Creates a new, autoreleased link failed exception. * * @param sourcePath The source for the link * @param destinationPath The destination for the link * @param errNo The errno of the error * @return A new, autoreleased link failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Initializes an already allocated link failed exception. * * @param sourcePath The source for the link * @param destinationPath The destination for the link * @param errNo The errno of the error * @return An initialized link failed exception */ - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Returns a string with the source for the link. * * @return A string with the source for the link */ - (OFString*)sourcePath; |
︙ | ︙ |
Modified src/exceptions/OFLinkFailedException.m from [9dbf2235b5] to [a0545e5899].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFLinkFailedException.h" #import "OFString.h" | < < > | > > | | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | */ #include "config.h" #import "OFLinkFailedException.h" #import "OFString.h" #ifdef OF_HAVE_LINK @implementation OFLinkFailedException + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_sourcePath release]; [_destinationPath release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Failed to link file %@ to %@: %@", _sourcePath, _destinationPath, of_strerror(_errNo)]; } - (OFString*)sourcePath { OF_GETTER(_sourcePath, true) } |
︙ | ︙ |
Modified src/exceptions/OFListenFailedException.h from [ce3a805b58] to [9409a555ca].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" #ifndef OF_HAVE_SOCKETS # error No sockets available! #endif /*! |
︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 | #endif /*! * @brief Creates a new, autoreleased listen failed exception. * * @param socket The socket which failed to listen * @param backLog The requested size of the back log * @return A new, autoreleased listen failed exception */ + (instancetype)exceptionWithSocket: (id)socket | > | > > | > | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | #endif /*! * @brief Creates a new, autoreleased listen failed exception. * * @param socket The socket which failed to listen * @param backLog The requested size of the back log * @param errNo The errno of the error * @return A new, autoreleased listen failed exception */ + (instancetype)exceptionWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo; /*! * @brief Initializes an already allocated listen failed exception * * @param socket The socket which failed to listen * @param backLog The requested size of the back log * @param errNo The errno of the error * @return An initialized listen failed exception */ - initWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo; /*! * @brief Returns the socket which failed to listen. * * @return The socket which failed to listen */ - (id)socket; |
︙ | ︙ |
Modified src/exceptions/OFListenFailedException.m from [b8a823d6c3] to [88817ed048].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFListenFailedException.h" #import "OFString.h" | < < > | > > | | | | < < < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | */ #include "config.h" #import "OFListenFailedException.h" #import "OFString.h" @implementation OFListenFailedException + (instancetype)exceptionWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo { return [[[self alloc] initWithSocket: socket backLog: backLog errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithSocket: (id)socket backLog: (int)backLog errNo: (int)errNo { self = [super init]; _socket = [socket retain]; _backLog = backLog; _errNo = errNo; return self; } - (void)dealloc { [_socket release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Failed to listen in socket of type %@ with a back log of %d: %@", [_socket class], _backLog, of_strerror(_errNo)]; } - (id)socket { OF_GETTER(_socket, true) } - (int)backLog { return _backLog; } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFLockFailedException.m from [241b90c799] to [f674581484].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFLockFailedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFLockFailedException.h" #import "OFString.h" @implementation OFLockFailedException + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } - initWithLock: (id <OFLocking>)lock |
︙ | ︙ |
Modified src/exceptions/OFMalformedXMLException.m from [a8ad14496d] to [a2f194b17a].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #import "OFMalformedXMLException.h" #import "OFString.h" #import "OFXMLParser.h" | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include "config.h" #import "OFMalformedXMLException.h" #import "OFString.h" #import "OFXMLParser.h" @implementation OFMalformedXMLException + (instancetype)exceptionWithParser: (OFXMLParser*)parser { return [[[self alloc] initWithParser: parser] autorelease]; } - initWithParser: (OFXMLParser*)parser |
︙ | ︙ |
Modified src/exceptions/OFMoveItemFailedException.h from [935cda0c3e] to [fbb81728bb].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" /*! * @class OFMoveItemFailedException \ * OFMoveItemFailedException.h ObjFW/OFMoveItemFailedException.h * * @brief An exception indicating that moving an item failed. |
︙ | ︙ | |||
36 37 38 39 40 41 42 43 44 45 | #endif /*! * @brief Creates a new, autoreleased move item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @return A new, autoreleased move item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath | > | > > | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | #endif /*! * @brief Creates a new, autoreleased move item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @param errNo The errno of the error * @return A new, autoreleased move item failed exception */ + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Initializes an already allocated move item failed exception. * * @param sourcePath The original path * @param destinationPath The new path * @param errNo The errno of the error * @return An initialized move item failed exception */ - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo; /*! * @brief Returns the original path. * * @return The original path */ - (OFString*)sourcePath; |
︙ | ︙ |
Modified src/exceptions/OFMoveItemFailedException.m from [de79d304be] to [9aecf924e2].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFMoveItemFailedException.h" #import "OFString.h" | < < > | > > | > | | > > > > | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | */ #include "config.h" #import "OFMoveItemFailedException.h" #import "OFString.h" @implementation OFMoveItemFailedException + (instancetype)exceptionWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { return [[[self alloc] initWithSourcePath: sourcePath destinationPath: destinationPath errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithSourcePath: (OFString*)sourcePath destinationPath: (OFString*)destinationPath errNo: (int)errNo { self = [super init]; @try { _sourcePath = [sourcePath copy]; _destinationPath = [destinationPath copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_sourcePath release]; [_destinationPath release]; [super dealloc]; } - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"Failed to move item at path %@ to %@: %@", _sourcePath, _destinationPath, of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to move item at path %@ to %@!", _sourcePath, _destinationPath]; } - (OFString*)sourcePath { OF_GETTER(_sourcePath, true) } |
︙ | ︙ |
Modified src/exceptions/OFNotConnectedException.m from [284b7d5620] to [3dd688e897].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFNotConnectedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFNotConnectedException.h" #import "OFString.h" @implementation OFNotConnectedException + (instancetype)exceptionWithSocket: (id)socket { return [[[self alloc] initWithSocket: socket] autorelease]; } - init |
︙ | ︙ |
Modified src/exceptions/OFNotImplementedException.m from [e011dcc801] to [9a89086e6f].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFNotImplementedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFNotImplementedException.h" #import "OFString.h" @implementation OFNotImplementedException + (instancetype)exceptionWithSelector: (SEL)selector object: (id)object { return [[[self alloc] initWithSelector: selector object: object] autorelease]; } |
︙ | ︙ |
Modified src/exceptions/OFOpenFileFailedException.h from [af8167010b] to [ac17edec1a].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" /*! * @class OFOpenFileFailedException \ * OFOpenFileFailedException.h ObjFW/OFOpenFileFailedException.h * * @brief An exception indicating a file couldn't be opened. |
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | * @param path A string with the path of the file tried to open * @param mode A string with the mode in which the file should have been opened * @return A new, autoreleased open file failed exception */ + (instancetype)exceptionWithPath: (OFString*)path mode: (OFString*)mode; /*! * @brief Initializes an already allocated open file failed exception. * * @param path A string with the path of the file which couldn't be opened * @param mode A string with the mode in which the file should have been opened * @return An initialized open file failed exception */ - initWithPath: (OFString*)path mode: (OFString*)mode; /*! * @brief Returns a string with the path of the file which couldn't be opened. * * @return A string with the path of the file which couldn't be opened */ - (OFString*)path; | > > > > > > > > > > > > > > > > > > > > > > > > | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | * @param path A string with the path of the file tried to open * @param mode A string with the mode in which the file should have been opened * @return A new, autoreleased open file failed exception */ + (instancetype)exceptionWithPath: (OFString*)path mode: (OFString*)mode; /*! * @brief Creates a new, autoreleased open file failed exception. * * @param path A string with the path of the file tried to open * @param mode A string with the mode in which the file should have been opened * @param errNo The errno of the error * @return A new, autoreleased open file failed exception */ + (instancetype)exceptionWithPath: (OFString*)path mode: (OFString*)mode errNo: (int)errNo; /*! * @brief Initializes an already allocated open file failed exception. * * @param path A string with the path of the file which couldn't be opened * @param mode A string with the mode in which the file should have been opened * @return An initialized open file failed exception */ - initWithPath: (OFString*)path mode: (OFString*)mode; /*! * @brief Initializes an already allocated open file failed exception. * * @param path A string with the path of the file which couldn't be opened * @param mode A string with the mode in which the file should have been opened * @param errNo The errno of the error * @return An initialized open file failed exception */ - initWithPath: (OFString*)path mode: (OFString*)mode errNo: (int)errNo; /*! * @brief Returns a string with the path of the file which couldn't be opened. * * @return A string with the path of the file which couldn't be opened */ - (OFString*)path; |
︙ | ︙ |
Modified src/exceptions/OFOpenFileFailedException.m from [d398ad4641] to [195f94c4ef].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFOpenFileFailedException.h" #import "OFString.h" | < < > > > > > > > > > > > > > > > > > > > > > > > > > > | > | | > > > > | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | */ #include "config.h" #import "OFOpenFileFailedException.h" #import "OFString.h" @implementation OFOpenFileFailedException + (instancetype)exceptionWithPath: (OFString*)path mode: (OFString*)mode { return [[[self alloc] initWithPath: path mode: mode] autorelease]; } + (instancetype)exceptionWithPath: (OFString*)path mode: (OFString*)mode errNo: (int)errNo { return [[[self alloc] initWithPath: path mode: mode errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithPath: (OFString*)path mode: (OFString*)mode { self = [super init]; @try { _path = [path copy]; _mode = [mode copy]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithPath: (OFString*)path mode: (OFString*)mode errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _mode = [mode copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_path release]; [_mode release]; [super dealloc]; } - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"Failed to open file %@ with mode %@: %@", _path, _mode, of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to open file %@ with mode %@!", _path, _mode]; } - (OFString*)path { OF_GETTER(_path, true) } |
︙ | ︙ |
Modified src/exceptions/OFReadFailedException.m from [6584b3bcc2] to [700fd5671f].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFReadFailedException.h" #import "OFString.h" | < < > | | | > > > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | */ #include "config.h" #import "OFReadFailedException.h" #import "OFString.h" @implementation OFReadFailedException - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"Failed to read %zu bytes from an object of type %@: %@", _requestedLength, [_object class], of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to read %zu bytes from an object of type %@!", _requestedLength, [_object class]]; } @end |
Modified src/exceptions/OFReadOrWriteFailedException.h from [f505bf8f83] to [4634f2a2fb].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < < > > > > > > > > > > > > > > > > > > > > > > > > > > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" /*! * @class OFReadOrWriteFailedException \ * OFReadOrWriteFailedException.h ObjFW/OFReadOrWriteFailedException.h * * @brief An exception indicating that reading from or writing to an object * failed. */ @interface OFReadOrWriteFailedException: OFException { id _object; size_t _requestedLength; int _errNo; } #ifdef OF_HAVE_PROPERTIES @property (readonly, retain) id object; @property (readonly) size_t requestedLength; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased read or write failed exception. * * @param object The object from which reading or to which writing failed * @param requestedLength The requested length of the data that couldn't be * read / written * @return A new, autoreleased read or write failed exception */ + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength; /*! * @brief Creates a new, autoreleased read or write failed exception. * * @param object The object from which reading or to which writing failed * @param requestedLength The requested length of the data that couldn't be * read / written * @param errNo The errno of the error * @return A new, autoreleased read or write failed exception */ + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo; /*! * @brief Initializes an already allocated read or write failed exception. * * @param object The object from which reading or to which writing failed * @param requestedLength The requested length of the data that couldn't be * read / written * @return A new open file failed exception */ - initWithObject: (id)object requestedLength: (size_t)requestedLength; /*! * @brief Initializes an already allocated read or write failed exception. * * @param object The object from which reading or to which writing failed * @param requestedLength The requested length of the data that couldn't be * read / written * @param errNo The errno of the error * @return A new open file failed exception */ - initWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo; /*! * @brief Returns the object from which reading or to which writing failed * * @return The stream which caused the read or write failed exception */ - (id)object; |
︙ | ︙ |
Modified src/exceptions/OFReadOrWriteFailedException.m from [231337000a] to [545888cf6f].
︙ | ︙ | |||
14 15 16 17 18 19 20 | * file. */ #include "config.h" #import "OFReadOrWriteFailedException.h" #import "OFString.h" | < < < < < < > > > > > > > > > | > | | > | > | | > > | > | | > > > > > > | < < < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | * file. */ #include "config.h" #import "OFReadOrWriteFailedException.h" #import "OFString.h" @implementation OFReadOrWriteFailedException + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength { return [[[self alloc] initWithObject: object requestedLength: requestedLength] autorelease]; } + (instancetype)exceptionWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo { return [[[self alloc] initWithObject: object requestedLength: requestedLength errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithObject: (id)object requestedLength: (size_t)requestedLength { self = [super init]; _object = [object retain]; _requestedLength = requestedLength; return self; } - initWithObject: (id)object requestedLength: (size_t)requestedLength errNo: (int)errNo { self = [super init]; _object = [object retain]; _requestedLength = requestedLength; _errNo = errNo; return self; } - (void)dealloc { [_object release]; [super dealloc]; } - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"Failed to read or write %zu bytes from / to an object of " @"type %@: %@", _requestedLength, [_object class], of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to read or write %zu bytes from / to an object of " @"type %@!", _requestedLength, [_object class]]; } - (id)object { OF_GETTER(_object, true) } - (size_t)requestedLength { return _requestedLength; } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFRemoveItemFailedException.h from [15c7a3050b] to [73ca224d91].
︙ | ︙ | |||
10 11 12 13 14 15 16 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ | < < | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * * Alternatively, it may be distributed under the terms of the GNU General * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #import "OFException.h" /*! * @class OFRemoveItemFailedException \ * OFRemoveItemFailedException.h ObjFW/OFRemoveItemFailedException.h * * @brief An exception indicating that removing an item failed. |
︙ | ︙ | |||
35 36 37 38 39 40 41 42 43 | @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased remove failed exception. * * @param path The path of the item which could not be removed * @return A new, autoreleased remove item failed exception */ | > | > > | > | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased remove failed exception. * * @param path The path of the item which could not be removed * @param errNo The errno of the error * @return A new, autoreleased remove item failed exception */ + (instancetype)exceptionWithPath: (OFString*)path errNo: (int)errNo; /*! * @brief Initializes an already allocated remove failed exception. * * @param path The path of the item which could not be removed * @param errNo The errno of the error * @return An initialized remove item failed exception */ - initWithPath: (OFString*)path errNo: (int)errNo; /*! * @brief Returns the path of the item which could not be removed. * * @return The path of the item which could not be removed */ - (OFString*)path; |
︙ | ︙ |
Modified src/exceptions/OFRemoveItemFailedException.m from [981990160b] to [0dda65f54c].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFRemoveItemFailedException.h" #import "OFString.h" | < < > | > > | > | | > > > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | */ #include "config.h" #import "OFRemoveItemFailedException.h" #import "OFString.h" @implementation OFRemoveItemFailedException + (instancetype)exceptionWithPath: (OFString*)path errNo: (int)errNo { return [[[self alloc] initWithPath: path errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithPath: (OFString*)path errNo: (int)errNo { self = [super init]; @try { _path = [path copy]; _errNo = errNo; } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { [_path release]; [super dealloc]; } - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"Failed to remove item at path %@: %@", _path, of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to remove item at path %@!", _path]; } - (OFString*)path { OF_GETTER(_path, true) } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFSeekFailedException.h from [0316afd3f6] to [fe22120f50].
︙ | ︙ | |||
38 39 40 41 42 43 44 45 46 47 48 | /*! * @brief Creates a new, autoreleased seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @return A new, autoreleased seek failed exception */ + (instancetype)exceptionWithStream: (OFSeekableStream*)stream offset: (of_offset_t)offset | > | > > | > | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | /*! * @brief Creates a new, autoreleased seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @param errNo The errno of the error * @return A new, autoreleased seek failed exception */ + (instancetype)exceptionWithStream: (OFSeekableStream*)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo; /*! * @brief Initializes an already allocated seek failed exception. * * @param stream The stream for which seeking failed * @param offset The offset to which seeking failed * @param whence To what the offset is relative * @param errNo The errno of the error * @return An initialized seek failed exception */ - initWithStream: (OFSeekableStream*)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo; /*! * @brief Returns the stream for which seeking failed. * * @return The stream for which seeking failed */ - (OFSeekableStream*)stream; |
︙ | ︙ |
Modified src/exceptions/OFSeekFailedException.m from [ed7c96dc99] to [cf10b6e3aa].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #import "OFSeekFailedException.h" #import "OFString.h" #import "OFSeekableStream.h" | < < > | > > | | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | #include "config.h" #import "OFSeekFailedException.h" #import "OFString.h" #import "OFSeekableStream.h" @implementation OFSeekFailedException + (instancetype)exceptionWithStream: (OFSeekableStream*)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo { return [[[self alloc] initWithStream: stream offset: offset whence: whence errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithStream: (OFSeekableStream*)stream offset: (of_offset_t)offset whence: (int)whence errNo: (int)errNo { self = [super init]; _stream = [stream retain]; _offset = offset; _whence = whence; _errNo = errNo; return self; } - (void)dealloc { [_stream release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Seeking failed in stream of type %@: %@", [_stream class], of_strerror(_errNo)]; } - (OFSeekableStream*)stream { OF_GETTER(_stream, true) } |
︙ | ︙ |
Modified src/exceptions/OFSetOptionFailedException.h from [7f61e0c7f4] to [de749ff86f].
︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | * OFSetOptionFailedException.h ObjFW/OFSetOptionFailedException.h * * @brief An exception indicating that setting an option for a stream failed. */ @interface OFSetOptionFailedException: OFException { OFStream *_stream; } #ifdef OF_HAVE_PROPERTIES @property (readonly, retain) OFStream *stream; #endif /*! * @brief Creates a new, autoreleased set option failed exception. * * @param stream The stream for which the option could not be set * @return A new, autoreleased set option failed exception */ | > > > | > > | > > > > > > > > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | * OFSetOptionFailedException.h ObjFW/OFSetOptionFailedException.h * * @brief An exception indicating that setting an option for a stream failed. */ @interface OFSetOptionFailedException: OFException { OFStream *_stream; int _errNo; } #ifdef OF_HAVE_PROPERTIES @property (readonly, retain) OFStream *stream; @property (readonly) int errNo; #endif /*! * @brief Creates a new, autoreleased set option failed exception. * * @param stream The stream for which the option could not be set * @param errNo The errno of the error * @return A new, autoreleased set option failed exception */ + (instancetype)exceptionWithStream: (OFStream*)stream errNo: (int)errNo; /*! * @brief Initializes an already allocated set option failed exception. * * @param stream The stream for which the option could not be set * @param errNo The errno of the error * @return An initialized set option failed exception */ - initWithStream: (OFStream*)stream errNo: (int)errNo; /*! * @brief Returns the stream for which the option could not be set. * * @return The stream for which the option could not be set */ - (OFStream*)stream; /*! * @brief Returns the errno from when the exception was created. * * @return The errno from when the exception was created */ - (int)errNo; @end |
Modified src/exceptions/OFSetOptionFailedException.m from [760365c630] to [3c40ebe6aa].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #import "OFSetOptionFailedException.h" #import "OFString.h" #import "OFStream.h" | < < > | > > > | | > > > > > | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | #include "config.h" #import "OFSetOptionFailedException.h" #import "OFString.h" #import "OFStream.h" @implementation OFSetOptionFailedException + (instancetype)exceptionWithStream: (OFStream*)stream errNo: (int)errNo { return [[[self alloc] initWithStream: stream errNo: errNo] autorelease]; } - init { OF_INVALID_INIT_METHOD } - initWithStream: (OFStream*)stream errNo: (int)errNo { self = [super init]; _stream = [stream retain]; _errNo = errNo; return self; } - (void)dealloc { [_stream release]; [super dealloc]; } - (OFString*)description { return [OFString stringWithFormat: @"Setting an option in a stream of type %@ failed: %@", [_stream class], of_strerror(_errNo)]; } - (OFStream*)stream { OF_GETTER(_stream, true) } - (int)errNo { return _errNo; } @end |
Modified src/exceptions/OFStillLockedException.m from [34569b0abc] to [a561eaaaf4].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFStillLockedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFStillLockedException.h" #import "OFString.h" @implementation OFStillLockedException + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } - initWithLock: (id <OFLocking>)lock |
︙ | ︙ |
Modified src/exceptions/OFUnboundNamespaceException.m from [ef831068b0] to [a09ea2fd0c].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #import "OFUnboundNamespaceException.h" #import "OFString.h" #import "OFXMLElement.h" | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include "config.h" #import "OFUnboundNamespaceException.h" #import "OFString.h" #import "OFXMLElement.h" @implementation OFUnboundNamespaceException + (instancetype)exceptionWithNamespace: (OFString*)namespace element: (OFXMLElement*)element { return [[[self alloc] initWithNamespace: namespace element: element] autorelease]; } |
︙ | ︙ |
Modified src/exceptions/OFUnboundPrefixException.m from [62079e56c9] to [90e777145f].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #import "OFUnboundPrefixException.h" #import "OFString.h" #import "OFXMLParser.h" | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include "config.h" #import "OFUnboundPrefixException.h" #import "OFString.h" #import "OFXMLParser.h" @implementation OFUnboundPrefixException + (instancetype)exceptionWithPrefix: (OFString*)prefix parser: (OFXMLParser*)parser { return [[[self alloc] initWithPrefix: prefix parser: parser] autorelease]; } |
︙ | ︙ |
Modified src/exceptions/OFUnknownXMLEntityException.m from [e814d7fe70] to [bc3518da16].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFUnknownXMLEntityException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFUnknownXMLEntityException.h" #import "OFString.h" @implementation OFUnknownXMLEntityException + (instancetype)exceptionWithEntityName: (OFString*)entityName { return [[[self alloc] initWithEntityName: entityName] autorelease]; } - initWithEntityName: (OFString*)entityName |
︙ | ︙ |
Modified src/exceptions/OFUnlockFailedException.m from [d8165065d5] to [12e86a7ae4].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFUnlockFailedException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFUnlockFailedException.h" #import "OFString.h" @implementation OFUnlockFailedException + (instancetype)exceptionWithLock: (id <OFLocking>)lock { return [[[self alloc] initWithLock: lock] autorelease]; } - initWithLock: (id <OFLocking>)lock |
︙ | ︙ |
Modified src/exceptions/OFUnsupportedProtocolException.m from [5e5a8130a5] to [6fe6409dba].
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #import "OFUnsupportedProtocolException.h" #import "OFString.h" #import "OFURL.h" | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include "config.h" #import "OFUnsupportedProtocolException.h" #import "OFString.h" #import "OFURL.h" @implementation OFUnsupportedProtocolException + (instancetype)exceptionWithURL: (OFURL*)url { return [[[self alloc] initWithURL: url] autorelease]; } - init |
︙ | ︙ |
Modified src/exceptions/OFUnsupportedVersionException.m from [29348d88b2] to [11627bba68].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFUnsupportedVersionException.h" #import "OFString.h" | < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "config.h" #import "OFUnsupportedVersionException.h" #import "OFString.h" @implementation OFUnsupportedVersionException + (instancetype)exceptionWithVersion: (OFString*)version { return [[[self alloc] initWithVersion: version] autorelease]; } - init |
︙ | ︙ |
Modified src/exceptions/OFWriteFailedException.m from [ee25db4689] to [c62a6dbf27].
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #import "OFWriteFailedException.h" #import "OFString.h" | < < > | | | > > > > | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | */ #include "config.h" #import "OFWriteFailedException.h" #import "OFString.h" @implementation OFWriteFailedException - (OFString*)description { if (_errNo != 0) return [OFString stringWithFormat: @"Failed to write %zu bytes to an object of type %@: %@", _requestedLength, [_object class], of_strerror(_errNo)]; else return [OFString stringWithFormat: @"Failed to write %zu bytes to an object of type %@!", _requestedLength, [_object class]]; } @end |
Deleted src/exceptions/common.h version [83d14795d1].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Modified src/resolver.m from [65cb318889] to [32d271bf6a].
︙ | ︙ | |||
23 24 25 26 27 28 29 | #include <string.h> #include <inttypes.h> #import "macros.h" #import "resolver.h" #if !defined(HAVE_THREADSAFE_GETADDRINFO) && defined(OF_HAVE_THREADS) | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #include <string.h> #include <inttypes.h> #import "macros.h" #import "resolver.h" #if !defined(HAVE_THREADSAFE_GETADDRINFO) && defined(OF_HAVE_THREADS) # include "threading.h" #endif #import "OFAddressTranslationFailedException.h" #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" |
︙ | ︙ | |||
70 71 72 73 74 75 76 | # if !defined(HAVE_THREADSAFE_GETADDRINFO) && defined(OF_HAVE_THREADS) if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif | > > | > | > | | | | | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | # if !defined(HAVE_THREADSAFE_GETADDRINFO) && defined(OF_HAVE_THREADS) if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif int error; if ((error = getaddrinfo([host UTF8String], portCString, &hints, &res0)) != 0) @throw [OFAddressTranslationFailedException exceptionWithHost: host error: error]; count = 0; for (res = res0; res != NULL; res = res->ai_next) count++; if (count == 0) { freeaddrinfo(res0); @throw [OFAddressTranslationFailedException exceptionWithHost: host]; } if ((ret = calloc(count + 1, sizeof(*ret))) == NULL) { freeaddrinfo(res0); @throw [OFOutOfMemoryException exceptionWithRequestedSize: (count + 1) * sizeof(*ret)]; } if ((results = malloc(count * sizeof(*results))) == NULL) { freeaddrinfo(res0); free(ret); @throw [OFOutOfMemoryException exceptionWithRequestedSize: count * sizeof(*results)]; } for (retIter = ret, resultsIter = results, res = res0; res != NULL; retIter++, resultsIter++, res = res->ai_next) { resultsIter->family = res->ai_family; resultsIter->type = res->ai_socktype; resultsIter->protocol = res->ai_protocol; |
︙ | ︙ | |||
176 177 178 179 180 181 182 | return ret; } if ((he = gethostbyname([host UTF8String])) == NULL || he->h_addrtype != AF_INET) @throw [OFAddressTranslationFailedException | | > | | | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | return ret; } if ((he = gethostbyname([host UTF8String])) == NULL || he->h_addrtype != AF_INET) @throw [OFAddressTranslationFailedException exceptionWithHost: host error: h_errno]; count = 0; for (ip = he->h_addr_list; *ip != NULL; ip++) count++; if (count == 0) @throw [OFAddressTranslationFailedException exceptionWithHost: host]; if ((ret = calloc(count + 1, sizeof(*ret))) == NULL) @throw [OFOutOfMemoryException exceptionWithRequestedSize: (count + 1) * sizeof(*ret)]; if ((results = malloc(count * sizeof(*results))) == NULL) { free(ret); @throw [OFOutOfMemoryException exceptionWithRequestedSize: count * sizeof(*results)]; } if ((addrs = calloc(count, sizeof(*addrs))) == NULL) { free(ret); free(results); @throw [OFOutOfMemoryException exceptionWithRequestedSize: count * sizeof(*addrs)]; |
︙ | ︙ | |||
249 250 251 252 253 254 255 256 | # if !defined(HAVE_THREADSAFE_GETADDRINFO) && defined(OF_HAVE_THREADS) if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif /* FIXME: Add NI_DGRAM for UDP? */ | > > | > | | > | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | # if !defined(HAVE_THREADSAFE_GETADDRINFO) && defined(OF_HAVE_THREADS) if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif int error; /* FIXME: Add NI_DGRAM for UDP? */ if ((error = getnameinfo(address, addressLength, hostCString, NI_MAXHOST, portCString, NI_MAXSERV, NI_NUMERICHOST | NI_NUMERICSERV)) != 0) @throw [OFAddressTranslationFailedException exceptionWithError: error]; if (host != NULL) *host = [OFString stringWithUTF8String: hostCString]; if (port != NULL) { char *endptr; long tmp; |
︙ | ︙ | |||
291 292 293 294 295 296 297 | if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif if ((hostCString = inet_ntoa( ((struct sockaddr_in*)(void*)address)->sin_addr)) == NULL) | | > | 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 | if (!of_mutex_lock(&mutex)) @throw [OFLockFailedException exception]; @try { # endif if ((hostCString = inet_ntoa( ((struct sockaddr_in*)(void*)address)->sin_addr)) == NULL) @throw [OFAddressTranslationFailedException exceptionWithError: h_errno]; if (host != NULL) *host = [OFString stringWithUTF8String: hostCString]; if (port != NULL) *port = OF_BSWAP16_IF_LE( ((struct sockaddr_in*)(void*)address)->sin_port); |
︙ | ︙ |
Modified src/socket.h from [8dbb1d9128] to [347ab62b21].
︙ | ︙ | |||
62 63 64 65 66 67 68 | sa_family_t ss_family; in_port_t ss_data1; struct in_addr ss_data2; int8_t ss_data3[8]; }; #endif | > > > | > > > > | 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 | sa_family_t ss_family; in_port_t ss_data1; struct in_addr ss_data2; int8_t ss_data3[8]; }; #endif #ifdef __cplusplus extern "C" { #endif extern bool of_socket_init(void); extern int of_socket_errno(void); #ifdef __cplusplus } #endif |
Modified src/socket.m from [32dd0de4f8] to [f110c9fc59].
︙ | ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #import "socket.h" #ifdef OF_HAVE_THREADS # include "threading.h" static of_once_t onceControl = OF_ONCE_INIT; #endif static bool initialized = false; | > > > > > | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | * Public License, either version 2 or 3, which can be found in the file * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <errno.h> /* For some E* -> WSAE* defines */ #import "OFException.h" #import "socket.h" #ifdef OF_HAVE_THREADS # include "threading.h" static of_once_t onceControl = OF_ONCE_INIT; #endif static bool initialized = false; |
︙ | ︙ | |||
37 38 39 40 41 42 43 | return; #endif initialized = true; } bool | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | return; #endif initialized = true; } bool of_socket_init() { #ifdef OF_HAVE_THREADS of_once(&onceControl, init); #else if (!initialized) init(); #endif return initialized; } int of_socket_errno() { #ifndef _WIN32 return errno; #else switch (WSAGetLastError()) { case WSAEACCES: return EACCES; case WSAEADDRINUSE: return EADDRINUSE; case WSAEADDRNOTAVAIL: return EADDRNOTAVAIL; case WSAEAFNOSUPPORT: return EAFNOSUPPORT; case WSAEALREADY: return EALREADY; case WSAEBADF: return EBADF; case WSAECONNABORTED: return ECONNABORTED; case WSAECONNREFUSED: return ECONNREFUSED; case WSAECONNRESET: return ECONNRESET; case WSAEDESTADDRREQ: return EDESTADDRREQ; case WSAEDISCON: return EPIPE; case WSAEDQUOT: return EDQUOT; case WSAEFAULT: return EFAULT; case WSAEHOSTDOWN: return EHOSTDOWN; case WSAEHOSTUNREACH: return EHOSTUNREACH; case WSAEINPROGRESS: return EINPROGRESS; case WSAEINTR: return EINTR; case WSAEINVAL: return EINVAL; case WSAEISCONN: return EISCONN; case WSAELOOP: return ELOOP; case WSAEMSGSIZE: return EMSGSIZE; case WSAENAMETOOLONG: return ENAMETOOLONG; case WSAENETDOWN: return ENETDOWN; case WSAENETRESET: return ENETRESET; case WSAENETUNREACH: return ENETUNREACH; case WSAENOBUFS: return ENOBUFS; case WSAENOPROTOOPT: return ENOPROTOOPT; case WSAENOTCONN: return ENOTCONN; case WSAENOTEMPTY: return ENOTEMPTY; case WSAENOTSOCK: return ENOTSOCK; case WSAEOPNOTSUPP: return EOPNOTSUPP; case WSAEPFNOSUPPORT: return EPFNOSUPPORT; case WSAEPROCLIM: return EPROCLIM; case WSAEPROTONOSUPPORT: return EPROTONOSUPPORT; case WSAEPROTOTYPE: return EPROTOTYPE; case WSAEREMOTE: return EREMOTE; case WSAESHUTDOWN: return ESHUTDOWN; case WSAESOCKTNOSUPPORT: return ESOCKTNOSUPPORT; case WSAESTALE: return ESTALE; case WSAETIMEDOUT: return ETIMEDOUT; case WSAETOOMANYREFS: return ETOOMANYREFS; case WSAEUSERS: return EUSERS; case WSAEWOULDBLOCK: return EWOULDBLOCK; } return 0; #endif } |