Commit 02297d3c authored by Jan Maria Matejka's avatar Jan Maria Matejka
Browse files

CLI: Dropped the lexer hack.

parent f93315c4
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ else: {

<CLI>(.|\n) {
  BEGIN(INITIAL);
  yyless(0);
  return CLI_MARKER;
}

+0 −13
Original line number Diff line number Diff line
@@ -244,7 +244,6 @@ struct cli_conf_order {
  struct cli *cli;
  const char *pos;
  uint len;
  int lexer_hack;
};

static int
@@ -252,17 +251,6 @@ cli_cmd_read_hook(struct conf_order *co, byte *buf, uint max)
{
  struct cli_conf_order *cco = (struct cli_conf_order *) co;

  if (cco->lexer_hack)
    {
      /* Lexer needs at least one character to be read
       * to transition between states. Feeding a dummy
       * character which is dropped to make Flex produce
       * a dummy "CLIENT" token */
      cco->lexer_hack = 0;
      buf[0] = '"';
      return 1;
    }

  if (max > cco->len)
    max = cco->len;

@@ -298,7 +286,6 @@ cli_command(struct cli *c)
      .lp = c->parser_pool,
      .pool = c->pool,
    },
    .lexer_hack = 1,
    .pos = c->rx_buf,
    .len = strlen(c->rx_buf),
    .cli = c,