Remove config options for 4.2BSD and 4.3BSD, and associated code. Highly

obsolete, and I doubt most of it still worked anyway.

6 files changed, 20 insertions, 109 deletions

diff --git a/hunt/Makefile.inc b/hunt/Makefile.inc
index 409a49c0..008fbae6 100644
--- a/hunt/Makefile.inc
+++ b/hunt/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.10 2009/07/04 07:10:22 dholland Exp $
+#	$NetBSD: Makefile.inc,v 1.11 2009/07/04 07:51:34 dholland Exp $
 #
 #
 #  Hunt
@@ -56,20 +56,17 @@ GAME_PARAM=	-DRANDOM -DREFLECT -DMONITOR -DOOZE -DFLY -DVOLCANO -DBOOTS \
 #	OLDIPC		Use 4.1a internet system calls (must also define
 #			INTERNET)
 #	LOG		Use syslog(3) for logging errors
-#	BSD_RELEASE	Which version of BSD distribution
-#			42 is 4.2BSD
-#			43 is 4.3BSD (implies BROADCAST)
 #	HPUX		do special HPUX only hacks
 #
-DEFS_BSD43=	-DINTERNET -DLOG -DBSD_RELEASE=43
-DEFS_BSD44=	-DINTERNET -DLOG -DBSD_RELEASE=44
-DEFS_SUN=	-DINTERNET -DLOG -DBSD_RELEASE=42 -DBROADCAST
-DEFS_SUN4_0=	-DINTERNET -DLOG -DBROADCAST
-DEFS_ULTRIX=	-DINTERNET -DLOG -DBSD_RELEASE=42
-DEFS_HPUX=	-DHPUX -DINTERNET -DLOG -DBROADCAST
-DEFS_SGI=	-DINTERNET -DLOG -DBSD_RELEASE=43
-DEFS_NEXT=	$(DEFS_BSD43) -bsd -Dconst=
-DEFS_OSF1=	-DINTERNET -DLOG -DBSD_RELEASE=43 -D_BSD
+DEFS_BSD43=	-DINTERNET -DLOG
+DEFS_BSD44=	-DINTERNET -DLOG
+DEFS_SUN=	-DINTERNET -DLOG
+DEFS_SUN4_0=	-DINTERNET -DLOG
+DEFS_ULTRIX=	-DINTERNET -DLOG
+DEFS_HPUX=	-DINTERNET -DLOG -DHPUX
+DEFS_SGI=	-DINTERNET -DLOG
+DEFS_NEXT=	-DINTERNET -DLOG -bsd -Dconst=
+DEFS_OSF1=	-DINTERNET -DLOG -D_BSD
 
 #
 # The following flags are used for system specific compilation arguments.
diff --git a/hunt/hunt/hunt.c b/hunt/hunt/hunt.c
index 8a6788a5..a31bdf47 100644
--- a/hunt/hunt/hunt.c
+++ b/hunt/hunt/hunt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hunt.c,v 1.34 2009/07/04 07:10:23 dholland Exp $	*/
+/*	$NetBSD: hunt.c,v 1.35 2009/07/04 07:51:34 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hunt.c,v 1.34 2009/07/04 07:10:23 dholland Exp $");
+__RCSID("$NetBSD: hunt.c,v 1.35 2009/07/04 07:51:34 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -51,13 +51,6 @@ __RCSID("$NetBSD: hunt.c,v 1.34 2009/07/04 07:10:23 dholland Exp $");
 
 #include "hunt.h"
 
-/*
- * Some old versions of curses don't have these defined
- */
-#if !defined(cbreak) && (!defined(BSD_RELEASE) || BSD_RELEASE < 44)
-#define cbreak()	crmode()
-#endif
-
 #define clear_eol()	clrtoeol()
 #define put_ch		addch
 #define put_str		addstr
@@ -338,7 +331,6 @@ main(int ac, char **av)
 }
 
 #ifdef INTERNET
