diff options
| author |   deraadt <deraadt@openbsd.org> | 2015-07-28 21:36:03 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2015-07-28 21:36:03 +0000 |
| commit | 22ac959bd0345b8741b963b8d1647a86afe9408f (patch) | |
| tree | 6e6b2f2e4a1e3c73a43ae273c0392f0bdc0250b4 | |
| parent | add missing space, from Donovan Watteau <tsoomi at gmail.com> (diff) | |
| download | wireguard-openbsd-22ac959bd0345b8741b963b8d1647a86afe9408f.tar.xz wireguard-openbsd-22ac959bd0345b8741b963b8d1647a86afe9408f.zip | |
wrap some exceedingly long lines
| -rw-r--r-- | usr.bin/doas/doas.c | 5 | ||||
| -rw-r--r-- | usr.bin/doas/parse.y | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c index e286bbb0e82..0f798ac38f3 100644 --- a/usr.bin/doas/doas.c +++ b/usr.bin/doas/doas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: doas.c,v 1.30 2015/07/28 19:49:04 zhuk Exp $ */ +/* $OpenBSD: doas.c,v 1.31 2015/07/28 21:36:03 deraadt 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/usr.bin/doas/parse.y b/usr.bin/doas/parse.y index 0003aec2865..240da5e9ce8 100644 --- a/usr.bin/doas/parse.y +++ b/usr.bin/doas/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.10 2015/07/24 06:36:42 zhuk Exp $ */ +/* $OpenBSD: parse.y,v 1.11 2015/07/28 21:36:03 deraadt 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; |