diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2010-11-21 00:02:31 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2010-11-21 00:02:31 +0000 |
| commit | 187945920f2a2ebfaf65ab8fc74d156249fba822 (patch) | |
| tree | c9c7f3c5ad6064293458a1e207bc712a3593fcad | |
| parent | 5f3b8b9e22b29fd817f72d7ca30a41a8b26befea (diff) | |
the posix regex mistake is here to stay. ok deraadt
| -rw-r--r-- | lib/libc/regex/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libc/regex/regcomp.c | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc index 9c448585b53..6f9b7733340 100644 --- a/lib/libc/regex/Makefile.inc +++ b/lib/libc/regex/Makefile.inc @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.6 2005/04/15 02:07:04 millert Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2010/11/21 00:02:30 tedu Exp $ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # regex sources .PATH: ${LIBCSRCDIR}/regex -CFLAGS+=-DPOSIX_MISTAKE - SRCS+= regcomp.c regerror.c regexec.c regfree.c MAN+= regex.3 re_format.7 diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index 5b632c8b7dd..c94da5ec9a6 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: regcomp.c,v 1.19 2008/02/23 08:13:07 otto Exp $ */ +/* $OpenBSD: regcomp.c,v 1.20 2010/11/21 00:02:30 tedu Exp $ */ /*- * Copyright (c) 1992, 1993, 1994 Henry Spencer. * Copyright (c) 1992, 1993, 1994 @@ -319,18 +319,6 @@ p_ere_exp(struct parse *p) EMIT(ORPAREN, subno); MUSTEAT(')', REG_EPAREN); break; -#ifndef POSIX_MISTAKE - case ')': /* happens only if no current unmatched ( */ - /* - * You may ask, why the ifndef? Because I didn't notice - * this until slightly too late for 1003.2, and none of the - * other 1003.2 regular-expression reviewers noticed it at - * all. So an unmatched ) is legal POSIX, at least until - * we can get it fixed. - */ - SETERROR(REG_EPAREN); - break; -#endif case '^': EMIT(OBOL, 0); p->g->iflags |= USEBOL; |