-#ifdef BROADCAST
 int
 broadcast_vec(int s /*socket*/, struct sockaddr **vector)
 {
@@ -368,7 +360,6 @@ broadcast_vec(int s /*socket*/, struct sockaddr **vector)
 	freeifaddrs(ifp);
 	return vec_cnt;
 }
-#endif
 
 SOCKET *
 list_drivers(void)
@@ -383,12 +374,8 @@ list_drivers(void)
 	static int initial = TRUE;
 	static struct in_addr local_address;
 	struct hostent *hp;
-#ifdef BROADCAST
 	static int brdc;
 	static SOCKET *brdv;
-#else
-	u_long local_net;
-#endif
 	int i;
 	unsigned j;
 	static SOCKET *listv;
@@ -397,9 +384,6 @@ list_drivers(void)
 	struct pollfd set[1];
 
 	if (initial) {			/* do one time initialization */
-#ifndef BROADCAST
-		sethostent(1);		/* don't bother to close host file */
-#endif
 		if (gethostname(local_name, sizeof local_name) < 0) {
 			leavex(1, "Sorry, I have no name.");
 			/* NOTREACHED */
@@ -442,7 +426,6 @@ list_drivers(void)
 		    (struct sockaddr *) &test, DAEMON_SIZE);
 	}
 
-#ifdef BROADCAST
 	if (initial)
 		brdc = broadcast_vec(test_socket, (void *) &brdv);
 
@@ -472,19 +455,6 @@ list_drivers(void)
 		leave(1, "sendto");
 		/* NOTREACHED */
 	}
-#else /* !BROADCAST */
-	/* loop thru all hosts on local net and send msg to them. */
-	msg = htons(C_TESTMSG());
-	local_net = inet_netof(local_address);
-	sethostent(0);		/* rewind host file */
-	while (hp = gethostent()) {
-		if (local_net == inet_netof(* ((struct in_addr *) hp->h_addr))){
-			test.sin_addr = * ((struct in_addr *) hp->h_addr);
-			(void) sendto(test_socket, &msg, sizeof msg, 0,
-			    (struct sockaddr *) &test, DAEMON_SIZE);
-		}
-	}
-#endif
 
 get_response:
 	namelen = DAEMON_SIZE;
@@ -811,23 +781,6 @@ leavex(int eval, const char *mesg)
 	errx(eval, mesg ? mesg : "");
 }
 
