tweak previous;

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index f1e90ab9039fc555fd05e4a0acf6890d922888fd..bd7d7e61713008fa0b8ad604aeb2b02fbb2ebf72 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.5 2015/07/19 22:09:08 benno Exp $ */
+/* $OpenBSD: parse.y,v 1.8 2015/07/21 16:12:04 tedu Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -32,6 +32,8 @@ typedef struct {
                struct {
                        int action;
                        int options;
+                       const char *cmd;
+                       const char **cmdargs;
                        const char **envlist;
                };
                const char *str;
@@ -50,7 +52,7 @@ int yyparse(void);
 
 %}
 
-%token TPERMIT TDENY TAS TCMD
+%token TPERMIT TDENY TAS TCMD TARGS
 %token TNOPASS TKEEPENV
 %token TSTRING
 
@@ -71,7 +73,8 @@ rule:         action ident target cmd {
                        r->envlist = $1.envlist;
                        r->ident = $2.str;
                        r->target = $3.str;
-                       r->cmd = $4.str;
+                       r->cmd = $4.cmd;
+                       r->cmdargs = $4.cmdargs;
                        if (nrules == maxrules) {
                                if (maxrules == 0)
                                        maxrules = 63;
@@ -136,9 +139,28 @@ target:            /* optional */ {
                } ;
 
 cmd:           /* optional */ {
-                       $$.str = NULL;
-               } | TCMD TSTRING {
-                       $$.str = $2.str;
+                       $$.cmd = NULL;
+                       $$.cmdargs = NULL;
+               } | TCMD TSTRING args {
+                       $$.cmd = $2.str;
+                       $$.cmdargs = $3.cmdargs;
+               } ;
+
+args:          /* empty */ {
+                       $$.cmdargs = NULL;
+               } | TARGS argslist {
+                       $$.cmdargs = $2.cmdargs;
+               } ;
+
+argslist:      /* empty */ {
+                       if (!($$.cmdargs = calloc(1, sizeof(char *))))
+                               errx(1, "can't allocate args");
+               } | argslist TSTRING {
+                       int nargs = arraylen($1.cmdargs);
+                       if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2, sizeof(char *))))
+                               errx(1, "can't allocate args");
+                       $$.cmdargs[nargs] = $2.str;
+                       $$.cmdargs[nargs + 1] = NULL;
                } ;
 
 %%
@@ -160,6 +182,7 @@ struct keyword {
        { "permit", TPERMIT },
        { "as", TAS },
        { "cmd", TCMD },
+       { "args", TARGS },
        { "nopass", TNOPASS },
        { "keepenv", TKEEPENV },
 };
@@ -167,59 +190,114 @@ struct keyword {
 int
 yylex(void)
 {
+       static int colno = 1, lineno = 1;
+
        char buf[1024], *ebuf, *p, *str;
-       int i, c, next;
+       int i, c, quotes = 0, escape = 0, qpos = 0, nonkw = 0;
 
        p = buf;
        ebuf = buf + sizeof(buf);
+
 repeat:
-       c = getc(yyfp);
+       /* skip whitespace first */
+       for (c = getc(yyfp); c == ' ' || c == '\t'; c = getc(yyfp))
+               colno++;
+
+       /* check for special one-character constructions */
        switch (c) {
-               case ' ':
-               case '\t':
-                       goto repeat; /* skip spaces */
-               case '\\':
-                       next = getc(yyfp);
-                       if (next == '\n')
-                               goto repeat;
-                       else
-                               c = next;
                case '\n':
+                       colno = 1;
+                       lineno++;
+                       /* FALLTHROUGH */
                case '{':
                case '}':
                        return c;
                case '#':
-                       while ((c = getc(yyfp)) != '\n' && c != EOF)
-                               ; /* skip comments */
-                       if (c == EOF)
-                               return 0;
+                       /* skip comments; NUL is allowed; no continuation */
+                       while ((c = getc(yyfp)) != '\n')
+                               if (c == EOF)
+                                       return 0;
+                       colno = 1;
+                       lineno++;
                        return c;
                case EOF:
                        return 0;
        }
-       while (1) {
+
+       /* parsing next word */
+       for (;; c = getc(yyfp), colno++) {
                switch (c) {
+               case '\0':
+                       yyerror("unallowed character NUL at "
+                           "line %d, column %d", lineno, colno);
+                       escape = 0;
+                       continue;
+               case '\\':
+                       escape = !escape;
+                       if (escape)
+                               continue;
+                       break;
                case '\n':
+                       if (quotes)
+                               yyerror("unterminated quotes at line %d, column %d",
+                                   lineno, qpos);
+                       if (escape) {
+                               nonkw = 1;
+                               escape = 0;
+                               continue;
+                       }
+                       goto eow;
+               case EOF:
+                       if (escape)
+                               yyerror("unterminated escape at line %d, column %d",
+                                   lineno, colno - 1);
+                       if (quotes)
+                               yyerror("unterminated quotes at line %d, column %d",
+                                   lineno, qpos);
+                       /* FALLTHROUGH */
                case '{':
                case '}':
                case '#':
                case ' ':
                case '\t':
-               case EOF:
-                       goto eow;
+                       if (!escape && !quotes)
+                               goto eow;
+                       break;
+               case '"':
+                       if (!escape) {
+                               quotes = !quotes;
+                               if (quotes) {
+                                       nonkw = 1;
+                                       qpos = colno;
+                               }
+                               continue;
+                       }
                }
                *p++ = c;
                if (p == ebuf)
-                       yyerror("too much stuff");
-               c = getc(yyfp);
+                       yyerror("too long line %d", lineno);
+               escape = 0;
        }
+
 eow:
        *p = 0;
        if (c != EOF)
                ungetc(c, yyfp);
-       for (i = 0; i < sizeof(keywords) / sizeof(keywords[0]); i++) {
-               if (strcmp(buf, keywords[i].word) == 0)
-                       return keywords[i].token;
+       if (p == buf) {
+               /*
+                * There could be a number of reasons for empty buffer, and we handle
+                * all of them here, to avoid cluttering the main loop.
+                */
+               if (c == EOF)
+                       return 0;
+               else if (!qpos)    /* accept, e.g., empty args: cmd foo args "" */
+                       goto repeat;
+       }
+       if (!nonkw) {
+               for (i = 0; i < sizeof(keywords) / sizeof(keywords[0]); i++) {
+                       if (strcmp(buf, keywords[i].word) == 0)
+                               return keywords[i].token;
+               }
        }
        if ((str = strdup(buf)) == NULL)
                err(1, "strdup");