ObjFW  Check-in [5aba968988]

Overview
Comment:OFPlugin: Allow path to be nil
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 5aba968988902279e78454d5df1b06f9995455da2fdc70421a61f003cc86e7e2
User & Date: js on 2024-10-27 11:38:29
Other Links: manifest | tags
Context
2024-10-27
13:47
OFDatagramSocket: Rework blocks-based API check-in: 61b5fb53bd user: js tags: trunk
11:38
OFPlugin: Allow path to be nil check-in: 5aba968988 user: js tags: trunk
2024-10-26
11:29
Make SCTP work on Solaris check-in: a65e33b00a user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/OFPlugin.h from [a5e07a8e30] to [fa7c934720].

︙
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

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








-
-
+
+



-
+





-
-
+
+



-
+








 * @return The plugin path
 */
+ (OFString *)pathForName: (OFString *)name;

/**
 * @brief Creates a new OFPlugin by loading the plugin with the specified path.
 *
 * @param path The path to the plugin file. The suffix is appended
 *	       automatically.
 * @param path The path to the plugin file. If `nil` is specified, the main
 *	       binary is returned as a plugin.
 * @return An new, autoreleased OFPlugin
 * @throw OFLoadPluginFailedException The plugin could not be loaded
 */
+ (instancetype)pluginWithPath: (OFString *)path;
+ (instancetype)pluginWithPath: (nullable OFString *)path;

/**
 * @brief Initializes an already allocated OFPlugin by loading the plugin with
 *	  the specified path.
 *
 * @param path The path to the plugin file. The suffix is appended
 *	       automatically.
 * @param path The path to the plugin file. If `nil` is specified, the main
 *	       binary is returned as a plugin.
 * @return An initialized OFPlugin
 * @throw OFLoadPluginFailedException The plugin could not be loaded
 */
- (instancetype)initWithPath: (OFString *)path;
- (instancetype)initWithPath: (nullable OFString *)path;

/**
 * @brief Returns the address for the specified symbol, or `nil` if not found.
 *
 * @param symbol The symbol to return the address for
 * @return The address for the specified symbol, or `nil` if not found
 */
︙

Modified src/OFPlugin.m from [2c713ca183] to [184da07088].

︙
70
71
72
73
74
75
76

77
78
79
80
81







82
83
84
85
86
87
88

70
71
72
73
74
75
76
77





78
79
80
81
82
83
84
85
86
87
88
89
90
91








+
-
-
-
-
-
+
+
+
+
+
+
+








	@try {
		void *pool = objc_autoreleasePoolPush();

#ifndef OF_WINDOWS
		_handle = dlopen(
		    [path cStringWithEncoding: [OFLocale encoding]], RTLD_LAZY);
#else
		if (path != nil) {
		if ([OFSystemInfo isWindowsNT])
			_handle = LoadLibraryW(path.UTF16String);
		else
			_handle = LoadLibraryA(
			    [path cStringWithEncoding: [OFLocale encoding]]);
			if ([OFSystemInfo isWindowsNT])
				_handle = LoadLibraryW(path.UTF16String);
			else
				_handle = LoadLibraryA([path
				    cStringWithEncoding: [OFLocale encoding]]);
		} else
			_handle = GetModuleHandle(NULL);
#endif

		if (_handle == NULL) {
#ifndef OF_WINDOWS
			OFString *error = [OFString
			    stringWithCString: dlerror()
				     encoding: [OFLocale encoding]];
︙