Prevent the v8 style regexp library from clashing with the POSIX regex.

Inspired by the changes to BSD/OS (and the bug they caught), but I didn't
go and look at the BSD/OS sources.

1 files changed, 64 insertions, 7 deletions

diff --git a/lib/libcompat/regexp/regexp.h b/lib/libcompat/regexp/regexp.h
index 60b950be953..e4bf5d8a367 100644
--- a/lib/libcompat/regexp/regexp.h
+++ b/lib/libcompat/regexp/regexp.h
@@ -1,12 +1,54 @@
+/*	$OpenBSD: regexp.h,v 1.2 1996/07/24 05:39:12 downsj Exp $	*/
+/*	$NetBSD: regexp.h,v 1.3 1994/10/26 00:56:15 cgd Exp $	*/
+
+/*
+ * Copyright (c) 1986 by University of Toronto.
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley
+ * by Henry Spencer.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 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.
+ *
+ *	@(#)regexp.h	5.2 (Berkeley) 4/3/91
+ */
+
+#ifndef	_REGEXP_H_
+#define	_REGEXP_H_
+
 /*
  * Definitions etc. for regexp(3) routines.
  *
  * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
  * not the System V one.
- *
- *	$Id: regexp.h,v 1.1.1.1 1995/10/18 08:42:35 deraadt Exp $
  */
-
 #define NSUBEXP  10
 typedef struct regexp {
 	char *startp[NSUBEXP];
@@ -18,7 +60,22 @@ typedef struct regexp {
 	char program[1];	/* Unwarranted chumminess with compiler. */
 } regexp;
 
-extern regexp *regcomp();
-extern int regexec();
-extern void regsub();
-extern void regerror();
+/*
+ * Redefine these to prevent conflicts with the POSIX routines.
+ */
+
+#define	regcomp(_exp)			v8_regcomp(_exp)
+#define regexec(_prg, _str)		v8_regexec(_prg, _str)
+#define regsub(_prg, _src, _dst)	v8_regsub(_prg, _src, _dst)
+#define	regerror(_msg)			v8_regerror(_msg)
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+regexp *v8_regcomp __P((const char *));
+int v8_regexec __P((const  regexp *, const char *));
+void v8_regsub __P((const  regexp *, const char *, char *));
+void v8_regerror __P((const char *));
+__END_DECLS
+
+#endif /* !_REGEXP_H_ */