use regex search by default in FreeBSD

use regex search by default in FreeBSD

[Yuri Pankov]

[-- Attachment #1.1.1: Type: text/plain, Size: 289 bytes --]

Hi,

There's a PR filed in FreeBSD to revert the apropos search back to regex
by default for backward (and not only) compatibility.  Could you please
integrate the attached patch to reduce the number of local modifications?

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223556

[-- Attachment #1.1.2: pr223556.diff --]
[-- Type: text/plain, Size: 604 bytes --]

diff --git a/contrib/mandoc/mansearch.c b/contrib/mandoc/mansearch.c
index 784c17bee714..7fcf82928b87 100644
--- a/contrib/mandoc/mansearch.c
+++ b/contrib/mandoc/mansearch.c
@@ -774,7 +774,13 @@ exprterm(const struct mansearch *search, int argc, char *argv[], int *argi)
 		cs = 0;
 	} else if ((val = strpbrk(argv[*argi], "=~")) == NULL) {
 		e->bits = TYPE_Nm | TYPE_Nd;
+#ifdef __FreeBSD__
+		/* FreeBSD uses regex search by default */
+		e->match.type = DBM_REGEX;
+		val = argv[*argi];
+#else
 		e->match.type = DBM_SUB;
+#endif
 		e->match.str = argv[*argi];
 	} else {
 		if (val == argv[*argi])

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]