From 268deed916cd217b39568809d520f9d4515abdac Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Fri, 9 Nov 2018 16:00:54 +0000
Subject: 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@
---
 parse.y | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'parse.y')

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++;
-- 
cgit 1.4.1