X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.c;h=24b269865da47cd74a1ea631b3ecd1c8c5eabb5f;hb=f9d51dc8fabe44f3cd17499713d63b518f0e1853;hp=5d882e64de7e69f47b47c53eeb7e63e4adea1045;hpb=4374305bd9523620d4291c9be5bfd81640f789a7;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 5d882e64..24b26986 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -270,7 +270,7 @@ static int plugin_unregister (llist_t *list, const char *name) /* {{{ */
  * object, but it will bitch about a shared object not having a
  * ``module_register'' symbol..
  */
-static int plugin_load_file (char *file)
+static int plugin_load_file (char *file, uint32_t flags)
 {
 	lt_dlhandle dlh;
 	void (*reg_handle) (void);
@@ -280,7 +280,24 @@ static int plugin_load_file (char *file)
 	lt_dlinit ();
 	lt_dlerror (); /* clear errors */
 
-	if ((dlh = lt_dlopen (file)) == NULL)
+#if LIBTOOL_VERSION == 2
+	if (flags & PLUGIN_FLAGS_GLOBAL) {
+		lt_dladvise advise;
+		lt_dladvise_init(&advise);
+		lt_dladvise_global(&advise);
+		dlh = lt_dlopenadvise(file, advise);
+		lt_dladvise_destroy(&advise);
+	} else {
+        	dlh = lt_dlopen (file);
+	}
+#else /* if LIBTOOL_VERSION == 1 */
+	if (flags & PLUGIN_FLAGS_GLOBAL)
+		ERROR ("plugin_load_file: The global flag is not supported, "
+				"libtool 2 is required for this.");
+	dlh = lt_dlopen (file);
+#endif
+
+	if (dlh == NULL)
 	{
 		const char *error = lt_dlerror ();
 
@@ -535,7 +552,7 @@ void plugin_set_dir (const char *dir)
 }
 
 #define BUFSIZE 512
-int plugin_load (const char *type)
+int plugin_load (const char *type, uint32_t flags)
 {
 	DIR  *dh;
 	const char *dir;
@@ -597,7 +614,7 @@ int plugin_load (const char *type)
 			continue;
 		}
 
-		if (plugin_load_file (filename) == 0)
+		if (plugin_load_file (filename, flags) == 0)
 		{
 			/* success */
 			ret = 0;
@@ -1444,7 +1461,12 @@ void plugin_log (int level, const char *format, ...)
 	llentry_t *le;
 
 	if (list_log == NULL)
+	{
+		va_start (ap, format);
+		vfprintf (stderr, format, ap);
+		va_end (ap);
 		return;
+	}
 
 #if !COLLECT_DEBUG
 	if (level >= LOG_DEBUG)