-#if defined(BSD_RELEASE) && BSD_RELEASE < 43
-char *
-strpbrk(char *s, char *brk)
-{
-	char *p;
-	c;
-
-	while (c = *s) {
-		for (p = brk; *p; p++)
-			if (c == *p)
-				return (s);
-		s++;
-	}
-	return (0);
-}
-#endif
-
 long
 env_init(long enter_status)
 {
diff --git a/hunt/hunt/playit.c b/hunt/hunt/playit.c
index da35d564..f7415d93 100644
--- a/hunt/hunt/playit.c
+++ b/hunt/hunt/playit.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: playit.c,v 1.13 2009/07/04 07:10:23 dholland Exp $	*/
+/*	$NetBSD: playit.c,v 1.14 2009/07/04 07:51:34 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: playit.c,v 1.13 2009/07/04 07:10:23 dholland Exp $");
+__RCSID("$NetBSD: playit.c,v 1.14 2009/07/04 07:51:34 dholland Exp $");
 #endif /* not lint */
 
 #include <sys/file.h>
@@ -42,10 +42,8 @@ __RCSID("$NetBSD: playit.c,v 1.13 2009/07/04 07:10:23 dholland Exp $");
 #include <curses.h>
 #include <ctype.h>
 #include <signal.h>
-#if defined(HPUX) || (defined(BSD_RELEASE) && BSD_RELEASE >= 44)
 #include <termios.h>
 #include <unistd.h>
-#endif
 #include "hunt.h"
 
 #ifndef FREAD
@@ -77,10 +75,6 @@ static unsigned char ibuf[256], *iptr = ibuf;
 
 #define GETCHR()	(--icnt < 0 ? getchr() : *iptr++)
 
-#if !defined(BSD_RELEASE) || BSD_RELEASE < 44
-extern int _putchar();
-#endif
-
 static unsigned char getchr(void);
 static void send_stuff(void);
 
@@ -160,15 +154,7 @@ playit(void)
 		  case READY:
 			refresh();
 			if (nchar_send < 0)
-#if defined(HPUX) || (defined(BSD_RELEASE) && BSD_RELEASE >= 44)
 				tcflush(STDIN, TCIFLUSH);
-#else
-#ifndef TCFLSH
-				(void) ioctl(STDIN, TIOCFLUSH, &in);
-#else
-				(void) ioctl(STDIN, TCFLSH, 0);
-#endif
-#endif
 			nchar_send = MAX_SEND;
 #ifndef OTTO
 			(void) GETCHR();
@@ -348,12 +334,7 @@ get_message:
 				refresh();
 				if ((ch = getchar()) == '\n' || ch == '\r')
 					break;
-#if BSD_RELEASE >= 44
-				if (ch == erasechar())
-#else
-				if (ch == _tty.sg_erase)
-#endif
-				{
+				if (ch == erasechar()) {
 					if (cp > buf) {
 						int y, x;
 						getyx(stdscr, y, x);
@@ -363,12 +344,7 @@ get_message:
 					}
 					continue;
 				}
-#if BSD_RELEASE >= 44
-				else if (ch == killchar())
-#else
-				else if (ch == _tty.sg_kill)
-#endif
-				{
+				else if (ch == killchar()) {
 					int y, x;
 					getyx(stdscr, y, x);
 					move(y, x - (cp - buf));
diff --git a/hunt/huntd/bsd.h b/hunt/huntd/bsd.h
index 6763cbf0..fbfed929 100644
--- a/hunt/huntd/bsd.h
+++ b/hunt/huntd/bsd.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsd.h,v 1.6 2009/07/04 06:31:31 dholland Exp $	*/
+/*	$NetBSD: bsd.h,v 1.7 2009/07/04 07:51:35 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
@@ -30,7 +30,3 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#if defined(BSD_RELEASE) && BSD_RELEASE >= 43
-#define BROADCAST
-#endif
diff --git a/hunt/huntd/faketalk.c b/hunt/huntd/faketalk.c
index 6a8a531e..a9ae771e 100644
--- a/hunt/huntd/faketalk.c
+++ b/hunt/huntd/faketalk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: faketalk.c,v 1.16 2009/07/04 06:38:35 dholland Exp $	*/
+/*	$NetBSD: faketalk.c,v 1.17 2009/07/04 07:51:35 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: faketalk.c,v 1.16 2009/07/04 06:38:35 dholland Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.17 2009/07/04 07:51:35 dholland Exp $");
 #endif /* not lint */
 
 #include "bsd.h"
@@ -214,11 +214,7 @@ do_announce(char *s)
 	get_remote_name(s);	/* setup his_machine_addr, msg.r_name */
 
 #ifdef TALK_43
-#if BSD_RELEASE >= 44
 	msg.ctl_addr = *(struct osockaddr *) &ctl_addr;
-#else
-	msg.ctl_addr = *(struct sockaddr *) &ctl_addr;
-#endif
 	msg.ctl_addr.sa_family = htons(msg.ctl_addr.sa_family);
 #else
 	msg.ctl_addr = ctl_addr;
diff --git a/hunt/huntd/hunt.h b/hunt/huntd/hunt.h
index 49b8c0e5..021e6f81 100644
--- a/hunt/huntd/hunt.h
+++ b/hunt/huntd/hunt.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: hunt.h,v 1.17 2009/07/04 07:10:23 dholland Exp $	*/
+/*	$NetBSD: hunt.h,v 1.18 2009/07/04 07:51:35 dholland Exp $	*/
 
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
@@ -40,12 +40,7 @@
 #include <syslog.h>
 #endif
 
-#if BSD_RELEASE < 44
-#include <sgtty.h>
-#else
 #include <sys/ioctl.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/poll.h>
@@ -54,9 +49,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#ifdef BROADCAST
 #include <net/if.h>
-#endif
 #else
 #include <sys/un.h>
 #endif