summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/confbase.Y2
-rw-r--r--conf/gen_parser.m43
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y
index bf4ed33..bc8f535 100644
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -58,7 +58,7 @@ CF_GRAMMAR
/* Basic config file structure */
config: conf_entries END { return 0; }
- | CLI_MARKER cli_cmd END { return 0; }
+ | CLI_MARKER cli_cmd { return 0; }
;
conf_entries:
diff --git a/conf/gen_parser.m4 b/conf/gen_parser.m4
index d38df21..70f2c2e 100644
--- a/conf/gen_parser.m4
+++ b/conf/gen_parser.m4
@@ -42,7 +42,8 @@ m4_define(CF_ADDTO, `m4_define([[CF_rule_$1]],m4_ifdef([[CF_rule_$1]],CF_rule_$1
m4_define(CF_CLI, `m4_define([[CF_cmd]], cmd_[[]]m4_translit($1, [[ ]], _))DNL
m4_divert(2)CF_KEYWORDS(m4_translit($1, [[ ]], [[,]]))
m4_divert(3)CF_ADDTO(cli_cmd, CF_cmd)
-CF_cmd: $1 ')
+CF_cmd: $1 $2 END')
+m4_define(CF_CLI_HELP, `')
# ENUM declarations are ignored
m4_define(CF_ENUM, `')