From 9fbe67f0dadff26fa269d59060ff3e54b840ac57 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 14 Sep 2016 03:33:56 +0200 Subject: [PATCH] tweaked parsing of hook parameters --- lib/cfg.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/cfg.c b/lib/cfg.c index 468902f27..33fe11ed6 100644 --- a/lib/cfg.c +++ b/lib/cfg.c @@ -340,16 +340,16 @@ int cfg_parse_hooklist(config_setting_t *cfg, struct list *list) { int cfg_parse_hook(config_setting_t *cfg, struct list *list) { struct hook *hook, *copy; - const char *name = config_setting_get_string(cfg); - if (!name) + char *name, *param; + const char *hookline = config_setting_get_string(cfg); + if (!hookline) cerror(cfg, "Invalid hook function"); - char *param = strchr(name, ':'); - if (param) { /* Split hook line */ - *param = '\0'; - param++; - } - + name = strtok((char *) hookline, ":"); + param = strtok(NULL, ""); + + debug(3, "Hook: %s => %s", name, param); + hook = list_lookup(&hooks, name); if (!hook) cerror(cfg, "Unknown hook function '%s'", name);