From 4f1efa309ca48a088595dd57969ae6a397dd49d1 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sat, 5 Dec 2020 14:38:46 +0000
Subject: [PATCH] libc: regex: partial revert of r368358

Part of the libregex functionality leaked into the tests it shares with
the standard regex(3). Introduce a P flag to set the REG_POSIX cflag to
indicate that libc regex should effectively do nothing while libregex should
specifically run it in non-extended mode.

This unbreaks the libc/regex test run.

Reported by:	Jenkins
---
 contrib/netbsd-tests/lib/libc/regex/README       | 1 +
 contrib/netbsd-tests/lib/libc/regex/data/meta.in | 2 +-
 contrib/netbsd-tests/lib/libc/regex/main.c       | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/contrib/netbsd-tests/lib/libc/regex/README b/contrib/netbsd-tests/lib/libc/regex/README
index 6d9a28cf60ca..0e8a09a764ff 100644
--- a/contrib/netbsd-tests/lib/libc/regex/README
+++ b/contrib/netbsd-tests/lib/libc/regex/README
@@ -28,6 +28,7 @@ The full list of flags:
   $	REG_NOTEOL
   #	REG_STARTEND (see below)
   p	REG_PEND
+  P	REG_POSIX
 
 For REG_STARTEND, the start/end offsets are those of the substring
 enclosed in ().
diff --git a/contrib/netbsd-tests/lib/libc/regex/data/meta.in b/contrib/netbsd-tests/lib/libc/regex/data/meta.in
index b8f14aad8c74..30085a8d1e97 100644
--- a/contrib/netbsd-tests/lib/libc/regex/data/meta.in
+++ b/contrib/netbsd-tests/lib/libc/regex/data/meta.in
@@ -5,7 +5,7 @@ a\*c		&	a*c	a*c
 a\\b		&	a\b	a\b
 a\\\*b		&	a\*b	a\*b
 # Begin FreeBSD
-a\bc		&	abc
+a\bc		&CP	EESCAPE
 # End FreeBSD
 a\		&C	EESCAPE
 a\\bc		&	a\bc	a\bc
diff --git a/contrib/netbsd-tests/lib/libc/regex/main.c b/contrib/netbsd-tests/lib/libc/regex/main.c
index eac4e2d9b51e..243c8dc5ff80 100644
--- a/contrib/netbsd-tests/lib/libc/regex/main.c
+++ b/contrib/netbsd-tests/lib/libc/regex/main.c
@@ -338,7 +338,7 @@ options(int type, char *s)
 {
 	char *p;
 	int o = (type == 'c') ? copts : eopts;
-	const char *legal = (type == 'c') ? "bisnmp" : "^$#tl";
+	const char *legal = (type == 'c') ? "bisnmpP" : "^$#tl";
 
 	for (p = s; *p != '\0'; p++)
 		if (strchr(legal, *p) != NULL)
@@ -362,6 +362,9 @@ options(int type, char *s)
 			case 'p':
 				o |= REG_PEND;
 				break;
+			case 'P':
+				o |= REG_POSIX;
+				break;
 			case '^':
 				o |= REG_NOTBOL;
 				break;