pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 15:26:37 +02:00
Code Activity

core: add arguments in function plugin_auto_load to load plugins only from custom path or lib dir

Browse Source
This commit is contained in:
Sébastien Helleu
2017-07-04 22:05:11 +02:00
parent f70c2e521e
commit b276d0621c
3 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-command.c
+4 -4
View File
@@ -4477,10 +4477,10 @@ COMMAND_CALLBACK(plugin)
{
plugin_argv = string_split (argv_eol[2], " ", 0, 0,
&plugin_argc);
plugin_auto_load (plugin_argc, plugin_argv);
plugin_auto_load (plugin_argc, plugin_argv, 1, 1);
}
else
plugin_auto_load (0, NULL);
plugin_auto_load (0, NULL, 1, 1);
return WEECHAT_RC_OK;
}
@@ -4514,7 +4514,7 @@ COMMAND_CALLBACK(plugin)
if (strcmp (argv[2], "*") == 0)
{
plugin_unload_all ();
plugin_auto_load (plugin_argc, plugin_argv);
plugin_auto_load (plugin_argc, plugin_argv, 1, 1);
}
else
{
@@ -4529,7 +4529,7 @@ COMMAND_CALLBACK(plugin)
else
{
plugin_unload_all ();
plugin_auto_load (0, NULL);
plugin_auto_load (0, NULL, 1, 1);
}
return WEECHAT_RC_OK;
}
src/plugins/plugin.c
+15 -10
View File
@@ -992,7 +992,8 @@ plugin_arraylist_cmp_cb (void *data,
*/
void
plugin_auto_load (int argc, char **argv)
plugin_auto_load (int argc, char **argv, int load_from_plugin_path,
int load_from_lib_dir)
{
char *dir_name, *plugin_path, *plugin_path2;
struct t_weechat_plugin *ptr_plugin;
@@ -1015,7 +1016,8 @@ plugin_auto_load (int argc, char **argv)
}
/* auto-load plugins in WeeChat home dir */
if (CONFIG_STRING(config_plugin_path)
if (load_from_plugin_path
&& CONFIG_STRING(config_plugin_path)
&& CONFIG_STRING(config_plugin_path)[0])
{
plugin_path = string_expand_home (CONFIG_STRING(config_plugin_path));
@@ -1035,14 +1037,17 @@ plugin_auto_load (int argc, char **argv)
}
/* auto-load plugins in WeeChat global lib dir */
length = strlen (WEECHAT_LIBDIR) + 16 + 1;
dir_name = malloc (length);
if (dir_name)
if (load_from_lib_dir)
{
snprintf (dir_name, length, "%s/plugins", WEECHAT_LIBDIR);
util_exec_on_files (dir_name, 1, 0,
&plugin_auto_load_file, &plugin_args);
free (dir_name);
length = strlen (WEECHAT_LIBDIR) + 16 + 1;
dir_name = malloc (length);
if (dir_name)
{
snprintf (dir_name, length, "%s/plugins", WEECHAT_LIBDIR);
util_exec_on_files (dir_name, 1, 0,
&plugin_auto_load_file, &plugin_args);
free (dir_name);
}
}
/* free autoload array */
@@ -1332,7 +1337,7 @@ plugin_init (int auto_load, int argc, char *argv[])
if (auto_load)
{
plugin_quiet = 1;
plugin_auto_load (argc, argv);
plugin_auto_load (argc, argv, 1, 1);
plugin_display_short_list ();
plugin_quiet = 0;
}
src/plugins/plugin.h
+2 -1
View File
@@ -39,7 +39,8 @@ extern const char *plugin_get_name (struct t_weechat_plugin *plugin);
extern struct t_weechat_plugin *plugin_load (const char *filename,
int init_plugin,
int argc, char **argv);
extern void plugin_auto_load (int argc, char **argv);
extern void plugin_auto_load (int argc, char **argv, int load_from_plugin_path,
int load_from_lib_dir);
extern void plugin_unload (struct t_weechat_plugin *plugin);
extern void plugin_unload_name (const char *name);
extern void plugin_unload_all ();