diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2001-09-18 13:44:52 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2001-09-18 13:44:52 +0000 |
| commit | b8a61704827463b30606d30c7d89c7ae910a770a (patch) | |
| tree | 2af12695e739f17ede2b6a6379ce4f872b088b7a | |
| parent | 5f14ea7930a7bd0063d48e974bb7ec6bee50109d (diff) | |
8 bit clean look-ahead.
| -rw-r--r-- | usr.bin/m4/main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c index ab3cd5b2f5e..3c61a541839 100644 --- a/usr.bin/m4/main.c +++ b/usr.bin/m4/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.42 2001/09/17 08:11:13 espie Exp $ */ +/* $OpenBSD: main.c,v 1.43 2001/09/18 13:44:51 espie Exp $ */ /* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */ /*- @@ -47,7 +47,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #else -static char rcsid[] = "$OpenBSD: main.c,v 1.42 2001/09/17 08:11:13 espie Exp $"; +static char rcsid[] = "$OpenBSD: main.c,v 1.43 2001/09/18 13:44:51 espie Exp $"; #endif #endif /* not lint */ @@ -277,11 +277,11 @@ do_look_ahead(t, token) { int i; - assert(t == token[0]); + assert((unsigned char)t == (unsigned char)token[0]); for (i = 1; *++token; i++) { t = gpbc(); - if (t == EOF || t != *token) { + if (t == EOF || (unsigned char)t != (unsigned char)*token) { putback(t); while (--i) putback(*--token); @@ -291,7 +291,9 @@ do_look_ahead(t, token) return 1; } -#define LOOK_AHEAD(t, token) ((t)==(token)[0] && do_look_ahead(t,token)) +#define LOOK_AHEAD(t, token) (t != EOF && \ + (unsigned char)(t)==(unsigned char)(token)[0] && \ + do_look_ahead(t,token)) /* * macro - the work horse.. |