From 763ed733711a5bb66d39de4d0ed4bcaae77e2461 Mon Sep 17 00:00:00 2001 From: Ed Schouten Date: Sun, 14 Mar 2010 10:18:58 +0000 Subject: Trim down libcompat by removing . Erwin ran an exp-run with libcompat and removed. It turns out the regexp library is almost entirely unused. In fact, it looks like it is sometimes used by accident. Because these function names clash with libc's , some application use both and libcompat, which means they link against the wrong regex library. This commit removes the regexp library and reimplements re_comp() and re_exec() using . It seems the grammar of the regular expressions accepted by these functions is similar to POSIX EREs. After this commit, 1 low-profile port will be broken, but the maintainer already has a patch for it sitting in his mailbox. --- lib/libcompat/4.3/re_comp.3 | 13 ++----- lib/libcompat/4.3/re_comp.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ lib/libcompat/4.3/regex.c | 92 --------------------------------------------- 3 files changed, 96 insertions(+), 101 deletions(-) create mode 100644 lib/libcompat/4.3/re_comp.c delete mode 100644 lib/libcompat/4.3/regex.c (limited to 'lib/libcompat/4.3') diff --git a/lib/libcompat/4.3/re_comp.3 b/lib/libcompat/4.3/re_comp.3 index e3b595a4457a..4d970facb091 100644 --- a/lib/libcompat/4.3/re_comp.3 +++ b/lib/libcompat/4.3/re_comp.3 @@ -100,15 +100,10 @@ returns \-1 for an internal error. The .Fn re_comp function -returns one of the following strings if an error occurs: -.Bd -unfilled -offset indent -No previous regular expression, -Regular expression too long, -unmatched \e(, -missing ], -too many \e(\e) pairs, -unmatched \e). -.Ed +returns +.Dq no previous regular expression +or one of the strings generated by +.Xr regerror 3 . .Sh SEE ALSO .Xr ed 1 , .Xr egrep 1 , diff --git a/lib/libcompat/4.3/re_comp.c b/lib/libcompat/4.3/re_comp.c new file mode 100644 index 000000000000..dbe57b129973 --- /dev/null +++ b/lib/libcompat/4.3/re_comp.c @@ -0,0 +1,92 @@ +/*- + * Copyright (c) 1992 The Regents of the University of California. + * All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * James da Silva at the University of Maryland at College Park. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +/* + * Compatibility routines that implement the old re_comp/re_exec interface in + * terms of the regcomp/regexec interface. It's possible that some programs + * rely on dark corners of re_comp/re_exec and won't work with this version, + * but most programs should be fine. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)regex.c 5.1 (Berkeley) 3/29/92"; +#endif /* LIBC_SCCS and not lint */ + +#include +#include +#include + +static regex_t re_regexp; +static int re_gotexp; +static char re_errstr[100]; + +char * +re_comp(const char *s) +{ + int rc; + + if (s == NULL || *s == '\0') { + if (!re_gotexp) + return __DECONST(char *, + "no previous regular expression"); + return (NULL); + } + + if (re_gotexp) { + regfree(&re_regexp); + re_gotexp = 0; + } + + rc = regcomp(&re_regexp, s, REG_EXTENDED); + if (rc == 0) { + re_gotexp = 1; + return (NULL); + } + + regerror(rc, &re_regexp, re_errstr, sizeof(re_errstr)); + re_errstr[sizeof(re_errstr) - 1] = '\0'; + return (re_errstr); +} + +int +re_exec(const char *s) +{ + int rc; + + if (!re_gotexp) + return (-1); + rc = regexec(&re_regexp, s, 0, NULL, 0); + return (rc == 0 ? 1 : 0); +} diff --git a/lib/libcompat/4.3/regex.c b/lib/libcompat/4.3/regex.c deleted file mode 100644 index 470cab52e779..000000000000 --- a/lib/libcompat/4.3/regex.c +++ /dev/null @@ -1,92 +0,0 @@ -/*- - * Copyright (c) 1992 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * James da Silva at the University of Maryland at College Park. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -/* - * Compatibility routines that implement the old re_comp/re_exec interface in - * terms of the regcomp/regexec interface. It's possible that some programs - * rely on dark corners of re_comp/re_exec and won't work with this version, - * but most programs should be fine. - */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)regex.c 5.1 (Berkeley) 3/29/92"; -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include -#include -#include - -static regexp *re_regexp; -static int re_goterr; -static char *re_errstr; - -char * -re_comp(char *s) -{ - if (s == NULL || *s == '\0') { - if (re_regexp == NULL) - return "no previous regular expression"; - return (NULL); - } - if (re_regexp) - free(re_regexp); - if (re_errstr) - free(re_errstr); - re_goterr = 0; - re_regexp = regcomp(s); - return (re_goterr ? re_errstr : NULL); -} - -int -re_exec(char *s) -{ - int rc; - - re_goterr = 0; - rc = regexec(re_regexp, s); - return (re_goterr ? -1 : rc); -} - -void -regerror(const char *s) -{ - re_goterr = 1; - if (re_errstr) - free(re_errstr); - re_errstr = strdup(s); -} -- cgit v1.2.3