Handle empty argv

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index 8a333642200c0c0a5f094edae977d03f78019274..b5ba234db7e3f6f1f3abf1e90c1eaf74ddd2b53d 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -16,6 +16,8 @@
  */
 
 %{
+#include "config.h"
+
 #include <sys/types.h>
 #include <ctype.h>
 #include <err.h>
@@ -39,6 +41,7 @@ typedef struct {
                        const char **cmdargs;
                        const char **envlist;
                };
+               const char **strlist;
                const char *str;
        };
        int lineno;
@@ -49,18 +52,30 @@ typedef struct {
 FILE *yyfp;
 
 struct rule **rules;
-int nrules, maxrules;
+size_t nrules;
+static size_t maxrules;
+
 int parse_errors = 0;
-int obsolete_warned = 0;
 
-void yyerror(const char *, ...);
-int yylex(void);
-int yyparse(void);
+static void yyerror(const char *, ...);
+static int yylex(void);
+
+static size_t
+arraylen(const char **arr)
+{
+       size_t cnt = 0;
+
+       while (*arr) {
+               cnt++;
+               arr++;
+       }
+       return cnt;
+}
 
 %}
 
 %token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TPERSIST TKEEPENV TSETENV
+%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV TINSULT
 %token TSTRING
 
 %%
@@ -85,12 +100,12 @@ rule:              action ident target cmd {
                        r->cmdargs = $4.cmdargs;
                        if (nrules == maxrules) {
                                if (maxrules == 0)
-                                       maxrules = 63;
-                               else
-                                       maxrules *= 2;
-                               if (!(rules = reallocarray(rules, maxrules,
-                                   sizeof(*rules))))
+                                       maxrules = 32;
+                               rules = reallocarray(rules, maxrules,
+                                   2 * sizeof(*rules));
+                               if (!rules)
                                        errx(1, "can't allocate rules");
+                               maxrules *= 2;
                        }
                        rules[nrules++] = r;
                } ;
@@ -126,34 +141,34 @@ options:  /* none */ {
 option:                TNOPASS {
                        $$.options = NOPASS;
                        $$.envlist = NULL;
+               } | TNOLOG {
+                       $$.options = NOLOG;
+                       $$.envlist = NULL;
                } | TPERSIST {
                        $$.options = PERSIST;
                        $$.envlist = NULL;
                } | TKEEPENV {
                        $$.options = KEEPENV;
                        $$.envlist = NULL;
-               } | TKEEPENV '{' envlist '}' {
-                       $$.options = 0;
-                       if (!obsolete_warned) {
-                               warnx("keepenv with list is obsolete");
-                               obsolete_warned = 1;
-                       }
-                       $$.envlist = $3.envlist;
-               } | TSETENV '{' envlist '}' {
+               } | TINSULT {
+                       $$.options = INSULT;
+                       $$.envlist = NULL;
+               } | TSETENV '{' strlist '}' {
                        $$.options = 0;
-                       $$.envlist = $3.envlist;
+                       $$.envlist = $3.strlist;
                } ;
 
-envlist:       /* empty */ {
-                       $$.envlist = NULL;
-               } | envlist TSTRING {
-                       int nenv = arraylen($1.envlist);
-                       if (!($$.envlist = reallocarray($1.envlist, nenv + 2,
+strlist:       /* empty */ {
+                       if (!($$.strlist = calloc(1, sizeof(char *))))
+                               errx(1, "can't allocate strlist");
+               } | strlist TSTRING {
+                       int nstr = arraylen($1.strlist);
+                       if (!($$.strlist = reallocarray($1.strlist, nstr + 2,
                            sizeof(char *))))
-                               errx(1, "can't allocate envlist");
-                       $$.envlist[nenv] = $2.str;
-                       $$.envlist[nenv + 1] = NULL;
-               }
+                               errx(1, "can't allocate strlist");
+                       $$.strlist[nstr] = $2.str;
+                       $$.strlist[nstr + 1] = NULL;
+               } ;
 
 
 ident:         TSTRING {
@@ -176,19 +191,8 @@ cmd:               /* optional */ {
 
 args:          /* empty */ {
                        $$.cmdargs = NULL;
-               } | TARGS argslist {
-                       $$.cmdargs = $2.cmdargs;
-               } ;
-
-argslist:      /* empty */ {
-                       $$.cmdargs = NULL;
-               } | 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;
+               } | TARGS strlist {
+                       $$.cmdargs = $2.strlist;
                } ;
 
 %%
@@ -198,6 +202,7 @@ yyerror(const char *fmt, ...)
 {
        va_list va;
 
+       fprintf(stderr, "doas: ");
        va_start(va, fmt);
        vfprintf(stderr, fmt, va);
        va_end(va);
@@ -205,7 +210,7 @@ yyerror(const char *fmt, ...)
        parse_errors++;
 }
 
-struct keyword {
+static struct keyword {
        const char *word;
        int token;
 } keywords[] = {
@@ -215,9 +220,11 @@ struct keyword {
        { "cmd", TCMD },
        { "args", TARGS },
        { "nopass", TNOPASS },
+       { "nolog", TNOLOG },
        { "persist", TPERSIST },
        { "keepenv", TKEEPENV },
        { "setenv", TSETENV },
+       { "insult", TINSULT },
 };
 
 int
@@ -225,6 +232,7 @@ yylex(void)
 {
        char buf[1024], *ebuf, *p, *str;
        int c, quotes = 0, escape = 0, qpos = -1, nonkw = 0;
+       size_t i;
 
        p = buf;
        ebuf = buf + sizeof(buf);
@@ -247,12 +255,12 @@ repeat:
                        /* skip comments; NUL is allowed; no continuation */
                        while ((c = getc(yyfp)) != '\n')
                                if (c == EOF)
-                                       return 0;
+                                       goto eof;
                        yylval.colno = 0;
                        yylval.lineno++;
                        return c;
                case EOF:
-                       return 0;
+                       goto eof;
        }
 
        /* parsing next word */
@@ -275,6 +283,8 @@ repeat:
                        if (escape) {
                                nonkw = 1;
                                escape = 0;
+                               yylval.colno = 0;
+                               yylval.lineno++;
                                continue;
                        }
                        goto eow;
@@ -306,8 +316,10 @@ repeat:
                        }
                }
                *p++ = c;
-               if (p == ebuf)
+               if (p == ebuf) {
                        yyerror("too long line");
+                       p = buf;
+               }
                escape = 0;
        }
 
@@ -322,19 +334,23 @@ eow:
                 * the main loop.
                 */
                if (c == EOF)
-                       return 0;
+                       goto eof;
                else if (qpos == -1)    /* accept, e.g., empty args: cmd foo args "" */
                        goto repeat;
        }
        if (!nonkw) {
-               size_t i;
                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");
+               err(1, "%s", __func__);
        yylval.str = str;
        return TSTRING;
+
+eof:
+       if (ferror(yyfp))
+               yyerror("input error reading config");
+       return 0;
 }