diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-16 06:06:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-10-16 06:06:50 +0000 |
| commit | 34c77c62d876eae153056388e21c73a29964c400 (patch) | |
| tree | 152491e491fe3e85b98696e2cce7737d5c031ed5 /usr.sbin/ntpd | |
| parent | 861a8179aab10b8d4a585f385b99ce455781c996 (diff) | |
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).
pointed out by mpf, discussed with pyr
Diffstat (limited to 'usr.sbin/ntpd')
| -rw-r--r-- | usr.sbin/ntpd/parse.y | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/ntpd/parse.y b/usr.sbin/ntpd/parse.y index f81341ebed0..79d33b5dc0d 100644 --- a/usr.sbin/ntpd/parse.y +++ b/usr.sbin/ntpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.37 2007/10/13 16:35:21 deraadt Exp $ */ +/* $OpenBSD: parse.y,v 1.38 2007/10/16 06:06:49 deraadt Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -454,8 +454,10 @@ yylex(void) } else if (c == '\\') { if ((next = lgetc(quotec)) == EOF) return (0); - if (next == quotec) + if (next == quotec || c == ' ' || c == '\t') c = next; + else if (next == '\n') + continue; else lungetc(next); } else if (c == quotec) { |