simplify makefile

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index 8a333642200c0c0a5f094edae977d03f78019274..f4309a3d0db0b61b95542b6e2dd03e4c20e787d3 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;
+int nrules;
+static int 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
 %token TSTRING
 
 %%
@@ -126,34 +141,31 @@ 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 '}' {
+               } | TSETENV '{' strlist '}' {
                        $$.options = 0;
-                       if (!obsolete_warned) {
-                               warnx("keepenv with list is obsolete");
-                               obsolete_warned = 1;
-                       }
-                       $$.envlist = $3.envlist;
-               } | TSETENV '{' envlist '}' {
-                       $$.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 +188,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 +199,7 @@ yyerror(const char *fmt, ...)
 {
        va_list va;
 
+       fprintf(stderr, "doas: ");
        va_start(va, fmt);
        vfprintf(stderr, fmt, va);
        va_end(va);
@@ -205,7 +207,7 @@ yyerror(const char *fmt, ...)
        parse_errors++;
 }
 
-struct keyword {
+static struct keyword {
        const char *word;
        int token;
 } keywords[] = {
@@ -215,6 +217,7 @@ struct keyword {
        { "cmd", TCMD },
        { "args", TARGS },
        { "nopass", TNOPASS },
+       { "nolog", TNOLOG },
        { "persist", TPERSIST },
        { "keepenv", TKEEPENV },
        { "setenv", TSETENV },
@@ -334,7 +337,7 @@ eow:
                }
        }
        if ((str = strdup(buf)) == NULL)
-               err(1, "strdup");
+               err(1, "%s", __func__);
        yylval.str = str;
        return TSTRING;
 }