diff options
| author |   benno <benno@openbsd.org> | 2015-07-19 22:11:41 +0000 |
|---|---|---|
| committer | benno <benno@openbsd.org> | 2015-07-19 22:11:41 +0000 |
| commit | c79a7a63aab763b74f46bf50f1838805b974e311 (patch) | |
| tree | e15b02e5f6b3ba2d711471cb2d94729daeb9a317 | |
| parent | In the config file allow line continuations with backslashes. (diff) | |
| download | wireguard-openbsd-c79a7a63aab763b74f46bf50f1838805b974e311.tar.xz wireguard-openbsd-c79a7a63aab763b74f46bf50f1838805b974e311.zip | |
wrap long lines and kill some whitespace
| -rw-r--r-- | usr.bin/doas/parse.y | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/doas/parse.y b/usr.bin/doas/parse.y index f9e56f4c43d..9c463cf1256 100644 --- a/usr.bin/doas/parse.y +++ b/usr.bin/doas/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.5 2015/07/19 22:09:08 benno Exp $ */ +/* $OpenBSD: parse.y,v 1.6 2015/07/19 22:11:41 benno Exp $ */ /* * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org> * @@ -77,7 +77,8 @@ rule: action ident target cmd { 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; @@ -116,7 +117,8 @@ envlist: /* empty */ { 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; @@ -180,7 +182,7 @@ repeat: next = getc(yyfp); if (next == '\n') goto repeat; - else + else c = next; case '\n': case '{': |