diff options
| -rw-r--r-- | degesch.c | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -7999,10 +7999,12 @@ lua_plugin_add_config_schema (struct lua_plugin *plugin, self->ref_validate = LUA_REFNIL; struct config_schema *schema = &self->schema; - schema->name = xstrdup (name); - schema->comment = NULL; - schema->default_ = NULL; - schema->type = CONFIG_ITEM_NULL; + schema->name = xstrdup (name); + schema->comment = NULL; + schema->default_ = NULL; + schema->type = CONFIG_ITEM_NULL; + schema->on_change = lua_schema_item_on_change; + schema->validate = lua_schema_item_validate; // Try to update the defaults with values provided by the plugin int values = lua_absindex (L, -2); @@ -8602,7 +8604,7 @@ lua_plugin_load (struct app_context *ctx, const char *filename, luaL_openlibs (L); struct lua_plugin *plugin = xcalloc (1, sizeof *plugin); - plugin->super.name = NULL; + plugin->super.name = xstrdup (filename); plugin->super.vtable = &lua_plugin_vtable; plugin->ctx = ctx; plugin->L = L; @@ -8714,9 +8716,12 @@ plugin_load (struct app_context *ctx, const char *name) struct plugin *plugin = plugin_load_by_name (ctx, name, &e); if (plugin) { + // FIXME: this way the real name isn't available to the plugin on load + free (plugin->name); + plugin->name = xstrdup (name); + log_global_status (ctx, "Plugin \"#s\" loaded", name); LIST_PREPEND (ctx->plugins, plugin); - plugin->name = xstrdup (name); } else { |