summaryrefslogtreecommitdiff
path: root/conf/conf.h
diff options
context:
space:
mode:
authorJan Maria Matejka <mq@ucw.cz>2018-09-11 16:55:41 +0200
committerJan Maria Matejka <mq@ucw.cz>2018-09-11 16:58:09 +0200
commitafa14f1868f2c753efdc81ce8e2c2d44e6bdd80e (patch)
tree68c418466255db01d1513ad341ccccf384981196 /conf/conf.h
parentb1f6c439f55233338a5f7cca5070c70618fe7f1d (diff)
Conf: Show the line:char position where the syntax error happens
Diffstat (limited to 'conf/conf.h')
-rw-r--r--conf/conf.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/conf/conf.h b/conf/conf.h
index bf74b76b..6d8ed5ca 100644
--- a/conf/conf.h
+++ b/conf/conf.h
@@ -48,6 +48,7 @@ struct config {
u32 watchdog_timeout; /* Watchdog timeout (in seconds, 0 = disabled) */
char *err_msg; /* Parser error message */
int err_lino; /* Line containing error */
+ int err_chno; /* Character where the parser stopped */
char *err_file_name; /* File name containing error */
char *file_name; /* Name of main configuration file */
int file_fd; /* File descriptor of main configuration file */
@@ -141,6 +142,8 @@ struct include_file_stack {
char *file_name; /* File name */
int fd; /* File descriptor */
int lino; /* Current line num */
+ int chno; /* Current char num (on current line) */
+ int toklen; /* Current token length */
int depth; /* Include depth, 0 = cannot include */
struct include_file_stack *prev; /* Previous record in stack */
@@ -149,7 +152,6 @@ struct include_file_stack {
extern struct include_file_stack *ifs;
-
int cf_lex(void);
void cf_lex_init(int is_cli, struct config *c);
void cf_lex_unwind(void);