-/* $OpenBSD: parse.y,v 1.8 2015/07/21 16:12:04 tedu Exp $ */
+/* $OpenBSD: parse.y,v 1.10 2015/07/24 06:36:42 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
%{
#include <sys/types.h>
#include <ctype.h>
-#include <unistd.h>
-#include <stdint.h>
+#include <err.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
#include <string.h>
-#include <err.h>
+#include <unistd.h>
+
+#include "openbsd.h"
#include "doas.h"
const char **cmdargs;
const char **envlist;
};
+ const char **strlist;
const char *str;
};
+ int lineno;
+ int colno;
} yystype;
#define YYSTYPE yystype
FILE *yyfp;
struct rule **rules;
-int nrules, maxrules;
+int nrules;
+static int maxrules;
+
+int parse_errors = 0;
+
+static void yyerror(const char *, ...);
+static int yylex(void);
+
+static size_t
+arraylen(const char **arr)
+{
+ size_t cnt = 0;
-void yyerror(const char *, ...);
-int yylex(void);
-int yyparse(void);
+ while (*arr) {
+ cnt++;
+ arr++;
+ }
+ return cnt;
+}
%}
%token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TKEEPENV
+%token TNOPASS TPERSIST TKEEPENV TSETENV
%token TSTRING
%%
grammar: /* empty */
| grammar '\n'
| grammar rule '\n'
+ | error '\n'
;
rule: action ident target cmd {
$$.envlist = $2.envlist;
} | TDENY {
$$.action = DENY;
+ $$.options = 0;
+ $$.envlist = NULL;
} ;
-options: /* none */
- | options option {
+options: /* none */ {
+ $$.options = 0;
+ $$.envlist = NULL;
+ } | 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)
- errx(1, "can't have two keepenv sections");
- else
+ if ($$.envlist) {
+ yyerror("can't have two setenv sections");
+ YYERROR;
+ } else
$$.envlist = $2.envlist;
}
} ;
option: TNOPASS {
$$.options = NOPASS;
+ $$.envlist = NULL;
+ } | TPERSIST {
+ $$.options = PERSIST;
+ $$.envlist = NULL;
} | TKEEPENV {
$$.options = KEEPENV;
- } | TKEEPENV '{' envlist '}' {
- $$.options = KEEPENV;
- $$.envlist = $3.envlist;
+ $$.envlist = NULL;
+ } | TSETENV '{' strlist '}' {
+ $$.options = 0;
+ $$.envlist = $3.strlist;
} ;
-envlist: /* empty */ {
- if (!($$.envlist = calloc(1, sizeof(char *))))
- errx(1, "can't allocate envlist");
- } | 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 {
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;
+ } | TARGS strlist {
+ $$.cmdargs = $2.strlist;
} ;
%%
{
va_list va;
+ fprintf(stderr, "doas: ");
va_start(va, fmt);
- verrx(1, fmt, va);
+ vfprintf(stderr, fmt, va);
+ va_end(va);
+ fprintf(stderr, " at line %d\n", yylval.lineno + 1);
+ parse_errors++;
}
-struct keyword {
+static struct keyword {
const char *word;
int token;
} keywords[] = {
{ "cmd", TCMD },
{ "args", TARGS },
{ "nopass", TNOPASS },
+ { "persist", TPERSIST },
{ "keepenv", TKEEPENV },
+ { "setenv", TSETENV },
};
int
yylex(void)
{
- static int colno = 1, lineno = 1;
-
char buf[1024], *ebuf, *p, *str;
- int i, c, quotes = 0, escape = 0, qpos = 0, nonkw = 0;
+ int c, quotes = 0, escape = 0, qpos = -1, nonkw = 0;
p = buf;
ebuf = buf + sizeof(buf);
repeat:
/* skip whitespace first */
for (c = getc(yyfp); c == ' ' || c == '\t'; c = getc(yyfp))
- colno++;
+ yylval.colno++;
/* check for special one-character constructions */
switch (c) {
case '\n':
- colno = 1;
- lineno++;
+ yylval.colno = 0;
+ yylval.lineno++;
/* FALLTHROUGH */
case '{':
case '}':
while ((c = getc(yyfp)) != '\n')
if (c == EOF)
return 0;
- colno = 1;
- lineno++;
+ yylval.colno = 0;
+ yylval.lineno++;
return c;
case EOF:
return 0;
}
/* parsing next word */
- for (;; c = getc(yyfp), colno++) {
+ for (;; c = getc(yyfp), yylval.colno++) {
switch (c) {
case '\0':
- yyerror("unallowed character NUL at "
- "line %d, column %d", lineno, colno);
+ yyerror("unallowed character NUL in column %d",
+ yylval.colno + 1);
escape = 0;
continue;
case '\\':
break;
case '\n':
if (quotes)
- yyerror("unterminated quotes at line %d, column %d",
- lineno, qpos);
+ yyerror("unterminated quotes in column %d",
+ qpos + 1);
if (escape) {
nonkw = 1;
escape = 0;
goto eow;
case EOF:
if (escape)
- yyerror("unterminated escape at line %d, column %d",
- lineno, colno - 1);
+ yyerror("unterminated escape in column %d",
+ yylval.colno);
if (quotes)
- yyerror("unterminated quotes at line %d, column %d",
- lineno, qpos);
+ yyerror("unterminated quotes in column %d",
+ qpos + 1);
+ goto eow;
/* FALLTHROUGH */
case '{':
case '}':
quotes = !quotes;
if (quotes) {
nonkw = 1;
- qpos = colno;
+ qpos = yylval.colno;
}
continue;
}
}
*p++ = c;
if (p == ebuf)
- yyerror("too long line %d", lineno);
+ yyerror("too long line");
escape = 0;
}
ungetc(c, yyfp);
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.
+ * 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 "" */
+ 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;
}
projects / opendoas.git / blobdiff