From 87fe084efc23e420de6be0523ec91e82d44fc093 Mon Sep 17 00:00:00 2001
From: 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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 99dddbb..ed8048a 100644
--- a/parse.y
+++ b/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++;
-- 
cgit v1.2.3-2-gb3c3