-/* $OpenBSD$ */
+/* $OpenBSD: parse.y,v 1.8 2015/07/21 16:12:04 tedu Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
struct {
int action;
int options;
+ const char *cmd;
+ const char **cmdargs;
const char **envlist;
};
const char *str;
struct rule **rules;
int nrules, maxrules;
+void yyerror(const char *, ...);
+int yylex(void);
+int yyparse(void);
+
%}
-%token TPERMIT TDENY TAS TCMD
+%token TPERMIT TDENY TAS TCMD TARGS
%token TNOPASS TKEEPENV
%token TSTRING
rule: action ident target cmd {
struct rule *r;
r = calloc(1, sizeof(*r));
+ if (!r)
+ errx(1, "can't allocate rule");
r->action = $1.action;
r->options = $1.options;
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;
else
maxrules *= 2;
- if (!(rules = reallocarray(rules, maxrules, sizeof(*rules))))
+ if (!(rules = reallocarray(rules, maxrules,
+ sizeof(*rules))))
errx(1, "can't allocate rules");
}
rules[nrules++] = r;
errx(1, "can't allocate envlist");
} | envlist TSTRING {
int nenv = arraylen($1.envlist);
- if (!($$.envlist = reallocarray($1.envlist, nenv + 2, sizeof(char *))))
+ if (!($$.envlist = reallocarray($1.envlist, nenv + 2,
+ sizeof(char *))))
errx(1, "can't allocate envlist");
$$.envlist[nenv] = $2.str;
$$.envlist[nenv + 1] = NULL;
} ;
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;
} ;
%%
va_list va;
va_start(va, fmt);
- fprintf(stderr, "doas: ");
- vfprintf(stderr, fmt, va);
- fprintf(stderr, "\n");
- va_end(va);
- exit(1);
+ verrx(1, fmt, va);
}
struct keyword {
{ "permit", TPERMIT },
{ "as", TAS },
{ "cmd", TCMD },
+ { "args", TARGS },
{ "nopass", TNOPASS },
{ "keepenv", TKEEPENV },
};
int
yylex(void)
{
+ static int colno = 1, lineno = 1;
+
char buf[1024], *ebuf, *p, *str;
- int i, c;
+ int i, c, quotes = 0, escape = 0, qpos = 0, nonkw = 0;
p = buf;
ebuf = buf + sizeof(buf);
- while ((c = getc(yyfp)) == ' ' || c == '\t')
- ; /* skip spaces */
+
+repeat:
+ /* skip whitespace first */
+ for (c = getc(yyfp); c == ' ' || c == '\t'; c = getc(yyfp))
+ colno++;
+
+ /* check for special one-character constructions */
switch (c) {
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;
- case ':':
- *p++ = c;
- c = getc(yyfp);
+ }
+
+ /* 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;
- default:
+ 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':
+ if (!escape && !quotes)
+ goto eow;
break;
- }
- while (isalnum(c)) {
+ 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");
projects / opendoas.git / blobdiff