opendoas

A portable version of the OpenBSD `doas` command
git clone https://pi.duncano.de/git/opendoas.git
Log | Files | Refs | README | LICENSE

commit fcb93413226deaed752dd37ea42c830c1f57054f
parent d8e4190f9c5dda202a406c1de21a8ac860f304d7
Author: Theo de Raadt <deraadt@openbsd.org>
Date:   Tue, 28 Jul 2015 21:36:03 +0000

wrap some exceedingly long lines

Diffstat:
doas.c | 5+++--
parse.y | 13++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/doas.c b/doas.c @@ -1,4 +1,4 @@ -/* $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> * @@ -143,7 +143,8 @@ permit(uid_t uid, gid_t *groups, int ngroups, struct rule **lastr, *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) diff --git a/parse.y b/parse.y @@ -1,4 +1,4 @@ -/* $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> * @@ -162,7 +162,8 @@ argslist: /* empty */ { 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; @@ -234,7 +235,8 @@ repeat: 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 '\\': @@ -291,8 +293,9 @@ eow: 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;