Changes In Branch 0.5 Through [448a35dd9b] Excluding Merge-Ins
This is equivalent to a diff from 91d438b5d2 to 448a35dd9b
2011-06-06
| ||
16:05 | Add missing imports to make gcc from trunk happy. check-in: 265ebf1d85 user: js tags: 0.5 | |
2011-06-04
| ||
18:49 | Fix a bug in -[OFDictionary initWithKeys:arguments:]. check-in: 448a35dd9b user: js tags: 0.5 | |
16:30 | Also escape \r in -[stringByXMLEscaping]. check-in: 7d8ab5ba31 user: js tags: 0.5 | |
2011-04-09
| ||
15:41 | OFXMLParser: Don't allow character data before the document. check-in: 0cc997a1d7 user: js tags: trunk | |
12:31 | Branch for 0.5. check-in: 5203170e82 user: js tags: 0.5 | |
12:30 | Also test comments in -[stringValue]. check-in: 91d438b5d2 user: js tags: trunk | |
2011-04-08
| ||
07:05 | Add -[isListening] to OFTCPSocket. check-in: 054a38e82d user: js tags: trunk | |
Modified ChangeLog from [f70c6798b5] to [842b4df9cf].
1 2 3 4 5 6 7 8 9 10 11 | Legend: * Changes of existing features or bugfixes. + New features. ObjFW 0.3.1 -> 0.4-alpha1, 03.01.2011 * ObjFW is now available under the terms of the QPL, GPLv2 and GPLv3. + Support for blocks was added, including a blocks runtime. + Added support for the new GNU runtime, introduced in GCC 4.6. * Objects returned from collections are no longer retained and autoreleased. + Added new classes OFXMLParser, OFXMLElement, OFXMLAttribute and OFXMLElementBuilder. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 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 | Legend: * Changes of existing features or bugfixes. + New features. ObjFW 0.5.1 -> ObjFW 0.5.2, 25.4.2011 * Fix double-retain in OFList. * Don't ignore the timeout in OFStreamObserver when using select(). * Do -[OFURL copy] in a try block to prevent a leak when an exception occurs. * Fix too big buffer in -[OFMutableString _applyTable:withSize:]. * Call madvise() on the correct length variable so it covers the whole string. * Fix a warning when sizeof(size_t) < sizeof(long long). * Skip possible BOMs when appending strings. ObjFW 0.5 -> ObjFW 0.5.1, 21.04.2011 * Work around a wrong warning produced by Apple GCC 4.0.1 which would cause the build to fail due to -Werror. * Call objc_thread_{add,remove} when using the GNU runtime to make sure the runtime knows about our thread. * Detach a thread before restarting if it was never joined. * Release the old return value when restarting a thread. ObjFW 0.4-alpha1 -> 0.5, 09.04.2011 + %@ is now allowed in format strings. + Added of_log for easy logging. * Exceptions have one header per exception now. * Lots of exception improvements. * Huge improvements in XML handling. * Improvements in socket handling, including improved API. * OFStreamObserver is now thread-safe and stops the current observe call when the set of streams to observe is modified. + New class OFURL. + New class OFHTTPRequest. + New class OFCondition. * Improvements in objfw-compile. + Blocks can be used together with Cocoa now. + When linking ObjFW and Cocoa, OFAutoreleasePools are used by both now. + Support for Base64. + Use a real Xcode project instead of just calling make. + Add Haiku to the list of supported platforms. * Lots of small bugfixes and countless small changes. Read the commits! ObjFW 0.3.1 -> 0.4-alpha1, 03.01.2011 * ObjFW is now available under the terms of the QPL, GPLv2 and GPLv3. + Support for blocks was added, including a blocks runtime. + Added support for the new GNU runtime, introduced in GCC 4.6. * Objects returned from collections are no longer retained and autoreleased. + Added new classes OFXMLParser, OFXMLElement, OFXMLAttribute and OFXMLElementBuilder. |
︙ | ︙ |
Modified Info.plist from [2784921274] to [ae9a2b96c2].
︙ | ︙ | |||
13 14 15 16 17 18 19 | <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleSignature</key> <string>OBJFW</string> <key>CFBundleVersion</key> | | | | 13 14 15 16 17 18 19 20 21 22 23 24 | <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleSignature</key> <string>OBJFW</string> <key>CFBundleVersion</key> <string>0.5.2</string> <key>CFBundleShortVersionString</key> <string>0.5.2</string> </dict> </plist> |
Modified ObjFW.xcodeproj/project.pbxproj from [184f3ea38a] to [07b998400f].
︙ | ︙ | |||
188 189 190 191 192 193 194 | 4B3D23EE1337FFD000DD29B8 /* of_asprintf.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB50DD012F863C700C9393F /* of_asprintf.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 */; }; | | | 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 | 4B3D23EE1337FFD000DD29B8 /* of_asprintf.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BB50DD012F863C700C9393F /* of_asprintf.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 */; }; 4B55A109133AC05100B58A93 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B55A106133AC05100B58A93 /* common.h */; settings = {ATTRIBUTES = (Public, ); }; }; 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, ); }; }; |
︙ | ︙ | |||
251 252 253 254 255 256 257 | 4BF33B0C133807A20059CEF7 /* OFThreadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67B1235358D0076B512 /* OFThreadTests.m */; }; 4BF33B0D133807A20059CEF7 /* OFURLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0749512DFAFCA00A4ADD1 /* OFURLTests.m */; }; 4BF33B0E133807A20059CEF7 /* OFXMLElementBuilderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67C1235358D0076B512 /* OFXMLElementBuilderTests.m */; }; 4BF33B0F133807A20059CEF7 /* OFXMLElementTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67D1235358D0076B512 /* OFXMLElementTests.m */; }; 4BF33B10133807A20059CEF7 /* OFXMLParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67E1235358D0076B512 /* OFXMLParserTests.m */; }; 4BF33B11133807A20059CEF7 /* PropertiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67F1235358D0076B512 /* PropertiesTests.m */; }; 4BF33B12133807A20059CEF7 /* TestsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF6811235358D0076B512 /* TestsAppDelegate.m */; }; | < < | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 | 4BF33B0C133807A20059CEF7 /* OFThreadTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67B1235358D0076B512 /* OFThreadTests.m */; }; 4BF33B0D133807A20059CEF7 /* OFURLTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BF0749512DFAFCA00A4ADD1 /* OFURLTests.m */; }; 4BF33B0E133807A20059CEF7 /* OFXMLElementBuilderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67C1235358D0076B512 /* OFXMLElementBuilderTests.m */; }; 4BF33B0F133807A20059CEF7 /* OFXMLElementTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67D1235358D0076B512 /* OFXMLElementTests.m */; }; 4BF33B10133807A20059CEF7 /* OFXMLParserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67E1235358D0076B512 /* OFXMLParserTests.m */; }; 4BF33B11133807A20059CEF7 /* PropertiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF67F1235358D0076B512 /* PropertiesTests.m */; }; 4BF33B12133807A20059CEF7 /* TestsAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B6EF6811235358D0076B512 /* TestsAppDelegate.m */; }; 4BF33B4713380CE20059CEF7 /* testfile.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF33B4313380CD40059CEF7 /* testfile.txt */; }; 4BF33B4813380D2D0059CEF7 /* testfile.bin in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4BF33B4213380CD40059CEF7 /* testfile.bin */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ 4B23CA8E133811B20047A1D9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; |
︙ | ︙ | |||
1020 1021 1022 1023 1024 1025 1026 | 4B17FFA9133A34E7003E6DCD /* OFTruncatedDataException.h in Headers */, 4B17FFB5133A375B003E6DCD /* OFUnboundNamespaceException.h in Headers */, 4B17FFB1133A3664003E6DCD /* OFUnsupportedProtocolException.h in Headers */, 4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */, 4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */, 4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */, 4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */, | < > | 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 | 4B17FFA9133A34E7003E6DCD /* OFTruncatedDataException.h in Headers */, 4B17FFB5133A375B003E6DCD /* OFUnboundNamespaceException.h in Headers */, 4B17FFB1133A3664003E6DCD /* OFUnsupportedProtocolException.h in Headers */, 4B55A0FF133ABEA900B58A93 /* OFThreadJoinFailedException.h in Headers */, 4B55A101133ABEA900B58A93 /* OFThreadStartFailedException.h in Headers */, 4B55A103133ABEA900B58A93 /* OFThreadStillRunningException.h in Headers */, 4B55A116133AC24600B58A93 /* OFWriteFailedException.h in Headers */, 4B55A109133AC05100B58A93 /* common.h in Headers */, 4BDF37B51338055600F9A81A /* config.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ 4B23CA89133811610047A1D9 /* TestPlugin */ = { |
︙ | ︙ | |||
1120 1121 1122 1123 1124 1125 1126 | /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ 4B3D23741337FBC800DD29B8 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( | < < | 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 | /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ 4B3D23741337FBC800DD29B8 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ 4B5D8DE11099E1BF000896FF /* ShellScript */ = { |
︙ | ︙ |
Modified README from [2bffcb61ce] to [3ed6345b53].
︙ | ︙ | |||
20 21 22 23 24 25 26 | $ ./autogen.sh BUILDING AS A MAC OS X FRAMEWORK It is also possible to build ObjFW as a Mac OS X framework. To do so, | | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | $ ./autogen.sh BUILDING AS A MAC OS X FRAMEWORK It is also possible to build ObjFW as a Mac OS X framework. To do so, just execute xcodebuild -target ObjFW in the root directory of ObjFW or open the .xcodeproj in Xcode and choose Build -> Build from the menu. Copy the resulting ObjFW.framework to /Library/Frameworks and you are done. USING THE MAC OS X FRAMWORK IN XCODE To use the Mac OS X framework in Xcode, you need to add the .framework to your project and add the following flags to "Other C Flags": |
︙ | ︙ |
Modified configure.ac from [c2f04c07fa] to [423e60bb1e].
|
| | | 1 2 3 4 5 6 7 8 | AC_INIT(ObjFW, 0.5.2, js@webkeks.org) AC_CONFIG_SRCDIR(src) AS_IF([test x"$host" = x"psp"], [ OBJCFLAGS="-G0 $OBJCFLAGS" LIBS="$LIBS -lpspdebug -lpspdisplay -lpspge -lpspctrl -lpspsdk -lc" LIBS="$LIBS -lpspnet -lpspnet_inet -lpspnet_apctl -lpspnet_resolver" LIBS="$LIBS -lpsputility -lpspuser -lpspkernel" |
︙ | ︙ | |||
497 498 499 500 501 502 503 | unsigned long size; } @end void *_OFConstantStringClassReference; ], [ OFConstantString *test = @""; | | | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 | unsigned long size; } @end void *_OFConstantStringClassReference; ], [ OFConstantString *test = @""; (void)test; /* Get rid of unused variable warning */ ], [ AC_MSG_RESULT(no) ], [ AC_MSG_RESULT([yes, adding -Wno-unused-variable]) OBJCFLAGS="$OBJCFLAGS -Wno-unused-variable" AC_SUBST(NO_WARN_UNUSED, "-Wno-unused-variable") ]) |
︙ | ︙ | |||
519 520 521 522 523 524 525 | @end static struct { struct objc_class *isa; } object; ], [ OFObject *test = (OFObject*)&object; | | | 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 | @end static struct { struct objc_class *isa; } object; ], [ OFObject *test = (OFObject*)&object; (void)test; /* Get rid of unused variable warning */ ], [ AC_MSG_RESULT(no) ], [ AC_MSG_RESULT(yes) OBJCFLAGS="$OBJCFLAGS -Wno-strict-aliasing" ]) ]) |
︙ | ︙ |
Modified extra.mk.in from [48b5fcc6f3] to [a6cef7bb66].
1 2 | OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ | | | 1 2 3 4 5 6 7 8 9 10 | OBJFW_SHARED_LIB = @OBJFW_SHARED_LIB@ OBJFW_STATIC_LIB = @OBJFW_STATIC_LIB@ OBJFW_LIB_MAJOR = 4 OBJFW_LIB_MINOR = 0 OBJFW_LIB_MAJOR_MINOR = ${OBJFW_LIB_MAJOR}.${OBJFW_LIB_MINOR} ASPRINTF_M = @ASPRINTF_M@ ATOMIC_H = @ATOMIC_H@ BIN_PREFIX = @BIN_PREFIX@ EXCEPTIONS_A = @EXCEPTIONS_A@ |
︙ | ︙ |
Modified src/OFArray.m from [57851d31d6] to [39f6c9eb94].
︙ | ︙ | |||
111 112 113 114 115 116 117 118 119 120 121 122 123 124 | { self = [self init]; @try { id obj; [array addItem: &first]; while ((obj = va_arg(args, id)) != nil) { [array addItem: &obj]; [obj retain]; } } @catch (id e) { [self release]; @throw e; | > > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | { self = [self init]; @try { id obj; [array addItem: &first]; [first retain]; while ((obj = va_arg(args, id)) != nil) { [array addItem: &obj]; [obj retain]; } } @catch (id e) { [self release]; @throw e; |
︙ | ︙ |
Modified src/OFDate.m from [d33bbd220e] to [00ea6c929d].
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | #ifdef OF_THREADS # import "OFThread.h" #endif #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfRangeException.h" #if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \ defined(OF_THREADS) static OFMutex *mutex; #endif #ifdef HAVE_GMTIME_R | > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #ifdef OF_THREADS # import "OFThread.h" #endif #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfRangeException.h" #import "macros.h" #if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \ defined(OF_THREADS) static OFMutex *mutex; #endif #ifdef HAVE_GMTIME_R |
︙ | ︙ | |||
243 244 245 246 247 248 249 250 251 252 253 254 255 256 | if (![obj isKindOfClass: [OFDate class]]) return NO; if (((OFDate*)obj)->sec != sec || ((OFDate*)obj)->usec != usec) return NO; return YES; } - copy { return [self retain]; } - (of_comparison_result_t)compare: (id)obj | > > > > > > > > > > > > > > > > > > > > > > > > > | 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 | if (![obj isKindOfClass: [OFDate class]]) return NO; if (((OFDate*)obj)->sec != sec || ((OFDate*)obj)->usec != usec) return NO; return YES; } - (uint32_t)hash { uint32_t hash; OF_HASH_INIT(hash); OF_HASH_ADD(hash, (sec >> 56) & 0xFF); OF_HASH_ADD(hash, (sec >> 48) & 0xFF); OF_HASH_ADD(hash, (sec >> 40) & 0xFF); OF_HASH_ADD(hash, (sec >> 32) & 0xFF); OF_HASH_ADD(hash, (sec >> 24) & 0xFF); OF_HASH_ADD(hash, (sec >> 16) & 0xFF); OF_HASH_ADD(hash, (sec >> 8) & 0xFF); OF_HASH_ADD(hash, sec & 0xFF); OF_HASH_ADD(hash, (usec >> 24) & 0xFF); OF_HASH_ADD(hash, (usec >> 16) & 0xFF); OF_HASH_ADD(hash, (usec >> 8) & 0xFF); OF_HASH_ADD(hash, usec & 0xFF); OF_HASH_FINALIZE(hash); return hash; } - copy { return [self retain]; } - (of_comparison_result_t)compare: (id)obj |
︙ | ︙ |
Modified src/OFDictionary.m from [69df15df8e] to [0776706270].
︙ | ︙ | |||
451 452 453 454 455 456 457 458 459 460 461 462 463 464 | [data[j]->object release]; } @catch (id e) { [obj release]; @throw e; } data[j]->object = obj; } } @catch (id e) { [self release]; @throw e; } return self; | > | 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | [data[j]->object release]; } @catch (id e) { [obj release]; @throw e; } data[j]->object = obj; count--; } } @catch (id e) { [self release]; @throw e; } return self; |
︙ | ︙ |
Modified src/OFFile.m from [696b6c1432] to [e9530ebde9].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdio.h> #include <string.h> #include <stdarg.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> | > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this * file. */ #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> #include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> |
︙ | ︙ |
Modified src/OFHTTPRequest.m from [5637b3f014] to [c8b35b7eac].
︙ | ︙ | |||
163 164 165 166 167 168 169 | @try { OFString *line, *path; OFMutableDictionary *s_headers; OFDataArray *data; OFEnumerator *enumerator; OFString *key; int status; | | | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 | @try { OFString *line, *path; OFMutableDictionary *s_headers; OFDataArray *data; OFEnumerator *enumerator; OFString *key; int status; const char *t = NULL; [sock connectToHost: [URL host] onPort: [URL port]]; /* * Work around a bug with packet bisection in lighttpd when * using HTTPS. |
︙ | ︙ |
Modified src/OFList.m from [ca60541ce0] to [80de30a57f].
︙ | ︙ | |||
77 78 79 80 81 82 83 | lastListObject = o; if (firstListObject == NULL) firstListObject = o; count++; mutations++; | < < | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | lastListObject = o; if (firstListObject == NULL) firstListObject = o; count++; mutations++; return o; } - (of_list_object_t*)prependObject: (id)obj { of_list_object_t *o; |
︙ | ︙ | |||
101 102 103 104 105 106 107 | firstListObject = o; if (lastListObject == NULL) lastListObject = o; count++; mutations++; | < < | 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | firstListObject = o; if (lastListObject == NULL) lastListObject = o; count++; mutations++; return o; } - (of_list_object_t*)insertObject: (id)obj beforeListObject: (of_list_object_t*)listobj { of_list_object_t *o; |
︙ | ︙ | |||
127 128 129 130 131 132 133 | if (listobj == firstListObject) firstListObject = o; count++; mutations++; | < < | 123 124 125 126 127 128 129 130 131 132 133 134 135 136 | if (listobj == firstListObject) firstListObject = o; count++; mutations++; return o; } - (of_list_object_t*)insertObject: (id)obj afterListObject: (of_list_object_t*)listobj { of_list_object_t *o; |
︙ | ︙ | |||
153 154 155 156 157 158 159 | if (listobj == lastListObject) lastListObject = o; count++; mutations++; | < < | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | if (listobj == lastListObject) lastListObject = o; count++; mutations++; return o; } - (void)removeListObject: (of_list_object_t*)listobj { if (listobj->prev != NULL) listobj->prev->next = listobj->next; |
︙ | ︙ | |||
255 256 257 258 259 260 261 | if (new->firstListObject == NULL) new->firstListObject = o; if (prev != NULL) prev->next = o; new->count++; | < < | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 | if (new->firstListObject == NULL) new->firstListObject = o; if (prev != NULL) prev->next = o; new->count++; prev = o; } } @catch (id e) { [new release]; @throw e; } |
︙ | ︙ |
Modified src/OFMutableString.m from [fe52a06baf] to [6944810146].
︙ | ︙ | |||
61 62 63 64 65 66 67 | if ((t = table[0][*p]) != 0) *p = t; return; } ulen = [self length]; | | | < | | 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 | if ((t = table[0][*p]) != 0) *p = t; return; } ulen = [self length]; ustr = [self allocMemoryForNItems: ulen withSize: sizeof(of_unichar_t)]; i = j = 0; nlen = 0; while (i < length) { clen = of_string_utf8_to_unicode(string + i, length - i, &c); if (clen == 0 || c > 0x10FFFF) { [self freeMemory: ustr]; |
︙ | ︙ | |||
134 135 136 137 138 139 140 141 142 143 144 145 146 147 | - (void)setToCString: (const char*)str { size_t len; [self freeMemory: string]; len = strlen(str); switch (of_string_check_utf8(str, len)) { case 0: isUTF8 = NO; break; case 1: isUTF8 = YES; | > > > > > | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | - (void)setToCString: (const char*)str { size_t len; [self freeMemory: string]; len = strlen(str); if (len >= 3 && !memcmp(str, "\xEF\xBB\xBF", 3)) { str += 3; len -= 3; } switch (of_string_check_utf8(str, len)) { case 0: isUTF8 = NO; break; case 1: isUTF8 = YES; |
︙ | ︙ | |||
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 | } - (void)appendCString: (const char*)str { size_t strlength; strlength = strlen(str); switch (of_string_check_utf8(str, strlength)) { case 1: isUTF8 = YES; break; case -1: @throw [OFInvalidEncodingException newWithClass: isa]; } string = [self resizeMemory: string toSize: length + strlength + 1]; memcpy(string + length, str, strlength + 1); length += strlength; } - (void)appendCString: (const char*)str withLength: (size_t)len { switch (of_string_check_utf8(str, len)) { case 1: isUTF8 = YES; break; case -1: @throw [OFInvalidEncodingException newWithClass: isa]; } | > > > > > > > > > > | 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 | } - (void)appendCString: (const char*)str { size_t strlength; strlength = strlen(str); if (strlength >= 3 && !memcmp(str, "\xEF\xBB\xBF", 3)) { str += 3; strlength -= 3; } switch (of_string_check_utf8(str, strlength)) { case 1: isUTF8 = YES; break; case -1: @throw [OFInvalidEncodingException newWithClass: isa]; } string = [self resizeMemory: string toSize: length + strlength + 1]; memcpy(string + length, str, strlength + 1); length += strlength; } - (void)appendCString: (const char*)str withLength: (size_t)len { if (len >= 3 && !memcmp(str, "\xEF\xBB\xBF", 3)) { str += 3; len -= 3; } switch (of_string_check_utf8(str, len)) { case 1: isUTF8 = YES; break; case -1: @throw [OFInvalidEncodingException newWithClass: isa]; } |
︙ | ︙ | |||
264 265 266 267 268 269 270 | atIndex: 0]; } - (void)reverse { size_t i, j, len = length / 2; | | | | | | | | | | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 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 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 | atIndex: 0]; } - (void)reverse { size_t i, j, len = length / 2; madvise(string, length, MADV_SEQUENTIAL); /* We reverse all bytes and restore UTF-8 later, if necessary */ for (i = 0, j = length - 1; i < len; i++, j--) { string[i] ^= string[j]; string[j] ^= string[i]; string[i] ^= string[j]; } if (!isUTF8) { madvise(string, length, MADV_NORMAL); return; } for (i = 0; i < length; i++) { /* ASCII */ if (OF_LIKELY(!(string[i] & 0x80))) continue; /* A start byte can't happen first as we reversed everything */ if (OF_UNLIKELY(string[i] & 0x40)) { madvise(string, length, MADV_NORMAL); @throw [OFInvalidEncodingException newWithClass: isa]; } /* Next byte must not be ASCII */ if (OF_UNLIKELY(length < i + 1 || !(string[i + 1] & 0x80))) { madvise(string, length, MADV_NORMAL); @throw [OFInvalidEncodingException newWithClass: isa]; } /* Next byte is the start byte */ if (OF_LIKELY(string[i + 1] & 0x40)) { string[i] ^= string[i + 1]; string[i + 1] ^= string[i]; string[i] ^= string[i + 1]; i++; continue; } /* Second next byte must not be ASCII */ if (OF_UNLIKELY(length < i + 2 || !(string[i + 2] & 0x80))) { madvise(string, length, MADV_NORMAL); @throw [OFInvalidEncodingException newWithClass: isa]; } /* Second next byte is the start byte */ if (OF_LIKELY(string[i + 2] & 0x40)) { string[i] ^= string[i + 2]; string[i + 2] ^= string[i]; string[i] ^= string[i + 2]; i += 2; continue; } /* Third next byte must not be ASCII */ if (OF_UNLIKELY(length < i + 3 || !(string[i + 3] & 0x80))) { madvise(string, length, MADV_NORMAL); @throw [OFInvalidEncodingException newWithClass: isa]; } /* Third next byte is the start byte */ if (OF_LIKELY(string[i + 3] & 0x40)) { string[i] ^= string[i + 3]; string[i + 3] ^= string[i]; string[i] ^= string[i + 3]; string[i + 1] ^= string[i + 2]; string[i + 2] ^= string[i + 1]; string[i + 1] ^= string[i + 2]; i += 3; continue; } /* UTF-8 does not allow more than 4 bytes per character */ madvise(string, length, MADV_NORMAL); @throw [OFInvalidEncodingException newWithClass: isa]; } madvise(string, length, MADV_NORMAL); } - (void)upper { [self _applyTable: of_unicode_upper_table withSize: OF_UNICODE_UPPER_TABLE_SIZE]; } |
︙ | ︙ |
Modified src/OFStreamObserver.m from [90468a0a65] to [4bdac00ac8].
︙ | ︙ | |||
485 486 487 488 489 490 491 492 493 494 495 496 497 498 | FD_COPY(&exceptfds, &exceptfds_); # else readfds_ = readfds; writefds_ = writefds; exceptfds_ = exceptfds; # endif if (select(nfds, &readfds_, &writefds_, &exceptfds_, (timeout != -1 ? &tv : NULL)) < 1) return NO; if (FD_ISSET(cancelFd[0], &readfds_)) { char buf; #ifndef _WIN32 | > > > | 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 | FD_COPY(&exceptfds, &exceptfds_); # else readfds_ = readfds; writefds_ = writefds; exceptfds_ = exceptfds; # endif tv.tv_sec = timeout / 1000; tv.tv_usec = (timeout % 1000) * 1000; if (select(nfds, &readfds_, &writefds_, &exceptfds_, (timeout != -1 ? &tv : NULL)) < 1) return NO; if (FD_ISSET(cancelFd[0], &readfds_)) { char buf; #ifndef _WIN32 |
︙ | ︙ |
Modified src/OFString+XMLEscaping.m from [c2066f8693] to [aa261c5ddc].
︙ | ︙ | |||
63 64 65 66 67 68 69 70 71 72 73 74 75 76 | append = "'"; append_len = 6; break; case '&': append = "&"; append_len = 5; break; default: append = NULL; append_len = 0; } if (append != NULL) { if ((tmp = realloc(str_c, len + append_len)) == NULL) { | > > > > | 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | append = "'"; append_len = 6; break; case '&': append = "&"; append_len = 5; break; case '\r': append = "
"; append_len = 5; break; default: append = NULL; append_len = 0; } if (append != NULL) { if ((tmp = realloc(str_c, len + append_len)) == NULL) { |
︙ | ︙ |
Modified src/OFString.m from [a034b6e9c4] to [dd37a07a33].
︙ | ︙ | |||
95 96 97 98 99 100 101 | /* We're missing a start byte here */ if (OF_UNLIKELY(!(str[i] & 0x40))) { madvise((void*)str, len, MADV_NORMAL); return -1; } /* We have at minimum a 2 byte character -> check next byte */ | | | | | 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 | /* We're missing a start byte here */ if (OF_UNLIKELY(!(str[i] & 0x40))) { madvise((void*)str, len, MADV_NORMAL); return -1; } /* We have at minimum a 2 byte character -> check next byte */ if (OF_UNLIKELY(len <= i + 1 || (str[i + 1] & 0xC0) != 0x80)) { madvise((void*)str, len, MADV_NORMAL); return -1; } /* Check if we have at minimum a 3 byte character */ if (OF_LIKELY(!(str[i] & 0x20))) { i++; continue; } /* We have at minimum a 3 byte char -> check second next byte */ if (OF_UNLIKELY(len <= i + 2 || (str[i + 2] & 0xC0) != 0x80)) { madvise((void*)str, len, MADV_NORMAL); return -1; } /* Check if we have a 4 byte character */ if (OF_LIKELY(!(str[i] & 0x10))) { i += 2; continue; } /* We have a 4 byte character -> check third next byte */ if (OF_UNLIKELY(len <= i + 3 || (str[i + 3] & 0xC0) != 0x80)) { madvise((void*)str, len, MADV_NORMAL); return -1; } /* * Just in case, check if there's a 5th character, which is * forbidden by UTF-8 |
︙ | ︙ | |||
662 663 664 665 666 667 668 669 670 671 672 | OFFile *file; if (stat([path cString], &s) == -1) @throw [OFOpenFileFailedException newWithClass: isa path: path mode: @"rb"]; file = [[OFFile alloc] initWithPath: path mode: @"rb"]; @try { | > > > | | | | 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 692 693 694 695 696 697 | OFFile *file; if (stat([path cString], &s) == -1) @throw [OFOpenFileFailedException newWithClass: isa path: path mode: @"rb"]; if (s.st_size > SIZE_MAX) @throw [OFOutOfRangeException newWithClass: isa]; file = [[OFFile alloc] initWithPath: path mode: @"rb"]; @try { tmp = [self allocMemoryWithSize: (size_t)s.st_size]; [file readExactlyNBytes: (size_t)s.st_size intoBuffer: tmp]; } @finally { [file release]; } } @catch (id e) { [self release]; @throw e; } self = [self initWithCString: tmp encoding: encoding length: (size_t)s.st_size]; [self freeMemory: tmp]; return self; } - initWithContentsOfURL: (OFURL*)url { |
︙ | ︙ | |||
1413 1414 1415 1416 1417 1418 1419 | i = j = 0; while (i < length) { of_unichar_t c; size_t clen; | | | 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 | i = j = 0; while (i < length) { of_unichar_t c; size_t clen; clen = of_string_utf8_to_unicode(string + i, length - i, &c); if (clen == 0 || c > 0x10FFFF) { free(ret); @throw [OFInvalidEncodingException newWithClass: isa]; } ret[j++] = c; |
︙ | ︙ |
Modified src/OFThread.m from [fd76b79d25] to [926b087d59].
︙ | ︙ | |||
18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #ifndef _WIN32 # include <unistd.h> # include <sched.h> #else # include <windows.h> #endif #import "OFThread.h" #import "OFList.h" #import "OFDate.h" #import "OFAutoreleasePool.h" #import "OFConditionBroadcastFailedException.h" | > > > > | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | #ifndef _WIN32 # include <unistd.h> # include <sched.h> #else # include <windows.h> #endif #if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME) # import <objc/thr.h> #endif #import "OFThread.h" #import "OFList.h" #import "OFDate.h" #import "OFAutoreleasePool.h" #import "OFConditionBroadcastFailedException.h" |
︙ | ︙ | |||
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 | static OFList *tlskeys; static of_tlskey_t thread_self; static id call_main(id obj) { if (!of_tlskey_set(thread_self, obj)) @throw [OFInitializationFailedException newWithClass: [obj class]]; /* * Nasty workaround for thread implementations which can't return a * value on join. */ ((OFThread*)obj)->retval = [[obj main] retain]; [obj handleTermination]; ((OFThread*)obj)->running = OF_THREAD_WAITING_FOR_JOIN; [OFTLSKey callAllDestructors]; [OFAutoreleasePool releaseAll]; [obj release]; return 0; } @implementation OFThread + (void)initialize { | > > > > > > > > | 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 | static OFList *tlskeys; static of_tlskey_t thread_self; static id call_main(id obj) { #if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME) objc_thread_add(); #endif if (!of_tlskey_set(thread_self, obj)) @throw [OFInitializationFailedException newWithClass: [obj class]]; /* * Nasty workaround for thread implementations which can't return a * value on join. */ ((OFThread*)obj)->retval = [[obj main] retain]; [obj handleTermination]; ((OFThread*)obj)->running = OF_THREAD_WAITING_FOR_JOIN; [OFTLSKey callAllDestructors]; [OFAutoreleasePool releaseAll]; [obj release]; #if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME) objc_thread_remove(); #endif return 0; } @implementation OFThread + (void)initialize { |
︙ | ︙ | |||
204 205 206 207 208 209 210 211 212 213 214 215 216 217 | thread->running = OF_THREAD_WAITING_FOR_JOIN; } [OFTLSKey callAllDestructors]; [OFAutoreleasePool releaseAll]; [thread release]; of_thread_exit(); } - initWithObject: (id)obj { self = [super init]; | > > > > | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | thread->running = OF_THREAD_WAITING_FOR_JOIN; } [OFTLSKey callAllDestructors]; [OFAutoreleasePool releaseAll]; [thread release]; #if defined(OF_GNU_RUNTIME) || defined(OF_OLD_GNU_RUNTIME) objc_thread_remove(); #endif of_thread_exit(); } - initWithObject: (id)obj { self = [super init]; |
︙ | ︙ | |||
239 240 241 242 243 244 245 246 247 248 249 250 251 252 | } - (void)start { if (running == OF_THREAD_RUNNING) @throw [OFThreadStillRunningException newWithClass: isa thread: self]; [self retain]; if (!of_thread_new(&thread, call_main, self)) { [self release]; @throw [OFThreadStartFailedException newWithClass: isa thread: self]; | > > > > > | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | } - (void)start { if (running == OF_THREAD_RUNNING) @throw [OFThreadStillRunningException newWithClass: isa thread: self]; if (running == OF_THREAD_WAITING_FOR_JOIN) { of_thread_detach(thread); [retval release]; } [self retain]; if (!of_thread_new(&thread, call_main, self)) { [self release]; @throw [OFThreadStartFailedException newWithClass: isa thread: self]; |
︙ | ︙ | |||
268 269 270 271 272 273 274 275 276 277 278 279 280 281 | - (void)dealloc { if (running == OF_THREAD_RUNNING) @throw [OFThreadStillRunningException newWithClass: isa thread: self]; [object release]; [retval release]; [super dealloc]; } @end | > > > > > > > | 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | - (void)dealloc { if (running == OF_THREAD_RUNNING) @throw [OFThreadStillRunningException newWithClass: isa thread: self]; /* * We should not be running anymore, but call detach in order to free * the resources. */ if (running == OF_THREAD_WAITING_FOR_JOIN) of_thread_detach(thread); [object release]; [retval release]; [super dealloc]; } @end |
︙ | ︙ |
Modified src/OFURL.m from [ae9145fa4e] to [0accfd5d18].
︙ | ︙ | |||
314 315 316 317 318 319 320 | if (![url->scheme isEqual: scheme]) return NO; if (![url->host isEqual: host]) return NO; if (url->port != port) return NO; | | | > | | | | 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 | if (![url->scheme isEqual: scheme]) return NO; if (![url->host isEqual: host]) return NO; if (url->port != port) return NO; if (url->user != user && ![url->user isEqual: user]) return NO; if (url->password != password && ![url->password isEqual: password]) return NO; if (![url->path isEqual: path]) return NO; if (url->parameters != parameters && ![url->parameters isEqual: parameters]) return NO; if (url->query != query && ![url->query isEqual: query]) return NO; if (url->fragment != fragment && ![url->fragment isEqual: fragment]) return NO; return YES; } - (uint32_t)hash { |
︙ | ︙ | |||
358 359 360 361 362 363 364 | return hash; } - copy { OFURL *new = [[OFURL alloc] init]; | > | | | | | | | | | > > > > | 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 | return hash; } - copy { OFURL *new = [[OFURL alloc] init]; @try { new->scheme = [scheme copy]; new->host = [host copy]; new->port = port; new->user = [user copy]; new->password = [password copy]; new->path = [path copy]; new->parameters = [parameters copy]; new->query = [query copy]; new->fragment = [fragment copy]; } @catch (id e) { [new release]; @throw e; } return new; } - (OFString*)scheme { OF_GETTER(scheme, YES) |
︙ | ︙ |
Modified src/OFXMLElement.h from [11b7a22a69] to [f4d50f39b5].
︙ | ︙ | |||
323 324 325 326 327 328 329 | * \param prefix The prefix for the namespace * \param ns The namespace for which the prefix is bound */ - (void)bindPrefix: (OFString*)prefix forNamespace: (OFString*)ns; /** | | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 | * \param prefix The prefix for the namespace * \param ns The namespace for which the prefix is bound */ - (void)bindPrefix: (OFString*)prefix forNamespace: (OFString*)ns; /** * Sets the default namespace for the element to be used if there is no parent. * * \param ns The default namespace for the element */ - (void)setDefaultNamespace: (OFString*)ns; /** * Adds a child to the OFXMLElement. |
︙ | ︙ |
Modified src/OFXMLElement.m from [1d2471d4ea] to [2e27de79cd].
︙ | ︙ | |||
40 41 42 43 44 45 46 | } @end @implementation OFXMLElement_OFXMLElementBuilderDelegate - (void)elementBuilder: (OFXMLElementBuilder*)builder didBuildElement: (OFXMLElement*)elem { | > > > > > > | > | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | } @end @implementation OFXMLElement_OFXMLElementBuilderDelegate - (void)elementBuilder: (OFXMLElementBuilder*)builder didBuildElement: (OFXMLElement*)elem { /* * Make sure we don't take whitespaces before or after the root element * into account. */ if ([elem name] != nil) { assert(element == nil); element = [elem retain]; } } - (void)dealloc { [element release]; [super dealloc]; |
︙ | ︙ | |||
210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 | - initWithXMLString: (OFString*)str { OFAutoreleasePool *pool; OFXMLParser *parser; OFXMLElementBuilder *builder; OFXMLElement_OFXMLElementBuilderDelegate *delegate; [self release]; pool = [[OFAutoreleasePool alloc] init]; parser = [OFXMLParser parser]; builder = [OFXMLElementBuilder elementBuilder]; delegate = [[[OFXMLElement_OFXMLElementBuilderDelegate alloc] init] autorelease]; [parser setDelegate: builder]; [builder setDelegate: delegate]; [parser parseString: str]; if (![parser finishedParsing]) | > > | | 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 | - initWithXMLString: (OFString*)str { OFAutoreleasePool *pool; OFXMLParser *parser; OFXMLElementBuilder *builder; OFXMLElement_OFXMLElementBuilderDelegate *delegate; Class c; c = isa; [self release]; pool = [[OFAutoreleasePool alloc] init]; parser = [OFXMLParser parser]; builder = [OFXMLElementBuilder elementBuilder]; delegate = [[[OFXMLElement_OFXMLElementBuilderDelegate alloc] init] autorelease]; [parser setDelegate: builder]; [builder setDelegate: delegate]; [parser parseString: str]; if (![parser finishedParsing]) @throw [OFMalformedXMLException newWithClass: c parser: parser]; self = [delegate->element retain]; @try { [pool release]; } @catch (id e) { |
︙ | ︙ | |||
356 357 358 359 360 361 362 | * -[copy] is called. */ str->isa = [OFString class]; return str; } pool = [[OFAutoreleasePool alloc] init]; | < < < > > > > > > > | < < | < | < < | 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 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 442 443 444 445 446 447 448 449 | * -[copy] is called. */ str->isa = [OFString class]; return str; } pool = [[OFAutoreleasePool alloc] init]; if (parent != nil && parent->namespaces != nil) { OFEnumerator *key_enum = [namespaces keyEnumerator]; OFEnumerator *obj_enum = [namespaces objectEnumerator]; id key, obj; all_namespaces = [[parent->namespaces mutableCopy] autorelease]; while ((key = [key_enum nextObject]) != nil && (obj = [obj_enum nextObject]) != nil) [all_namespaces setObject: obj forKey: key]; } else all_namespaces = namespaces; prefix = [all_namespaces objectForKey: (ns != nil ? ns : (OFString*)@"")]; parent_prefix = [all_namespaces objectForKey: (parent != nil && parent->ns != nil ? parent->ns : (OFString*)@"")]; if (parent != nil && parent->ns != nil && parent_prefix == nil) def_ns = parent->ns; else if (parent != nil && parent->defaultNamespace != nil) def_ns = parent->defaultNamespace; else def_ns = defaultNamespace; i = 0; len = [name cStringLength] + 3; str_c = [self allocMemoryWithSize: len]; /* Start of tag */ str_c[i++] = '<'; if (prefix != nil && ![ns isEqual: def_ns]) { len += [prefix cStringLength] + 1; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (id e) { [self freeMemory: str_c]; @throw e; } memcpy(str_c + i, [prefix cString], [prefix cStringLength]); i += [prefix cStringLength]; str_c[i++] = ':'; } memcpy(str_c + i, [name cString], [name cStringLength]); i += [name cStringLength]; /* xmlns if necessary */ if (prefix == nil && ((ns != nil && ![ns isEqual: def_ns]) || (ns == nil && def_ns != nil))) { len += [ns cStringLength] + 9; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (id e) { [self freeMemory: str_c]; @throw e; } memcpy(str_c + i, " xmlns='", 8); i += 8; memcpy(str_c + i, [ns cString], [ns cStringLength]); i += [ns cStringLength]; str_c[i++] = '\''; } /* Attributes */ attrs_carray = [attributes cArray]; attrs_count = [attributes count]; pool2 = [[OFAutoreleasePool alloc] init]; |
︙ | ︙ | |||
751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 | return ret; } - (void)dealloc { [name release]; [ns release]; [attributes release]; [namespaces release]; [children release]; [characters release]; [cdata release]; [comment release]; [super dealloc]; } @end | > | 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 | return ret; } - (void)dealloc { [name release]; [ns release]; [defaultNamespace release]; [attributes release]; [namespaces release]; [children release]; [characters release]; [cdata release]; [comment release]; [super dealloc]; } @end |
Modified src/OFXMLParser.h from [4bfeec9a6e] to [0a269ecfb6].
︙ | ︙ | |||
175 176 177 178 179 180 181 182 183 184 185 186 187 188 | of_xml_parser_element_end_block_t elementEndHandler; of_xml_parser_string_block_t charactersHandler; of_xml_parser_string_block_t CDATAHandler; of_xml_parser_string_block_t commentHandler; of_xml_parser_unknown_entity_block_t unknownEntityHandler; #endif size_t level; size_t lineNumber; BOOL lastCarriageReturn; BOOL finishedParsing; } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFXMLParserDelegate> delegate; | > | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 | of_xml_parser_element_end_block_t elementEndHandler; of_xml_parser_string_block_t charactersHandler; of_xml_parser_string_block_t CDATAHandler; of_xml_parser_string_block_t commentHandler; of_xml_parser_unknown_entity_block_t unknownEntityHandler; #endif size_t level; BOOL acceptProlog; size_t lineNumber; BOOL lastCarriageReturn; BOOL finishedParsing; } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFXMLParserDelegate> delegate; |
︙ | ︙ |
Modified src/OFXMLParser.m from [e1f46dcc8c] to [58a072789b].
︙ | ︙ | |||
47 48 49 50 51 52 53 | [cache replaceOccurrencesOfString: @"\r\n" withString: @"\n"]; [cache replaceOccurrencesOfString: @"\r" withString: @"\n"]; return [cache stringByXMLUnescapingWithDelegate: delegate]; } | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | [cache replaceOccurrencesOfString: @"\r\n" withString: @"\n"]; [cache replaceOccurrencesOfString: @"\r" withString: @"\n"]; return [cache stringByXMLUnescapingWithDelegate: delegate]; } static OFString* namespace_for_prefix(OFString *prefix, OFArray *namespaces) { OFDictionary **carray = [namespaces cArray]; ssize_t i; if (prefix == nil) prefix = @""; |
︙ | ︙ | |||
153 154 155 156 157 158 159 160 161 162 163 164 165 166 | pool = [[OFAutoreleasePool alloc] init]; dict = [OFMutableDictionary dictionaryWithKeysAndObjects: @"xml", @"http://www.w3.org/XML/1998/namespace", @"xmlns", @"http://www.w3.org/2000/xmlns/", nil]; [namespaces addObject: dict]; lineNumber = 1; [pool release]; } @catch (id e) { [self release]; @throw e; } | > | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | pool = [[OFAutoreleasePool alloc] init]; dict = [OFMutableDictionary dictionaryWithKeysAndObjects: @"xml", @"http://www.w3.org/XML/1998/namespace", @"xmlns", @"http://www.w3.org/2000/xmlns/", nil]; [namespaces addObject: dict]; acceptProlog = YES; lineNumber = 1; [pool release]; } @catch (id e) { [self release]; @throw e; } |
︙ | ︙ | |||
263 264 265 266 267 268 269 | } @finally { [file release]; } } /* * The following methods handle the different states of the parser. They are | | | | > | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 | } @finally { [file release]; } } /* * The following methods handle the different states of the parser. They are * looked up in +[initialize] and put in a lookup table to speed things up. * One dispatch for every character would be way too slow! */ /* Not in a tag */ - (void)_parseOutsideTagWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { size_t len; if ((finishedParsing || [previous count] < 1) && buf[*i] != ' ' && buf[*i] != '\t' && buf[*i] != '\n' && buf[*i] != '\r' && buf[*i] != '<') @throw [OFMalformedXMLException newWithClass: isa parser: self]; if (buf[*i] != '<') return; if ((len = *i - *last) > 0) |
︙ | ︙ | |||
315 316 317 318 319 320 321 | } /* Tag was just opened */ - (void)_parseTagOpenedWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 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 | } /* Tag was just opened */ - (void)_parseTagOpenedWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { if (finishedParsing && buf[*i] != '!' && buf[*i] != '?') @throw [OFMalformedXMLException newWithClass: isa parser: self]; switch (buf[*i]) { case '?': *last = *i + 1; state = OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS; level = 0; break; case '/': *last = *i + 1; state = OF_XMLPARSER_IN_CLOSE_TAG_NAME; acceptProlog = NO; break; case '!': *last = *i + 1; state = OF_XMLPARSER_IN_EXCLAMATIONMARK; acceptProlog = NO; break; default: state = OF_XMLPARSER_IN_TAG_NAME; acceptProlog = NO; (*i)--; break; } } /* <?xml […]?> */ - (BOOL)_parseXMLProcessingInstructions: (OFString*)pi { const char *pi_c; size_t i, last, pi_len; int xstate = 0; OFString *attr = nil; OFString *val = nil; char xdelim = 0; if (!acceptProlog) return NO; acceptProlog = NO; pi = [pi substringFromIndex: 3 toIndex: [pi length]]; pi = [pi stringByDeletingLeadingAndTrailingWhitespaces]; pi_c = [pi cString]; pi_len = [pi cStringLength]; for (i = last = 0; i < pi_len; i++) { switch (xstate) { case 0: if (pi_c[i] == ' ' || pi_c[i] == '\t' || pi_c[i] == '\r' || pi_c[i] == '\n') continue; last = i; xstate = 1; i--; break; case 1: if (pi_c[i] != '=') continue; attr = [OFString stringWithCString: pi_c + last length: i - last]; last = i + 1; xstate = 2; break; case 2: if (pi_c[i] != '\'' && pi_c[i] != '"') return NO; xdelim = pi_c[i]; last = i + 1; xstate = 3; break; case 3: if (pi_c[i] != xdelim) continue; val = [OFString stringWithCString: pi_c + last length: i - last]; if ([attr isEqual: @"version"]) if (![val hasPrefix: @"1."]) return NO; if ([attr isEqual: @"encoding"]) if ([val caseInsensitiveCompare: @"utf-8"] != OF_ORDERED_SAME) return NO; last = i + 1; xstate = 0; break; } } if (xstate != 0) return NO; return YES; } /* Inside processing instructions */ - (void)_parseInProcessingInstructionsWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { if (buf[*i] == '?') level = 1; else if (level == 1 && buf[*i] == '>') { |
︙ | ︙ | |||
366 367 368 369 370 371 372 373 374 375 376 377 378 379 | /* * Class swizzle the string to be immutable. We pass it as * OFString*, so it can't be modified anyway. But not swizzling * it would create a real copy each time -[copy] is called. */ pi->isa = [OFString class]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; | > > > > > > > > | 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | /* * Class swizzle the string to be immutable. We pass it as * OFString*, so it can't be modified anyway. But not swizzling * it would create a real copy each time -[copy] is called. */ pi->isa = [OFString class]; if ([pi isEqual: @"xml"] || [pi hasPrefix: @"xml "] || [pi hasPrefix: @"xml\t"] || [pi hasPrefix: @"xml\r"] || [pi hasPrefix: @"xml\n"]) if (![self _parseXMLProcessingInstructions: pi]) @throw [OFMalformedXMLException newWithClass: isa parser: self]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; |
︙ | ︙ | |||
444 445 446 447 448 449 450 451 452 453 454 455 456 457 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; } else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; | > > > | 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; if ([previous count] == 0) finishedParsing = YES; } else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; |
︙ | ︙ | |||
599 600 601 602 603 604 605 606 607 608 609 610 611 612 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; [namespaces removeNObjects: 1]; } else if (prefix != nil) { OFString *str = [OFString stringWithFormat: @"%@:%@", prefix, name]; [previous addObject: str]; } else | > > > | 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; if ([previous count] == 0) finishedParsing = YES; [namespaces removeNObjects: 1]; } else if (prefix != nil) { OFString *str = [OFString stringWithFormat: @"%@:%@", prefix, name]; [previous addObject: str]; } else |
︙ | ︙ |
Modified src/exceptions/OFConnectionFailedException.m from [5af8de549d] to [ad4dc4b722].
︙ | ︙ | |||
73 74 75 76 77 78 79 | - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: | | | | 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | - (OFString*)description { if (description != nil) return description; description = [[OFString alloc] initWithFormat: @"A connection to %@ on port %" @PRIu16 @" could not be " @"established in class %@! " ERRFMT, host, port, inClass, ERRPARAM]; return description; } - (OFTCPSocket*)socket { return socket; |
︙ | ︙ |
Modified src/threading.h from [ad9f8119e0] to [ed61fa08de].
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | return NO; CloseHandle(thread); return YES; #endif } static OF_INLINE void of_thread_exit() { #if defined(OF_HAVE_PTHREADS) pthread_exit(NULL); #elif defined(_WIN32) | > > > > > > > > > > > | 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 | return NO; CloseHandle(thread); return YES; #endif } static OF_INLINE BOOL of_thread_detach(of_thread_t thread) { #if defined(OF_HAVE_PTHREADS) return !pthread_detach(thread); #elif defined(_WIN32) /* FIXME */ return YES; #endif } static OF_INLINE void of_thread_exit() { #if defined(OF_HAVE_PTHREADS) pthread_exit(NULL); #elif defined(_WIN32) |
︙ | ︙ |
Modified tests/OFStringTests.m from [f41872f1e2] to [ac5088ce3b].
︙ | ︙ | |||
133 134 135 136 137 138 139 | TEST(@"+[stringWithContentsOfURL:encoding]", (s[1] = [OFString stringWithContentsOfURL: [OFURL URLWithString: @"file://testfile.txt"] encoding: OF_STRING_ENCODING_ISO_8859_1]) && [s[1] isEqual: @"testäöü"]) TEST(@"-[appendCStringWithLength:]", | | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 | TEST(@"+[stringWithContentsOfURL:encoding]", (s[1] = [OFString stringWithContentsOfURL: [OFURL URLWithString: @"file://testfile.txt"] encoding: OF_STRING_ENCODING_ISO_8859_1]) && [s[1] isEqual: @"testäöü"]) TEST(@"-[appendCStringWithLength:]", R([s[0] appendCString: "foo\xEF\xBB\xBF" "barqux" + 3 withLength: 6]) && [s[0] isEqual: @"foobar"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #1", OFInvalidEncodingException, [OFString stringWithCString: "\xE0\x80"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #2", OFInvalidEncodingException, [OFString stringWithCString: "\xF0\x80\x80\xC0"]) |
︙ | ︙ |
Modified tests/OFURLTests.m from [030d169ca8] to [8b94bb792f].
︙ | ︙ | |||
71 72 73 74 75 76 77 | [[u1 parameters] isEqual: @"p"] && [u4 parameters] == nil) TEST(@"-[query]", [[u1 query] isEqual: @"q"] && [u4 query] == nil) TEST(@"-[fragment]", [[u1 fragment] isEqual: @"f"] && [u4 fragment] == nil) TEST(@"-[copy]", R(u4 = [[u1 copy] autorelease])) | | > | 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | [[u1 parameters] isEqual: @"p"] && [u4 parameters] == nil) TEST(@"-[query]", [[u1 query] isEqual: @"q"] && [u4 query] == nil) TEST(@"-[fragment]", [[u1 fragment] isEqual: @"f"] && [u4 fragment] == nil) TEST(@"-[copy]", R(u4 = [[u1 copy] autorelease])) TEST(@"-[isEqual:]", [u1 isEqual: u4] && ![u2 isEqual: u3] && [[OFURL URLWithString: @"http://bar/"] isEqual: u3]) TEST(@"-[hash:]", [u1 hash] == [u4 hash] && [u2 hash] != [u3 hash]) EXPECT_EXCEPTION(@"Detection of invalid format", OFInvalidFormatException, [OFURL URLWithString: @"http"]) EXPECT_EXCEPTION(@"Detection of invalid scheme", OFInvalidFormatException, [OFURL URLWithString: @"foo://"]) |
︙ | ︙ |
Modified tests/OFXMLElementTests.m from [1e31b5bb2b] to [fe66efda43].
︙ | ︙ | |||
115 116 117 118 119 120 121 | R([elem[2] addChild: [OFXMLElement elementWithName: @"bar" namespace: @"urn:objfw:test"]]) && [[elem[2] XMLString] isEqual: @"<objfw-test:foo test='test'><objfw-test:bar/></objfw-test:foo>"]) TEST(@"+[elementWithXMLString:] and -[stringValue]", [[[OFXMLElement elementWithXMLString: | > | | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | R([elem[2] addChild: [OFXMLElement elementWithName: @"bar" namespace: @"urn:objfw:test"]]) && [[elem[2] XMLString] isEqual: @"<objfw-test:foo test='test'><objfw-test:bar/></objfw-test:foo>"]) TEST(@"+[elementWithXMLString:] and -[stringValue]", [[[OFXMLElement elementWithXMLString: @"<?xml version='1.0' encoding='UTF-8'?>\r\n<x>foo<![CDATA[bar]]>" @"<y>b<!-- fooo -->az</y>qux</x>"] stringValue] isEqual: @"foobarbazqux"]) TEST(@"-[elementsForName:namespace:]", (a = [elem[2] elementsForName: @"bar" namespace: @"urn:objfw:test"]) && [a count] == 1 && [[[a firstObject] XMLString] isEqual: @"<bar xmlns='urn:objfw:test'/>"]) |
︙ | ︙ |
Modified tests/OFXMLParserTests.m from [1ef5f83edf] to [1a865f21e8].
︙ | ︙ | |||
372 373 374 375 376 377 378 379 380 381 | EXPECT_EXCEPTION(@"Detection of junk after the document #1", OFMalformedXMLException, [parser parseString: @"a"]) EXPECT_EXCEPTION(@"Detection of junk after the document #2", OFMalformedXMLException, [parser parseString: @"<!["]) [pool drain]; } @end | > > > > > > > > > > > > > > > | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 | EXPECT_EXCEPTION(@"Detection of junk after the document #1", OFMalformedXMLException, [parser parseString: @"a"]) EXPECT_EXCEPTION(@"Detection of junk after the document #2", OFMalformedXMLException, [parser parseString: @"<!["]) parser = [OFXMLParser parser]; EXPECT_EXCEPTION(@"Detection of invalid XML processing instructions #1", OFMalformedXMLException, [parser parseString: @"<?xml version='2.0'?>"]) parser = [OFXMLParser parser]; EXPECT_EXCEPTION(@"Detection of invalid XML processing instructions #2", OFMalformedXMLException, [parser parseString: @"<?xml encoding='UTF-7'?>"]) parser = [OFXMLParser parser]; EXPECT_EXCEPTION(@"Detection of invalid XML processing instructions #3", OFMalformedXMLException, [parser parseString: @"<x><?xml?></x>"]) [pool drain]; } @end |
Modified utils/objfw-config.in from [a79a727b4f] to [90a48cf7e6].
︙ | ︙ | |||
33 34 35 36 37 38 39 | LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@" LDFLAGS_RPATH="@LDFLAGS_RPATH@" LIBS="-L${libdir} -lobjfw @LIBS@" PLUGIN_CFLAGS="@PLUGIN_CFLAGS@" PLUGIN_LDFLAGS="@PLUGIN_LDFLAGS@" PLUGIN_SUFFIX="@PLUGIN_SUFFIX@" PROG_SUFFIX="@EXEEXT@" | | | 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | LDFLAGS_REEXPORT="@LDFLAGS_REEXPORT@" LDFLAGS_RPATH="@LDFLAGS_RPATH@" LIBS="-L${libdir} -lobjfw @LIBS@" PLUGIN_CFLAGS="@PLUGIN_CFLAGS@" PLUGIN_LDFLAGS="@PLUGIN_LDFLAGS@" PLUGIN_SUFFIX="@PLUGIN_SUFFIX@" PROG_SUFFIX="@EXEEXT@" VERSION="0.5.2" show_help() { cat <<__EOF__ objfw-config: Available arguments are: --all Outputs all flags + libs --cflags Outputs the required CFLAGS |
︙ | ︙ |