pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-25 12:26:40 +02:00
Code Activity

script: fix removal of script in system directory while trying to install a script (closes #2019)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-09-22 22:51:44 +02:00
parent 12106ae7ba
commit d6e4e87faf
11 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/plugin-script.c
+21 -17
View File
@@ -537,7 +537,8 @@ plugin_script_search_by_full_name (struct t_plugin_script *scripts,
char *
plugin_script_search_path (struct t_weechat_plugin *weechat_plugin,
const char *filename)
const char *filename,
int search_system_dir)
{
char *final_name, *weechat_data_dir, *dir_system;
int length;
@@ -602,28 +603,31 @@ plugin_script_search_path (struct t_weechat_plugin *weechat_plugin,
free (weechat_data_dir);
}
/* try WeeChat system dir */
dir_system = weechat_info_get ("weechat_sharedir", "");
if (dir_system)
if (search_system_dir)
{
length = strlen (dir_system) + strlen (weechat_plugin->name) +
strlen (filename) + 16;
final_name = malloc (length);
if (final_name)
/* try WeeChat system dir */
dir_system = weechat_info_get ("weechat_sharedir", "");
if (dir_system)
{
snprintf (final_name,length,
"%s/%s/%s", dir_system, weechat_plugin->name, filename);
if ((stat (final_name, &st) == 0) && (st.st_size > 0))
length = strlen (dir_system) + strlen (weechat_plugin->name) +
strlen (filename) + 16;
final_name = malloc (length);
if (final_name)
{
free (dir_system);
return final_name;
snprintf (final_name,length,
"%s/%s/%s", dir_system, weechat_plugin->name, filename);
if ((stat (final_name, &st) == 0) && (st.st_size > 0))
{
free (dir_system);
return final_name;
}
free (final_name);
}
free (final_name);
free (dir_system);
}
free (dir_system);
}
return strdup (filename);
return NULL;
}
/*
@@ -1147,7 +1151,7 @@ plugin_script_remove_file (struct t_weechat_plugin *weechat_plugin,
i = 0;
while (i < 2)
{
path_script = plugin_script_search_path (weechat_plugin, name);
path_script = plugin_script_search_path (weechat_plugin, name, 0);
/*
* script not found? (if path_script == name, that means the function
* above did not find the script)