diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2017-01-02 01:40:21 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2017-01-02 01:40:21 +0000 |
| commit | 0b9f84df0b042b838936f3f490befffc83bbb980 (patch) | |
| tree | 8ccf19f7dddb07e1072c8a99b521d2793b20aaf6 /usr.bin | |
| parent | f9292926b59460994c5b4e42d19b402afc6a9fbf (diff) | |
envlist and arglist are both string lists; simplify
ok benno
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/doas/parse.y | 41 |
1 files changed, 15 insertions, 26 deletions
diff --git a/usr.bin/doas/parse.y b/usr.bin/doas/parse.y index 5a096b21c43..fde406bcf5a 100644 --- a/usr.bin/doas/parse.y +++ b/usr.bin/doas/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.25 2016/12/29 19:12:42 tedu Exp $ */ +/* $OpenBSD: parse.y,v 1.26 2017/01/02 01:40:20 tedu Exp $ */ /* * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org> * @@ -36,6 +36,7 @@ typedef struct { const char **cmdargs; const char **envlist; }; + const char **strlist; const char *str; }; int lineno; @@ -141,21 +142,21 @@ option: TNOPASS { } | TKEEPENV { $$.options = KEEPENV; $$.envlist = NULL; - } | TSETENV '{' envlist '}' { + } | TSETENV '{' strlist '}' { $$.options = 0; - $$.envlist = $3.envlist; + $$.envlist = $3.strlist; } ; -envlist: /* empty */ { - if (!($$.envlist = calloc(1, sizeof(char *)))) - errx(1, "can't allocate envlist"); - } | envlist TSTRING { - int nenv = arraylen($1.envlist); - if (!($$.envlist = reallocarray($1.envlist, nenv + 2, +strlist: /* empty */ { + if (!($$.strlist = calloc(1, sizeof(char *)))) + errx(1, "can't allocate strlist"); + } | strlist TSTRING { + int nstr = arraylen($1.strlist); + if (!($$.strlist = reallocarray($1.strlist, nstr + 2, sizeof(char *)))) - errx(1, "can't allocate envlist"); - $$.envlist[nenv] = $2.str; - $$.envlist[nenv + 1] = NULL; + errx(1, "can't allocate strlist"); + $$.strlist[nstr] = $2.str; + $$.strlist[nstr + 1] = NULL; } ; @@ -179,20 +180,8 @@ cmd: /* optional */ { args: /* empty */ { $$.cmdargs = NULL; - } | TARGS argslist { - $$.cmdargs = $2.cmdargs; - } ; - -argslist: /* empty */ { - if (!($$.cmdargs = calloc(1, sizeof(char *)))) - errx(1, "can't allocate args"); - } | argslist TSTRING { - int nargs = arraylen($1.cmdargs); - if (!($$.cmdargs = reallocarray($1.cmdargs, nargs + 2, - sizeof(char *)))) - errx(1, "can't allocate args"); - $$.cmdargs[nargs] = $2.str; - $$.cmdargs[nargs + 1] = NULL; + } | TARGS strlist { + $$.cmdargs = $2.strlist; } ; %% |