-/* $OpenBSD: doas.c,v 1.29 2015/07/28 14:08:52 zhuk Exp $ */
+/* $OpenBSD: doas.c,v 1.30 2015/07/28 19:49:04 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
*lastr = NULL;
for (i = 0; i < nrules; i++) {
- if (match(uid, groups, ngroups, target, cmd, cmdargs, rules[i]))
+ if (match(uid, groups, ngroups, target, cmd,
+ cmdargs, rules[i]))
*lastr = rules[i];
}
if (!*lastr)
-/* $OpenBSD: parse.y,v 1.9 2015/07/22 20:15:24 zhuk Exp $ */
+/* $OpenBSD: parse.y,v 1.10 2015/07/24 06:36:42 zhuk Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
errx(1, "can't allocate args");
} | argslist TSTRING {
int nargs = arraylen($1.cmdargs);
- if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2, sizeof(char *))))
+ if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2,
+ sizeof(char *))))
errx(1, "can't allocate args");
$$.cmdargs[nargs] = $2.str;
$$.cmdargs[nargs + 1] = NULL;
for (;; c = getc(yyfp), yylval.colno++) {
switch (c) {
case '\0':
- yyerror("unallowed character NUL in column %d", yylval.colno + 1);
+ yyerror("unallowed character NUL in column %d",
+ yylval.colno + 1);
escape = 0;
continue;
case '\\':
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;