diff options
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bgpd/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/hostapd/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/ifstated/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/ospf6d/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/ospfd/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/ripd/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/snmpd/parse.y | 8 | ||||
| -rw-r--r-- | usr.sbin/ypldap/parse.y | 8 |
9 files changed, 45 insertions, 27 deletions
diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index fd19d66372b..58933529f37 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.217 2008/07/08 13:14:58 claudio Exp $ */ +/* $OpenBSD: parse.y,v 1.218 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1933,11 +1933,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; diff --git a/usr.sbin/hostapd/parse.y b/usr.sbin/hostapd/parse.y index 686f8f954d1..f20b2a56c80 100644 --- a/usr.sbin/hostapd/parse.y +++ b/usr.sbin/hostapd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.38 2008/02/27 15:36:42 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.39 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org> @@ -1400,11 +1400,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; diff --git a/usr.sbin/ifstated/parse.y b/usr.sbin/ifstated/parse.y index 3f208429dcf..c1408fc45d0 100644 --- a/usr.sbin/ifstated/parse.y +++ b/usr.sbin/ifstated/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.27 2008/03/10 07:40:01 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.28 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2004 Ryan McBride <mcbride@openbsd.org> @@ -480,11 +480,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; diff --git a/usr.sbin/ospf6d/parse.y b/usr.sbin/ospf6d/parse.y index 69163d8750a..2c14b916698 100644 --- a/usr.sbin/ospf6d/parse.y +++ b/usr.sbin/ospf6d/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.13 2008/02/26 10:09:58 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.14 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -638,11 +638,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; diff --git a/usr.sbin/ospfd/parse.y b/usr.sbin/ospfd/parse.y index d4e8f0fe247..cc075c5f148 100644 --- a/usr.sbin/ospfd/parse.y +++ b/usr.sbin/ospfd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.61 2008/02/26 10:09:58 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.62 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org> @@ -766,11 +766,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; 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; diff --git a/usr.sbin/ripd/parse.y b/usr.sbin/ripd/parse.y index 9d7411a0903..bd23cafbdbc 100644 --- a/usr.sbin/ripd/parse.y +++ b/usr.sbin/ripd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.19 2008/02/27 15:36:42 mpf Exp $ */ +/* $OpenBSD: parse.y,v 1.20 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it> @@ -485,11 +485,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; diff --git a/usr.sbin/snmpd/parse.y b/usr.sbin/snmpd/parse.y index f8186c862e9..6cb6dc6eb0a 100644 --- a/usr.sbin/snmpd/parse.y +++ b/usr.sbin/snmpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.15 2008/07/18 12:35:27 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.16 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@vantronix.net> @@ -487,11 +487,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; diff --git a/usr.sbin/ypldap/parse.y b/usr.sbin/ypldap/parse.y index dfab48c3c11..f7c386b7ad4 100644 --- a/usr.sbin/ypldap/parse.y +++ b/usr.sbin/ypldap/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.3 2008/10/14 21:41:03 aschrijver Exp $ */ +/* $OpenBSD: parse.y,v 1.4 2008/10/17 13:02:55 henning Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -480,11 +480,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; |