From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 18 Apr 2014 12:31:24 +0000 (+0200)
Subject: plugin: Name the plugin context after the actual module name.
X-Git-Tag: sysdb-0.1.0~122
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fdfe2a68ba1838cdb1c34d3275d129fb217fbd9d;p=sysdb.git

plugin: Name the plugin context after the actual module name.

That is, the name as specified by the user without '::' replaced by '/'.
The latter is only used for loading the shared object by file-name.
---

diff --git a/src/core/plugin.c b/src/core/plugin.c
index a521b89..45d3940 100644
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -396,7 +396,7 @@ plugin_add_callback(sdb_llist_t **list, const char *type,
 int
 sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 {
-	char  real_name[name ? strlen(name) + 1 : 1];
+	char  base_name[name ? strlen(name) + 1 : 1];
 	const char *name_ptr;
 	char *tmp;
 
@@ -411,17 +411,17 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 	if ((! name) || (! *name))
 		return -1;
 
-	real_name[0] = '\0';
+	base_name[0] = '\0';
 	name_ptr = name;
 
 	while ((tmp = strstr(name_ptr, "::"))) {
-		strncat(real_name, name_ptr, (size_t)(tmp - name_ptr));
-		strcat(real_name, "/");
+		strncat(base_name, name_ptr, (size_t)(tmp - name_ptr));
+		strcat(base_name, "/");
 		name_ptr = tmp + strlen("::");
 	}
-	strcat(real_name, name_ptr);
+	strcat(base_name, name_ptr);
 
-	ctx = CTX(sdb_llist_search_by_name(all_plugins, real_name));
+	ctx = CTX(sdb_llist_search_by_name(all_plugins, base_name));
 	if (ctx) {
 		/* plugin already loaded */
 		++ctx->use_cnt;
@@ -429,7 +429,7 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 	}
 
 	snprintf(filename, sizeof(filename), "%s/%s.so",
-			PKGLIBDIR, real_name);
+			PKGLIBDIR, base_name);
 	filename[sizeof(filename) - 1] = '\0';
 
 	if (access(filename, R_OK)) {
@@ -453,7 +453,7 @@ sdb_plugin_load(const char *name, const sdb_plugin_ctx_t *plugin_ctx)
 	if (ctx_get())
 		sdb_log(SDB_LOG_WARNING, "core: Discarding old plugin context");
 
-	ctx = ctx_create(real_name);
+	ctx = ctx_create(name);
 	if (! ctx) {
 		sdb_log(SDB_LOG_ERR, "core: Failed to initialize plugin context");
 		return -1;