From 5a5100e3af3c9c536472755493a099a0de4c497c Mon Sep 17 00:00:00 2001
From: Andrew Moore <alm@FreeBSD.org>
Date: Mon, 9 Aug 1993 21:34:11 +0000
Subject: added (unsiged) cast to avoid int overflow removed REGEX directive

---
 bin/ed/Makefile | 2 +-
 bin/ed/README   | 1 -
 bin/ed/ed.h     | 2 +-
 bin/ed/re.c     | 7 -------
 4 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index e247777edace..5a6a4ea4aee8 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,5 +1,5 @@
 PROG=	ed
-CFLAGS+=-DVI_BANG -DGNU_REGEX
+CFLAGS+=-DVI_BANG
 SRCS=	ed.c re.c buf.c cbc.c 
 LINKS=	${BINDIR}/ed ${BINDIR}/red
 MLINKS=	ed.1 red.1
diff --git a/bin/ed/README b/bin/ed/README
index 9dada652ad02..06e302d7b116 100644
--- a/bin/ed/README
+++ b/bin/ed/README
@@ -7,7 +7,6 @@ compile with little trouble.  Otherwise, the macros spl1() and spl0()
 should be redefined to disable interrupts.
 
 The following compiler directives are recognized:
-GNU_REGEX	- use with GNU regex(3)
 DES		- use to add encryption support (requires crypt(3))
 NO_REALLOC_NULL	- use if realloc(3) does not accept a NULL pointer
 BACKWARDS	- use for backwards compatibility
diff --git a/bin/ed/ed.h b/bin/ed/ed.h
index 20d5cec9c8de..b3905370f949 100644
--- a/bin/ed/ed.h
+++ b/bin/ed/ed.h
@@ -49,7 +49,7 @@
 #define BITS(type)  (BITSPERBYTE * (int)sizeof(type))
 #define CHARBITS    BITS(char)
 #define INTBITS     BITS(int)
-#define INTHIBIT    (1 << (INTBITS - 1))
+#define INTHIBIT    (unsigned) (1 << (INTBITS - 1))
 
 #define ERR		(-2)
 #define EMOD		(-3)
diff --git a/bin/ed/re.c b/bin/ed/re.c
index e94475033922..3fad099c9437 100644
--- a/bin/ed/re.c
+++ b/bin/ed/re.c
@@ -84,13 +84,6 @@ optpat()
 		return NULL;
 	}
 	patlock = 0;
-#ifdef GNU_REGEX
-	/* initialize pattern buffer */
-	exp->buffer = NULL;
-	exp->allocated = 0L;
-	exp->fastmap = 0;		/* not used by GNU regex after 0.12 */
-	exp->translate = 0;
-#endif
 	if (n = regcomp(exp, exps, 0)) {
 		regerror(n, exp, errmsg, sizeof errmsg);
 		return NULL;
-- 
cgit v1.2.3