diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2008-10-17 13:02:56 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2008-10-17 13:02:56 +0000 |
| commit | 45f296784ba92c17537efc10eda48d303d944131 (patch) | |
| tree | 6387292e494fa63e396905211071022c7143d658 /usr.sbin/relayd/parse.y | |
| parent | b889f56217d8ef61344301ca2e47dcc23ef9af93 (diff) | |
bring in the findeol() fix from pfctl. list of affected parsers by sthen
Diffstat (limited to 'usr.sbin/relayd/parse.y')
| -rw-r--r-- | usr.sbin/relayd/parse.y | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index efaedc4eaf4..f73756e2ebc 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.125 2008/09/29 14:53:35 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.126 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -1618,11 +1618,13 @@ findeol(void) int c; parsebuf = NULL; - pushback_index = 0; /* skip to either EOF or the first real EOL */ while (1) { - c = lgetc(0); + if (pushback_index) + c = pushback_buffer[--pushback_index]; + else + c = lgetc(0); if (c == '\n') { file->lineno++; break; |