*/
%{
+#include "config.h"
+
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
FILE *yyfp;
struct rule **rules;
-int nrules;
-static int maxrules;
+size_t nrules;
+static size_t maxrules;
int parse_errors = 0;
%}
%token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TPERSIST TKEEPENV TSETENV
+%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV TINSULT
%token TSTRING
%%
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;
} ;
option: TNOPASS {
$$.options = NOPASS;
$$.envlist = NULL;
+ } | TNOLOG {
+ $$.options = NOLOG;
+ $$.envlist = NULL;
} | TPERSIST {
$$.options = PERSIST;
$$.envlist = NULL;
} | TKEEPENV {
$$.options = KEEPENV;
$$.envlist = NULL;
+ } | TINSULT {
+ $$.options = INSULT;
+ $$.envlist = NULL;
} | TSETENV '{' strlist '}' {
$$.options = 0;
$$.envlist = $3.strlist;
{ "cmd", TCMD },
{ "args", TARGS },
{ "nopass", TNOPASS },
+ { "nolog", TNOLOG },
{ "persist", TPERSIST },
{ "keepenv", TKEEPENV },
{ "setenv", TSETENV },
+ { "insult", TINSULT },
};
int
{
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);
/* 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 */
if (escape) {
nonkw = 1;
escape = 0;
+ yylval.colno = 0;
+ yylval.lineno++;
continue;
}
goto eow;
}
}
*p++ = c;
- if (p == ebuf)
+ if (p == ebuf) {
yyerror("too long line");
+ p = buf;
+ }
escape = 0;
}
* 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;
}