Parse CLI commands. We use the same parser as for configuration files (because

we want to allow filter and similar complex constructs to be used in commands
and we should avoid code duplication), only with CLI_MARKER token prepended
before the whole input.

Defined macro CF_CLI(cmd, args, help) for defining CLI commands in .Y files.
The first argument specifies the command itself, the remaining two arguments
are copied to the help file (er, will be copied after the help file starts
to exist). This macro automatically creates a skeleton rule for the command,
you only need to append arguments as in:

	CF_CLI(STEAL MONEY, <$>, [[Steal <$> US dollars or equivalent in any other currency]]): NUM {
		cli_msg(0, "%d$ stolen", $3);
	} ;

Also don't forget to reset lexer state between inputs.

1 files changed, 13 insertions, 4 deletions

diff --git a/conf/conf.c b/conf/conf.c
index d9bf9d8..47d4db4 100644
--- a/conf/conf.c
+++ b/conf/conf.c
@@ -39,15 +39,12 @@ config_alloc(byte *name)
 int
 config_parse(struct config *c)
 {
-  struct proto_config *p;
-
   debug("Parsing configuration file `%s'\n", c->file_name);
   new_config = c;
-  cfg_pool = c->pool;
   cfg_mem = c->mem;
   if (setjmp(conf_jmpbuf))
     return 0;
-  cf_lex_init(1);
+  cf_lex_init(0);
   cf_lex_init_tables();
   protos_preconfig(c);
   rt_preconfig(c);
@@ -61,6 +58,18 @@ config_parse(struct config *c)
   return 1;
 }
 
+int
+cli_parse(struct config *c)
+{
+  new_config = c;
+  cfg_mem = c->mem;
+  if (setjmp(conf_jmpbuf))
+    return 0;
+  cf_lex_init(1);
+  cf_parse();
+  return 1;
+}
+
 void
 config_free(struct config *c)
 {