diff options
author | okan <okan> | 2018-11-09 16:00:54 +0000 |
---|---|---|
committer | okan <okan> | 2018-11-09 16:00:54 +0000 |
commit | 268deed916cd217b39568809d520f9d4515abdac (patch) | |
tree | d4fd0cfdee422c715e43ffc5055fe4f4750842d2 | |
parent | a63b87e31561b68c0daad5ffaa0ff47cb84ab402 (diff) | |
download | cwm-268deed916cd217b39568809d520f9d4515abdac.tar.gz cwm-268deed916cd217b39568809d520f9d4515abdac.tar.xz cwm-268deed916cd217b39568809d520f9d4515abdac.zip |
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@
-rw-r--r-- | parse.y | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/parse.y b/parse.y index 0e4f791..04e7bd4 100644 --- a/parse.y +++ b/parse.y @@ -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++; |