svn commit: r269484 - in stable/10: lib/libc/regex sys/sys

[Pedro F. Giffuni]

Author: pfg
Date: Sun Aug  3 18:39:11 2014
New Revision: 269484
URL: http://svnweb.freebsd.org/changeset/base/269484

Log:
  MFC	r268066:
  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

Modified:
  stable/10/lib/libc/regex/re_format.7
  stable/10/lib/libc/regex/regcomp.c
  stable/10/sys/sys/param.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libc/regex/re_format.7
==============================================================================
--- stable/10/lib/libc/regex/re_format.7	Sun Aug  3 18:31:52 2014	(r269483)
+++ stable/10/lib/libc/regex/re_format.7	Sun Aug  3 18:39:11 2014	(r269484)
@@ -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,

Modified: stable/10/lib/libc/regex/regcomp.c
==============================================================================
--- stable/10/lib/libc/regex/regcomp.c	Sun Aug  3 18:31:52 2014	(r269483)
+++ stable/10/lib/libc/regex/regcomp.c	Sun Aug  3 18:39:11 2014	(r269484)
@@ -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;

Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h	Sun Aug  3 18:31:52 2014	(r269483)
+++ stable/10/sys/sys/param.h	Sun Aug  3 18:39:11 2014	(r269484)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1000712	/* Master, propagated to newvers */
+#define __FreeBSD_version 1000713	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,