diff options
| author | Ondrej Filip <feela@network.cz> | 2011-09-11 21:21:47 +0200 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2011-09-11 21:21:47 +0200 |
| commit | 48ec367aabaaa5328f4072d237001e245a7363df (patch) | |
| tree | 9a65d5e1b051ff6aa24cd036ff1930bcb370fb8b /conf/conf.c | |
| parent | a98995273bd8788cf525f44479026d5ce6b7dd52 (diff) | |
Configuration can include other files.
Diffstat (limited to 'conf/conf.c')
| -rw-r--r-- | conf/conf.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/conf/conf.c b/conf/conf.c index 604a412c..5bdeece2 100644 --- a/conf/conf.c +++ b/conf/conf.c @@ -108,7 +108,7 @@ config_parse(struct config *c) cfg_mem = c->mem; if (setjmp(conf_jmpbuf)) return 0; - cf_lex_init(0); + cf_lex_init(0, c); sysdep_preconfig(c); protos_preconfig(c); rt_preconfig(c); @@ -138,7 +138,7 @@ cli_parse(struct config *c) cfg_mem = c->mem; if (setjmp(conf_jmpbuf)) return 0; - cf_lex_init(1); + cf_lex_init(1, c); cf_parse(); return 1; } @@ -355,7 +355,8 @@ cf_error(char *msg, ...) if (bvsnprintf(buf, sizeof(buf), msg, args) < 0) strcpy(buf, "<bug: error message too long>"); new_config->err_msg = cfg_strdup(buf); - new_config->err_lino = conf_lino; + new_config->err_lino = ifs->conf_lino; + new_config->err_file_name = ifs->conf_fname; longjmp(conf_jmpbuf, 1); } |