X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=parse.y;h=e4a041a374164133761a77c8f3f1e27f09c7556a;hb=8cba47c99d1efa726801fac41c478f1712ab481a;hp=506eb686bf2fcffc284755185ac548a09db9113d;hpb=5e9d76849fdad47f59b11993ee8ca319bd11414d;p=opendoas.git

diff --git a/parse.y b/parse.y
index 506eb68..e4a041a 100644
--- a/parse.y
+++ b/parse.y
@@ -39,6 +39,7 @@ typedef struct {
 			const char **cmdargs;
 			const char **envlist;
 		};
+		const char **strlist;
 		const char *str;
 	};
 	int lineno;
@@ -49,18 +50,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 TKEEPENV TSETENV
+%token TNOPASS TPERSIST TKEEPENV TSETENV
 %token TSTRING
 
 %%
@@ -111,6 +124,10 @@ options:	/* none */ {
 		} | options option {
 			$$.options = $1.options | $2.options;
 			$$.envlist = $1.envlist;
+			if (($$.options & (NOPASS|PERSIST)) == (NOPASS|PERSIST)) {
+				yyerror("can't combine nopass and persist");
+				YYERROR;
+			}
 			if ($2.envlist) {
 				if ($$.envlist) {
 					yyerror("can't have two setenv sections");
@@ -122,31 +139,28 @@ options:	/* none */ {
 option:		TNOPASS {
 			$$.options = NOPASS;
 			$$.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 {
@@ -169,19 +183,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;
 		} ;
 
 %%
@@ -191,6 +194,7 @@ yyerror(const char *fmt, ...)
 {
 	va_list va;
 
+	fprintf(stderr, "doas: ");
 	va_start(va, fmt);
 	vfprintf(stderr, fmt, va);
 	va_end(va);
@@ -198,7 +202,7 @@ yyerror(const char *fmt, ...)
 	parse_errors++;
 }
 
-struct keyword {
+static struct keyword {
 	const char *word;
 	int token;
 } keywords[] = {
@@ -208,6 +212,7 @@ struct keyword {
 	{ "cmd", TCMD },
 	{ "args", TARGS },
 	{ "nopass", TNOPASS },
+	{ "persist", TPERSIST },
 	{ "keepenv", TKEEPENV },
 	{ "setenv", TSETENV },
 };
@@ -326,7 +331,7 @@ eow:
 		}
 	}
 	if ((str = strdup(buf)) == NULL)
-		err(1, "strdup");
+		err(1, "%s", __func__);
 	yylval.str = str;
 	return TSTRING;
 }