zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-24 02:52:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

add support for including config files within config files.

Browse source 
you can include another file by using a path relative to the primary
config location or an absolute path.

the syntax is:
	include "file";

this is meant to provide a reasonble work around for issue #6, so that
people can store and share their configuration file but exclude sensitive
information.
This commit is contained in:
Steven Jackson 2015-09-19 18:00:23 +01:00
commit a23ef4dc9c
6 changed files with 181 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/lib-config/parse.c
View file

@ -43,10 +43,16 @@ static unsigned int g_istr_hash(gconstpointer v)
return h /* % M */;
}
int config_error(CONFIG_REC *rec, const char *msg)
int config_error(CONFIG_REC *rec, const char *msg, ...)
{
va_list vl;
g_free_and_null(rec->last_error);
rec->last_error = g_strdup(msg);
va_start(vl, msg);
rec->last_error = g_strdup_vprintf(msg, vl);
va_end(vl);
return -1;
}
@ -133,6 +139,7 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node)
GTokenType last_char;
int print_warning;
char *key;
int key_is_include = FALSE;
g_return_val_if_fail(rec != NULL, G_TOKEN_ERROR);
g_return_val_if_fail(node != NULL, G_TOKEN_ERROR);
@ -147,12 +154,23 @@ static GTokenType config_parse_symbol(CONFIG_REC *rec, CONFIG_NODE *node)
(rec->scanner->token == G_TOKEN_STRING)) {
key = g_strdup(rec->scanner->value.v_string);
config_parse_warn_missing(rec, node, '=', TRUE);
if (g_ascii_strcasecmp(key, "include") == 0)
key_is_include = TRUE;
else
config_parse_warn_missing(rec, node, '=', TRUE);
config_parse_get_token(rec->scanner, node);
}
switch (rec->scanner->token) {
case G_TOKEN_STRING:
if (key_is_include) {
g_free_not_null(key);
config_node_set_include(rec, node, rec->scanner->value.v_string);
config_parse_warn_missing(rec, node, last_char, TRUE);
return G_TOKEN_NONE;
}
/* value */
config_node_set_str(rec, node, key, rec->scanner->value.v_string);
g_free_not_null(key);
@ -332,6 +350,8 @@ void config_close(CONFIG_REC *rec)
g_hash_table_destroy(rec->cache_nodes);
g_free_not_null(rec->last_error);
g_free_not_null(rec->fname);
if (rec->includes)
g_hash_table_destroy(rec->includes);
g_free(rec);
}