diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2015-11-19 19:48:28 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2015-11-19 19:48:28 +0000 |
| commit | 3ebb9bc3c231d97af9c819385a338aad28329d7f (patch) | |
| tree | 83488110c3520e75a17397525e6b92f25c460556 | |
| parent | c75584be6c40ab69fa4779469cbcdb5b53a93e6b (diff) | |
lexer fixes to work with new flex. from Serguey Parkhomovsky
| -rw-r--r-- | lib/libkeynote/keynote-ver.l | 3 | ||||
| -rw-r--r-- | lib/libkeynote/keynote.l | 3 | ||||
| -rw-r--r-- | sbin/wsconsctl/map_scan.l | 6 | ||||
| -rw-r--r-- | usr.sbin/config/scan.l | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/lib/libkeynote/keynote-ver.l b/lib/libkeynote/keynote-ver.l index 08cdf2c176f..8f3237448bc 100644 --- a/lib/libkeynote/keynote-ver.l +++ b/lib/libkeynote/keynote-ver.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: keynote-ver.l,v 1.16 2013/11/29 19:00:51 deraadt Exp $ */ +/* $OpenBSD: keynote-ver.l,v 1.17 2015/11/19 19:48:27 tedu Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) * @@ -252,7 +252,6 @@ read_environment(char *filename) if (0) { yyunput(0, NULL); - yy_flex_realloc(0, 0); } } diff --git a/lib/libkeynote/keynote.l b/lib/libkeynote/keynote.l index a3586ff3945..421e00553f3 100644 --- a/lib/libkeynote/keynote.l +++ b/lib/libkeynote/keynote.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: keynote.l,v 1.22 2015/11/19 02:35:24 mmcc Exp $ */ +/* $OpenBSD: keynote.l,v 1.23 2015/11/19 19:48:27 tedu Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) * @@ -746,7 +746,6 @@ keynote_get_envlist(char *buf, char *bufend, int whichfield) if (0) { yyunput(0, NULL); - yy_flex_realloc(0, 0); } return en; diff --git a/sbin/wsconsctl/map_scan.l b/sbin/wsconsctl/map_scan.l index 60172cc9d45..a660b25dd89 100644 --- a/sbin/wsconsctl/map_scan.l +++ b/sbin/wsconsctl/map_scan.l @@ -1,4 +1,4 @@ -/* $OpenBSD: map_scan.l,v 1.5 2015/04/18 18:28:37 deraadt Exp $ */ +/* $OpenBSD: map_scan.l,v 1.6 2015/11/19 19:48:27 tedu Exp $ */ /* $NetBSD: map_scan.l 1.1 1998/12/28 14:01:17 hannken Exp $ */ /*- @@ -30,6 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ +%option noyywrap + %{ #include <dev/wscons/wsksymdef.h> @@ -39,8 +41,6 @@ #include "wsconsctl.h" #include "y.tab.h" -#define yywrap() 1 - void map_scan_setinput(char *str) { diff --git a/usr.sbin/config/scan.l b/usr.sbin/config/scan.l index b5c0543325c..0ccd743f8d4 100644 --- a/usr.sbin/config/scan.l +++ b/usr.sbin/config/scan.l @@ -1,5 +1,5 @@ %{ -/* $OpenBSD: scan.l,v 1.22 2015/01/16 06:40:16 deraadt Exp $ */ +/* $OpenBSD: scan.l,v 1.23 2015/11/19 19:48:27 tedu Exp $ */ /* $NetBSD: scan.l,v 1.13 1997/02/02 21:12:37 thorpej Exp $ */ /* @@ -67,10 +67,10 @@ struct incl { static struct incl *incl; static int endinclude(void); -#define yywrap() 1 - %} +%option noyywrap + PATH [A-Za-z_0-9]*[./][-A-Za-z_0-9./\$\{\}]* WORD [A-Za-z_][-A-Za-z_0-9]* |