diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2018-11-09 16:00:55 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2018-11-09 16:00:55 +0000 |
| commit | 81a606963a477bb9bc971ae28fb72cda375a844b (patch) | |
| tree | 8db65e6388620385b009fd8d42254aa15c4d0559 /app | |
| parent | cf5f0b5eb4bb3fc42ef3e24fe72a8634bcac79d0 (diff) | |
merge from base, from sashan@:
> - odd condition/test in PF lexer
> (and other lexers too)
>
> This commit rectifies earlier change:
>
> in the lex... even inside quotes, a \ followed by space or tab should
> expand to space or tab, and a \ followed by newline should be ignored
> (as a line continuation). compatible with the needs of hoststated
> (which has the most strict quoted string requirements), and ifstated
> (where one commonly does line continuations in strings).
>
> OK deraadt@, OK millert@
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/parse.y | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/cwm/parse.y b/app/cwm/parse.y index 99dddbb50..ed8048ace 100644 --- a/app/cwm/parse.y +++ b/app/cwm/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.71 2018/02/19 19:29:42 anton Exp $ */ +/* $OpenBSD: parse.y,v 1.72 2018/11/09 16:00:54 okan Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -467,7 +467,8 @@ yylex(void) } else if (c == '\\') { if ((next = lgetc(quotec)) == EOF) return (0); - if (next == quotec || c == ' ' || c == '\t') + if (next == quotec || next == ' ' || + next == '\t') c = next; else if (next == '\n') { file->lineno++; |