Handle empty argv

[opendoas.git] / parse.y

diff --git a/parse.y b/parse.y
index 85e20cc81b9504686b1446f26ac19f313484e6a1..b5ba234db7e3f6f1f3abf1e90c1eaf74ddd2b53d 100644 (file)
--- a/parse.y
+++ b/parse.y
@@ -75,7 +75,7 @@ arraylen(const char **arr)
 %}
 
 %token TPERMIT TDENY TAS TCMD TARGS
-%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV
+%token TNOPASS TNOLOG TPERSIST TKEEPENV TSETENV TINSULT
 %token TSTRING
 
 %%
@@ -150,6 +150,9 @@ option:             TNOPASS {
                } | TKEEPENV {
                        $$.options = KEEPENV;
                        $$.envlist = NULL;
+               } | TINSULT {
+                       $$.options = INSULT;
+                       $$.envlist = NULL;
                } | TSETENV '{' strlist '}' {
                        $$.options = 0;
                        $$.envlist = $3.strlist;
@@ -221,6 +224,7 @@ static struct keyword {
        { "persist", TPERSIST },
        { "keepenv", TKEEPENV },
        { "setenv", TSETENV },
+       { "insult", TINSULT },
 };
 
 int
@@ -251,12 +255,12 @@ repeat:
                        /* skip comments; NUL is allowed; no continuation */
                        while ((c = getc(yyfp)) != '\n')
                                if (c == EOF)
-                                       return 0;
+                                       goto eof;
                        yylval.colno = 0;
                        yylval.lineno++;
                        return c;
                case EOF:
-                       return 0;
+                       goto eof;
        }
 
        /* parsing next word */
@@ -330,7 +334,7 @@ eow:
                 * the main loop.
                 */
                if (c == EOF)
-                       return 0;
+                       goto eof;
                else if (qpos == -1)    /* accept, e.g., empty args: cmd foo args "" */
                        goto repeat;
        }
@@ -344,4 +348,9 @@ eow:
                err(1, "%s", __func__);
        yylval.str = str;
        return TSTRING;
+
+eof:
+       if (ferror(yyfp))
+               yyerror("input error reading config");
+       return 0;
 }