mirror of
https://github.com/weechat/weechat.git
synced 2026-07-03 08:13:14 +02:00
New config functions, almost entirely rewritten from scratch
This commit is contained in:
Sebastien Helleu
+104
-117
@@ -37,20 +37,9 @@
|
||||
#include "plugin-config.h"
|
||||
|
||||
|
||||
struct t_plugin_option *plugin_options = NULL;
|
||||
struct t_plugin_option *last_plugin_option = NULL;
|
||||
|
||||
char *plugin_config_sections[] =
|
||||
{ "plugin", NULL };
|
||||
|
||||
struct t_config_option *plugin_config_options[] =
|
||||
{ NULL, NULL };
|
||||
|
||||
t_config_func_read_option *plugin_config_read_functions[] =
|
||||
{ plugin_config_read_option, NULL };
|
||||
|
||||
t_config_func_write_options *plugin_config_write_functions[] =
|
||||
{ plugin_config_write_options, NULL };
|
||||
struct t_config_file *plugin_config = NULL;
|
||||
struct t_config_option *plugin_options = NULL;
|
||||
struct t_config_option *last_plugin_option = NULL;
|
||||
|
||||
|
||||
/*
|
||||
@@ -58,17 +47,17 @@ t_config_func_write_options *plugin_config_write_functions[] =
|
||||
* This function should not be called directly.
|
||||
*/
|
||||
|
||||
struct t_plugin_option *
|
||||
plugin_config_search_internal (char *option)
|
||||
struct t_config_option *
|
||||
plugin_config_search_internal (char *option_name)
|
||||
{
|
||||
struct t_plugin_option *ptr_plugin_option;
|
||||
struct t_config_option *ptr_option;
|
||||
|
||||
for (ptr_plugin_option = plugin_options; ptr_plugin_option;
|
||||
ptr_plugin_option = ptr_plugin_option->next_option)
|
||||
for (ptr_option = plugin_options; ptr_option;
|
||||
ptr_option = ptr_option->next_option)
|
||||
{
|
||||
if (string_strcasecmp (ptr_plugin_option->name, option) == 0)
|
||||
if (string_strcasecmp (ptr_option->name, option_name) == 0)
|
||||
{
|
||||
return ptr_plugin_option;
|
||||
return ptr_option;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,36 +69,36 @@ plugin_config_search_internal (char *option)
|
||||
* plugin_config_search: search a plugin option
|
||||
*/
|
||||
|
||||
struct t_plugin_option *
|
||||
plugin_config_search (char *plugin_name, char *option)
|
||||
struct t_config_option *
|
||||
plugin_config_search (char *plugin_name, char *option_name)
|
||||
{
|
||||
char *internal_option;
|
||||
struct t_plugin_option *ptr_plugin_option;
|
||||
struct t_config_option *ptr_option;
|
||||
|
||||
internal_option = (char *)malloc (strlen (plugin_name) +
|
||||
strlen (option) + 2);
|
||||
strlen (option_name) + 2);
|
||||
if (!internal_option)
|
||||
return NULL;
|
||||
|
||||
strcpy (internal_option, plugin_name);
|
||||
strcat (internal_option, ".");
|
||||
strcat (internal_option, option);
|
||||
strcat (internal_option, option_name);
|
||||
|
||||
ptr_plugin_option = plugin_config_search_internal (internal_option);
|
||||
ptr_option = plugin_config_search_internal (internal_option);
|
||||
|
||||
free (internal_option);
|
||||
|
||||
return ptr_plugin_option;
|
||||
return ptr_option;
|
||||
}
|
||||
|
||||
/*
|
||||
* plugin_config_find_pos: find position for a plugin option (for sorting options)
|
||||
*/
|
||||
|
||||
struct t_plugin_option *
|
||||
struct t_config_option *
|
||||
plugin_config_find_pos (char *name)
|
||||
{
|
||||
struct t_plugin_option *ptr_option;
|
||||
struct t_config_option *ptr_option;
|
||||
|
||||
for (ptr_option = plugin_options; ptr_option;
|
||||
ptr_option = ptr_option->next_option)
|
||||
@@ -117,6 +106,8 @@ plugin_config_find_pos (char *name)
|
||||
if (string_strcasecmp (name, ptr_option->name) < 0)
|
||||
return ptr_option;
|
||||
}
|
||||
|
||||
/* position not found (we will add to the end of list) */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -129,33 +120,33 @@ plugin_config_find_pos (char *name)
|
||||
int
|
||||
plugin_config_set_internal (char *option, char *value)
|
||||
{
|
||||
struct t_plugin_option *ptr_plugin_option, *pos_option;
|
||||
struct t_config_option *ptr_option, *pos_option;
|
||||
int rc;
|
||||
|
||||
rc = 0;
|
||||
|
||||
ptr_plugin_option = plugin_config_search_internal (option);
|
||||
if (ptr_plugin_option)
|
||||
ptr_option = plugin_config_search_internal (option);
|
||||
if (ptr_option)
|
||||
{
|
||||
if (!value || !value[0])
|
||||
{
|
||||
/* remove option from list */
|
||||
if (ptr_plugin_option->prev_option)
|
||||
(ptr_plugin_option->prev_option)->next_option =
|
||||
ptr_plugin_option->next_option;
|
||||
if (ptr_option->prev_option)
|
||||
(ptr_option->prev_option)->next_option =
|
||||
ptr_option->next_option;
|
||||
else
|
||||
plugin_options = ptr_plugin_option->next_option;
|
||||
if (ptr_plugin_option->next_option)
|
||||
(ptr_plugin_option->next_option)->prev_option =
|
||||
ptr_plugin_option->prev_option;
|
||||
plugin_options = ptr_option->next_option;
|
||||
if (ptr_option->next_option)
|
||||
(ptr_option->next_option)->prev_option =
|
||||
ptr_option->prev_option;
|
||||
rc = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* replace old value by new one */
|
||||
if (ptr_plugin_option->value)
|
||||
free (ptr_plugin_option->value);
|
||||
ptr_plugin_option->value = strdup (value);
|
||||
if (ptr_option->value)
|
||||
free (ptr_option->value);
|
||||
ptr_option->value = strdup (value);
|
||||
rc = 1;
|
||||
}
|
||||
}
|
||||
@@ -163,43 +154,50 @@ plugin_config_set_internal (char *option, char *value)
|
||||
{
|
||||
if (value && value[0])
|
||||
{
|
||||
ptr_plugin_option = (struct t_plugin_option *)malloc (sizeof (struct t_plugin_option));
|
||||
if (ptr_plugin_option)
|
||||
ptr_option = (struct t_config_option *)malloc (sizeof (struct t_config_option));
|
||||
if (ptr_option)
|
||||
{
|
||||
/* create new option */
|
||||
ptr_plugin_option->name = strdup (option);
|
||||
string_tolower (ptr_plugin_option->name);
|
||||
ptr_plugin_option->value = strdup (value);
|
||||
ptr_option->name = strdup (option);
|
||||
string_tolower (ptr_option->name);
|
||||
ptr_option->type = CONFIG_OPTION_STRING;
|
||||
ptr_option->description = NULL;
|
||||
ptr_option->string_values = NULL;
|
||||
ptr_option->min = 0;
|
||||
ptr_option->max = 0;
|
||||
ptr_option->default_value = NULL;
|
||||
ptr_option->value = strdup (value);
|
||||
ptr_option->callback_change = NULL;
|
||||
|
||||
if (plugin_options)
|
||||
{
|
||||
pos_option = plugin_config_find_pos (ptr_plugin_option->name);
|
||||
pos_option = plugin_config_find_pos (ptr_option->name);
|
||||
if (pos_option)
|
||||
{
|
||||
/* insert option into the list (before option found) */
|
||||
ptr_plugin_option->prev_option = pos_option->prev_option;
|
||||
ptr_plugin_option->next_option = pos_option;
|
||||
ptr_option->prev_option = pos_option->prev_option;
|
||||
ptr_option->next_option = pos_option;
|
||||
if (pos_option->prev_option)
|
||||
pos_option->prev_option->next_option = ptr_plugin_option;
|
||||
pos_option->prev_option->next_option = ptr_option;
|
||||
else
|
||||
plugin_options = ptr_plugin_option;
|
||||
pos_option->prev_option = ptr_plugin_option;
|
||||
plugin_options = ptr_option;
|
||||
pos_option->prev_option = ptr_option;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* add option to the end */
|
||||
ptr_plugin_option->prev_option = last_plugin_option;
|
||||
ptr_plugin_option->next_option = NULL;
|
||||
last_plugin_option->next_option = ptr_plugin_option;
|
||||
last_plugin_option = ptr_plugin_option;
|
||||
ptr_option->prev_option = last_plugin_option;
|
||||
ptr_option->next_option = NULL;
|
||||
last_plugin_option->next_option = ptr_option;
|
||||
last_plugin_option = ptr_option;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
ptr_plugin_option->prev_option = NULL;
|
||||
ptr_plugin_option->next_option = NULL;
|
||||
plugin_options = ptr_plugin_option;
|
||||
last_plugin_option = ptr_plugin_option;
|
||||
ptr_option->prev_option = NULL;
|
||||
ptr_option->next_option = NULL;
|
||||
plugin_options = ptr_option;
|
||||
last_plugin_option = ptr_option;
|
||||
}
|
||||
rc = 1;
|
||||
}
|
||||
@@ -220,19 +218,19 @@ plugin_config_set_internal (char *option, char *value)
|
||||
*/
|
||||
|
||||
int
|
||||
plugin_config_set (char *plugin_name, char *option, char *value)
|
||||
plugin_config_set (char *plugin_name, char *option_name, char *value)
|
||||
{
|
||||
char *internal_option;
|
||||
int return_code;
|
||||
|
||||
internal_option = (char *)malloc (strlen (plugin_name) +
|
||||
strlen (option) + 2);
|
||||
strlen (option_name) + 2);
|
||||
if (!internal_option)
|
||||
return 0;
|
||||
|
||||
strcpy (internal_option, plugin_name);
|
||||
strcat (internal_option, ".");
|
||||
strcat (internal_option, option);
|
||||
strcat (internal_option, option_name);
|
||||
|
||||
return_code = plugin_config_set_internal (internal_option, value);
|
||||
free (internal_option);
|
||||
@@ -247,76 +245,67 @@ plugin_config_set (char *plugin_name, char *option, char *value)
|
||||
* -2 = bad format/value
|
||||
*/
|
||||
|
||||
int
|
||||
plugin_config_read_option (struct t_config_option *options,
|
||||
void
|
||||
plugin_config_read_option (struct t_config_file *config_file,
|
||||
char *option_name, char *value)
|
||||
{
|
||||
char *value2;
|
||||
|
||||
/* make C compiler happy */
|
||||
(void) options;
|
||||
(void) config_file;
|
||||
|
||||
if (option_name)
|
||||
{
|
||||
value2 = string_iconv_to_internal (NULL, value);
|
||||
plugin_config_set_internal (option_name,
|
||||
(value2) ? value2 : value);
|
||||
if (value2)
|
||||
free (value2);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* does nothing for new [plugin] section */
|
||||
}
|
||||
value2 = string_iconv_to_internal (NULL, value);
|
||||
plugin_config_set_internal (option_name,
|
||||
(value2) ? value2 : value);
|
||||
if (value2)
|
||||
free (value2);
|
||||
}
|
||||
|
||||
/*
|
||||
* plugin_config_write_options: write plugin options in configuration file
|
||||
*/
|
||||
|
||||
void
|
||||
plugin_config_write_options (struct t_config_file *config_file)
|
||||
{
|
||||
struct t_config_option *ptr_option;
|
||||
|
||||
/* all ok */
|
||||
return 0;
|
||||
}
|
||||
for (ptr_option = plugin_options; ptr_option;
|
||||
ptr_option = ptr_option->next_option)
|
||||
{
|
||||
config_file_write_line (config_file,
|
||||
ptr_option->name,
|
||||
ptr_option->value);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* plugin_config_read: read WeeChat plugins configuration file
|
||||
* return: 0 = successful
|
||||
* -1 = config file file not found
|
||||
* -2 = error in config file
|
||||
* -3 = not enough memory
|
||||
*/
|
||||
|
||||
int
|
||||
plugin_config_read ()
|
||||
{
|
||||
return config_file_read (plugin_config_sections, plugin_config_options,
|
||||
plugin_config_read_functions,
|
||||
plugin_config_read_option,
|
||||
NULL,
|
||||
WEECHAT_PLUGIN_CONFIG_NAME);
|
||||
}
|
||||
|
||||
/*
|
||||
* plugin_config_write_options: write plugin options in configuration file
|
||||
* Return: 0 = successful
|
||||
* -1 = write error
|
||||
*/
|
||||
|
||||
int
|
||||
plugin_config_write_options (FILE *file, char *section_name,
|
||||
struct t_config_option *options)
|
||||
{
|
||||
/* make C compiler happy */
|
||||
(void) options;
|
||||
|
||||
struct t_plugin_option *ptr_plugin_option;
|
||||
|
||||
string_iconv_fprintf (file, "\n[%s]\n", section_name);
|
||||
|
||||
for (ptr_plugin_option = plugin_options; ptr_plugin_option;
|
||||
ptr_plugin_option = ptr_plugin_option->next_option)
|
||||
if (!plugin_config)
|
||||
{
|
||||
string_iconv_fprintf (file, "%s = \"%s\"\n",
|
||||
ptr_plugin_option->name,
|
||||
ptr_plugin_option->value);
|
||||
plugin_config = config_file_new (PLUGIN_CONFIG_FILENAME);
|
||||
if (plugin_config)
|
||||
{
|
||||
config_file_new_section (plugin_config, "plugin",
|
||||
&plugin_config_read_option,
|
||||
&plugin_config_write_options,
|
||||
NULL);
|
||||
}
|
||||
}
|
||||
|
||||
/* all ok */
|
||||
return 0;
|
||||
if (!plugin_config)
|
||||
return -3;
|
||||
|
||||
return config_file_read (plugin_config);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -329,7 +318,5 @@ int
|
||||
plugin_config_write ()
|
||||
{
|
||||
log_printf (_("Saving plugins configuration to disk\n"));
|
||||
return config_file_write (plugin_config_sections, plugin_config_options,
|
||||
plugin_config_write_functions,
|
||||
WEECHAT_PLUGIN_CONFIG_NAME);
|
||||
return config_file_write (plugin_config, 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user