diff options
| author | Pedro F. Giffuni <pfg@FreeBSD.org> | 2014-06-30 20:54:25 +0000 |
|---|---|---|
| committer | Pedro F. Giffuni <pfg@FreeBSD.org> | 2014-06-30 20:54:25 +0000 |
| commit | 6e283683661074bd8e31e3aec18f51597f58fbd4 (patch) | |
| tree | 0193951a06c544c99535a752e18302b6b09244e1 | |
| parent | b8a63d6df6d094b940ca90038306e8e6397e3d87 (diff) | |
| download | src-6e283683661074bd8e31e3aec18f51597f58fbd4.tar.gz src-6e283683661074bd8e31e3aec18f51597f58fbd4.zip | |
regex(3): Add support for \< and \> word delimiters
Solaris and other OSs have support for \< and \> as word
delimiters in utilities like sed(1). These are useful to
have for general compatiblity with Solaris but should be
avoided for portability with other systems, including the
traditional BSDs.
Bump __FreeBSD_version as this is likely to affect some
userland utilities.
Reference:
https://www.illumos.org/issues/516
PR: bin/153257
Obtained from: Illumos
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=268066
| -rw-r--r-- | lib/libc/regex/re_format.7 | 9 | ||||
| -rw-r--r-- | lib/libc/regex/regcomp.c | 18 | ||||
| -rw-r--r-- | sys/sys/param.h | 2 |
3 files changed, 26 insertions, 3 deletions
diff --git a/lib/libc/regex/re_format.7 b/lib/libc/regex/re_format.7 index a2a527da519e..05b14947e45f 100644 --- a/lib/libc/regex/re_format.7 +++ b/lib/libc/regex/re_format.7 @@ -36,7 +36,7 @@ .\" @(#)re_format.7 8.3 (Berkeley) 3/20/94 .\" $FreeBSD$ .\" -.Dd March 20, 1994 +.Dd June 30, 2014 .Dt RE_FORMAT 7 .Os .Sh NAME @@ -314,6 +314,13 @@ compatible with but not specified by .St -p1003.2 , and should be used with caution in software intended to be portable to other systems. +The additional word delimiters +.Ql \e< +and +.Ql \e> +are provided to ease compatibility with traditional +.Xr svr4 4 +systems but are not portable and should be avoided. .Pp In the event that an RE could match more than one substring of a given string, diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c index 55f9c04c6910..a01bb95931bf 100644 --- a/lib/libc/regex/regcomp.c +++ b/lib/libc/regex/regcomp.c @@ -412,7 +412,17 @@ p_ere_exp(struct parse *p) case '\\': (void)REQUIRE(MORE(), REG_EESCAPE); wc = WGETNEXT(); - ordinary(p, wc); + switch (wc) { + case '<': + EMIT(OBOW, 0); + break; + case '>': + EMIT(OEOW, 0); + break; + default: + ordinary(p, wc); + break; + } break; case '{': /* okay as ordinary except if digit follows */ (void)REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT); @@ -569,6 +579,12 @@ p_simp_re(struct parse *p, case '[': p_bracket(p); break; + case BACKSL|'<': + EMIT(OBOW, 0); + break; + case BACKSL|'>': + EMIT(OEOW, 0); + break; case BACKSL|'{': SETERROR(REG_BADRPT); break; diff --git a/sys/sys/param.h b/sys/sys/param.h index ccbb70ab9cf0..d2158ac644ce 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100024 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100025 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, |