diff options
| author | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2007-11-12 23:59:42 +0000 |
|---|---|---|
| committer | Marco Pfatschbacher <mpf@cvs.openbsd.org> | 2007-11-12 23:59:42 +0000 |
| commit | aa82c35307ac93f9f8516d4168a7cb0e7eaf56c4 (patch) | |
| tree | 4c64e3b6fb9c0de041ee36807ace3f83cca007f0 /usr.sbin/ospf6d/parse.y | |
| parent | eb8064cb59bbaeb4315946b2f188364a7061bd29 (diff) | |
Remove space/tab compression function from lgetc() and replace
it with a simple filter in the yylex() loop.
The compression in lgetc() didn't happen for quoted strings,
thus creating a regression when tabs were used in variables.
Some testing by todd@ and pyr@
OK deraadt@
Diffstat (limited to 'usr.sbin/ospf6d/parse.y')
| -rw-r--r-- | usr.sbin/ospf6d/parse.y | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y index c2ce0df8aa9..5235bf2821e 100644 --- a/usr.sbin/ospf6d/parse.y +++ b/usr.sbin/ospf6d/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.10 2007/10/20 13:26:50 pyr Exp $ */ +/* $OpenBSD: parse.y,v 1.11 2007/11/12 23:59:41 mpf Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -612,14 +612,6 @@ lgetc(int quotec) yylval.lineno = file->lineno; file->lineno++; } - if (c == '\t' || c == ' ') { - /* Compress blanks to a single space. */ - do { - c = getc(file->stream); - } while (c == '\t' || c == ' '); - ungetc(c, file->stream); - c = ' '; - } while (c == EOF) { if (popfile() == EOF) @@ -676,7 +668,7 @@ yylex(void) top: p = buf; - while ((c = lgetc(0)) == ' ') + while ((c = lgetc(0)) == ' ' || c == '\t') ; /* nothing */ yylval.lineno = file->lineno; |