 @@ -1,14 +1,14 @@
-/*	$NetBSD: answer.c,v 1.10 2009/06/28 18:59:37 dholland Exp $	*/
+/*	$NetBSD: answer.c,v 1.11 2009/06/28 21:12:35 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  * + Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * + 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.
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: answer.c,v 1.10 2009/06/28 18:59:37 dholland Exp $");
+__RCSID("$NetBSD: answer.c,v 1.11 2009/06/28 21:12:35 dholland Exp $");
 #endif /* not lint */
 # include	<ctype.h>
 # include	<errno.h>
 # include	<fcntl.h>
 # include	<stdlib.h>
 # include	<unistd.h>
 # include	"hunt.h"
 # define	SCOREDECAY	15
 static char	Ttyname[NAMELEN];
 @@ -121,29 +121,30 @@ answer()
 	 * between driver and player processes
 	 */
 	for (cp1 = cp2 = name; *cp1 != '\0'; cp1++)
 		if (isprint((unsigned char)*cp1) || *cp1 == ' ')
 			*cp2++ = *cp1;
 	*cp2 = '\0';
 # ifdef INTERNET
 	if (mode == C_MESSAGE) {
 		char	buf[BUFSIZ + 1];
 		int	n;
 		if (team == ' ')
-			(void) sprintf(buf, "%s: ", name);
+			(void) snprintf(buf, sizeof(buf), "%s: ", name);
 		else
-			(void) sprintf(buf, "%s[%c]: ", name, team);
+			(void) snprintf(buf, sizeof(buf), "%s[%c]: ", name,
 					team);
 		n = strlen(buf);
 		for (pp = Player; pp < End_player; pp++) {
 			cgoto(pp, HEIGHT, 0);
 			outstr(pp, buf, n);
+		}
 		while ((n = read(newsock, buf, BUFSIZ)) > 0)
 			for (pp = Player; pp < End_player; pp++)
 				outstr(pp, buf, n);
 		for (pp = Player; pp < End_player; pp++) {
 			ce(pp);
 			sendcom(pp, REFRESH);
 			sendcom(pp, READY, 0);
 			(void) fflush(pp->p_output);
 @@ -203,27 +204,28 @@ answer()
 # ifdef MONITOR
 void
 stmonitor(pp)
 	PLAYER	*pp;
+{
 	int	line;
 	PLAYER	*npp;
 	memcpy(pp->p_maze, Maze, sizeof Maze);
 	drawmaze(pp);
-	(void) sprintf(Buf, "%5.5s%c%-10.10s %c", " ", stat_char(pp),
+	(void) snprintf(Buf, sizeof(Buf), "%5.5s%c%-10.10s %c", " ",
 		stat_char(pp),
 		pp->p_ident->i_name, pp->p_ident->i_team);
 	line = STAT_MON_ROW + 1 + (pp - Monitor);
 	for (npp = Player; npp < End_player; npp++) {
 		cgoto(npp, line, STAT_NAME_COL);
 		outstr(npp, Buf, STAT_NAME_LEN);
+	}
 	for (npp = Monitor; npp < End_monitor; npp++) {
 		cgoto(npp, line, STAT_NAME_COL);
 		outstr(npp, Buf, STAT_NAME_LEN);
+	}
 	sendcom(pp, REFRESH);
 	sendcom(pp, READY, 0);
 @@ -307,39 +309,41 @@ stplayer(newpp, enter_status)
 		check(pp, y, x);
 # endif
 	do {
 		x = rand_num(WIDTH - 1) + 1;
 		y = rand_num(HEIGHT - 1) + 1;
 	} while (Maze[y][x] != SPACE);
 	Maze[y][x] = MINE;
 # ifdef MONITOR
 	for (pp = Monitor; pp < End_monitor; pp++)
 		check(pp, y, x);
 # endif
-	(void) sprintf(Buf, "%5.2f%c%-10.10s %c", newpp->p_ident->i_score,
+	(void) snprintf(Buf, sizeof(Buf), "%5.2f%c%-10.10s %c",
 		newpp->p_ident->i_score,
 		stat_char(newpp), newpp->p_ident->i_name,
 		newpp->p_ident->i_team);
 	y = STAT_PLAY_ROW + 1 + (newpp - Player);
 	for (pp = Player; pp < End_player; pp++) {
 		if (pp != newpp) {
 			char	smallbuf[16];
 			pp->p_ammo += NSHOTS;
 			newpp->p_ammo += NSHOTS;
 			cgoto(pp, y, STAT_NAME_COL);
 			outstr(pp, Buf, STAT_NAME_LEN);
-			(void) sprintf(smallbuf, "%3d", pp->p_ammo);
+			(void) snprintf(smallbuf, sizeof(smallbuf),
 					"%3d", pp->p_ammo);
 			cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 			outstr(pp, smallbuf, 3);
+		}
+	}
 # ifdef MONITOR
 	for (pp = Monitor; pp < End_monitor; pp++) {
 		cgoto(pp, y, STAT_NAME_COL);
 		outstr(pp, Buf, STAT_NAME_LEN);
+	}
 # endif
 	drawmaze(newpp);
 	drawplayer(newpp, TRUE);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: draw.c,v 1.4 2008/01/28 03:23:29 dholland Exp $	*/
+/*	$NetBSD: draw.c,v 1.5 2009/06/28 21:12:35 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  * + Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * + 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.
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: draw.c,v 1.4 2008/01/28 03:23:29 dholland Exp $");
+__RCSID("$NetBSD: draw.c,v 1.5 2009/06/28 21:12:35 dholland Exp $");
 #endif /* not lint */
 # include	"hunt.h"
 void
 drawmaze(pp)
 	PLAYER	*pp;
+{
 	int	x;
 	char	*sp;
 	int	y;
 	char	*endp;
 @@ -69,62 +69,64 @@ drawmaze(pp)
 /*
  * drawstatus - put up the status lines (this assumes the screen
  *		size is 80x24 with the maze being 64x24)
  */
 void
 drawstatus(pp)
 	PLAYER	*pp;
+{
 	int	i;
 	PLAYER	*np;
 	cgoto(pp, STAT_AMMO_ROW, STAT_LABEL_COL);
 	outstr(pp, "Ammo:", 5);
-	(void) sprintf(Buf, "%3d", pp->p_ammo);
+	(void) snprintf(Buf, sizeof(Buf), "%3d", pp->p_ammo);
 	cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 	outstr(pp, Buf, 3);
 	cgoto(pp, STAT_GUN_ROW, STAT_LABEL_COL);
 	outstr(pp, "Gun:", 4);
 	cgoto(pp, STAT_GUN_ROW, STAT_VALUE_COL);
 	outstr(pp, (pp->p_ncshot < MAXNCSHOT) ? " ok" : "   ", 3);
 	cgoto(pp, STAT_DAM_ROW, STAT_LABEL_COL);
 	outstr(pp, "Damage:", 7);
-	(void) sprintf(Buf, "%2d/%2d", pp->p_damage, pp->p_damcap);
+	(void) snprintf(Buf, sizeof(Buf), "%2d/%2d", pp->p_damage,
 		pp->p_damcap);
 	cgoto(pp, STAT_DAM_ROW, STAT_VALUE_COL);
 	outstr(pp, Buf, 5);
 	cgoto(pp, STAT_KILL_ROW, STAT_LABEL_COL);
 	outstr(pp, "Kills:", 6);
-	(void) sprintf(Buf, "%3d", (pp->p_damcap - MAXDAM) / 2);
+	(void) snprintf(Buf, sizeof(Buf), "%3d", (pp->p_damcap - MAXDAM) / 2);
 	cgoto(pp, STAT_KILL_ROW, STAT_VALUE_COL);
 	outstr(pp, Buf, 3);
 	cgoto(pp, STAT_PLAY_ROW, STAT_LABEL_COL);
 	outstr(pp, "Player:", 7);
 	for (i = STAT_PLAY_ROW + 1, np = Player; np < End_player; np++) {
-		(void) sprintf(Buf, "%5.2f%c%-10.10s %c", np->p_ident->i_score,
+		(void) snprintf(Buf, sizeof(Buf), "%5.2f%c%-10.10s %c",
 			np->p_ident->i_score,
 			stat_char(np), np->p_ident->i_name,
 			np->p_ident->i_team);
 		cgoto(pp, i++, STAT_NAME_COL);
 		outstr(pp, Buf, STAT_NAME_LEN);
+	}
 # ifdef MONITOR
 	cgoto(pp, STAT_MON_ROW, STAT_LABEL_COL);
 	outstr(pp, "Monitor:", 8);
 	for (i = STAT_MON_ROW + 1, np = Monitor; np < End_monitor; np++) {
-		(void) sprintf(Buf, "%5.5s %-10.10s %c", " ",
+		(void) snprintf(Buf, sizeof(Buf), "%5.5s %-10.10s %c", " ",
 			np->p_ident->i_name, np->p_ident->i_team);
 		cgoto(pp, i++, STAT_NAME_COL);
 		outstr(pp, Buf, STAT_NAME_LEN);
+	}
 # endif
+}
 void
 look(pp)
 	PLAYER	*pp;
+{
 	int	x, y;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: driver.c,v 1.13 2008/01/28 03:23:29 dholland Exp $	*/
+/*	$NetBSD: driver.c,v 1.14 2009/06/28 21:12:35 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  * + Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * + 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.
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: driver.c,v 1.13 2008/01/28 03:23:29 dholland Exp $");
+__RCSID("$NetBSD: driver.c,v 1.14 2009/06/28 21:12:35 dholland Exp $");
 #endif /* not lint */
 # include	<sys/ioctl.h>
 # include	<sys/stat.h>
 # include	<sys/time.h>
 # include	<err.h>
 # include	<errno.h>
 # include	<signal.h>
 # include	<stdlib.h>
 # include	<unistd.h>
 # include	"hunt.h"
 # ifndef pdp11
 @@ -480,27 +480,27 @@ checkdam(ouch, gotcha, credit, amt, this
 		  default:
 			break;
 		  case 1:
 			amt = (amt + 1) / 2;
 			break;
 		  case 2:
 			if (gotcha != NULL)
 				message(gotcha, "He has boots on!");
 			return;
+		}
 # endif
 	ouch->p_damage += amt;
 	if (ouch->p_damage <= ouch->p_damcap) {
-		(void) sprintf(Buf, "%2d", ouch->p_damage);
+		(void) snprintf(Buf, sizeof(Buf), "%2d", ouch->p_damage);
 		cgoto(ouch, STAT_DAM_ROW, STAT_VALUE_COL);
 		outstr(ouch, Buf, 2);
 		return;
+	}
 	/* Someone DIED */
 	switch (this_shot_type) {
 	  default:
 		cp = "Killed";
 		break;
 # ifdef FLY
 	  case FALL:
 		cp = "Killed on impact";
 @@ -531,64 +531,68 @@ checkdam(ouch, gotcha, credit, amt, this
 # endif
 # ifdef	VOLCANO
 	  case LAVA:
 		cp = "Baked";
 		break;
 # endif
 # ifdef DRONE
 	  case DSHOT:
 		cp = "Eliminated";
 		break;
 # endif
+	}
 	if (credit == NULL) {
-		(void) sprintf(ouch->p_death, "| %s by %s |", cp,
+		(void) snprintf(ouch->p_death, sizeof(ouch->p_death),
 			"| %s by %s |", cp,
 			(this_shot_type == MINE || this_shot_type == GMINE) ?
 			"a mine" : "act of God");
 		return;
+	}
-	(void) sprintf(ouch->p_death, "| %s by %s |", cp, credit->i_name);
+	(void) snprintf(ouch->p_death, sizeof(ouch->p_death),
 		"| %s by %s |", cp, credit->i_name);
 	if (ouch == gotcha) {		/* No use killing yourself */
 		credit->i_kills--;
 		credit->i_bkills++;
+	}
 	else if (ouch->p_ident->i_team == ' '
 	|| ouch->p_ident->i_team != credit->i_team) {
 		credit->i_kills++;
 		credit->i_gkills++;
+	}
 	else {
 		credit->i_kills--;
 		credit->i_bkills++;
+	}
 	credit->i_score = credit->i_kills / (double) credit->i_entries;
 	ouch->p_ident->i_deaths++;
 	if (ouch->p_nchar == 0)
 		ouch->p_ident->i_stillb++;
 	if (gotcha == NULL)
 		return;
 	gotcha->p_damcap += STABDAM;
 	gotcha->p_damage -= STABDAM;
 	if (gotcha->p_damage < 0)
 		gotcha->p_damage = 0;
-	(void) sprintf(Buf, "%2d/%2d", gotcha->p_damage, gotcha->p_damcap);
+	(void) snprintf(Buf, sizeof(Buf), "%2d/%2d", gotcha->p_damage,
 			gotcha->p_damcap);
 	cgoto(gotcha, STAT_DAM_ROW, STAT_VALUE_COL);
 	outstr(gotcha, Buf, 5);
-	(void) sprintf(Buf, "%3d", (gotcha->p_damcap - MAXDAM) / 2);
+	(void) snprintf(Buf, sizeof(Buf), "%3d",
 			(gotcha->p_damcap - MAXDAM) / 2);
 	cgoto(gotcha, STAT_KILL_ROW, STAT_VALUE_COL);
 	outstr(gotcha, Buf, 3);
-	(void) sprintf(Buf, "%5.2f", gotcha->p_ident->i_score);
+	(void) snprintf(Buf, sizeof(Buf), "%5.2f", gotcha->p_ident->i_score);
 	for (ouch = Player; ouch < End_player; ouch++) {
 		cgoto(ouch, STAT_PLAY_ROW + 1 + (gotcha - Player),
 			STAT_NAME_COL);
 		outstr(ouch, Buf, 5);
+	}
 # ifdef MONITOR
 	for (ouch = Monitor; ouch < End_monitor; ouch++) {
 		cgoto(ouch, STAT_PLAY_ROW + 1 + (gotcha - Player),
 			STAT_NAME_COL);
 		outstr(ouch, Buf, 5);
+	}
 # endif
+}
 @@ -661,27 +665,27 @@ zap(pp, was_player, i)
 					break;
 			if (y >= 0 && slime_req[y] > shot_req[x]) {
 				x = slime_req[y];
 				len = SLIME;
+			}
 			else if (x != 0) {
 				len = shot_type[x];
 				x = shot_req[x];
+			}
+		}
 		if (x > 0) {
 			(void) add_shot(len, pp->p_y, pp->p_x, pp->p_face, x,
 				(PLAYER *) NULL, TRUE, SPACE);
-			(void) sprintf(Buf, "%s detonated.",
+			(void) snprintf(Buf, sizeof(Buf), "%s detonated.",
 				pp->p_ident->i_name);
 			for (np = Player; np < End_player; np++)
 				message(np, Buf);
 # ifdef MONITOR
 			for (np = Monitor; np < End_monitor; np++)
 				message(np, Buf);
 # endif
 # ifdef BOOTS
 			while (pp->p_nboots-- > 0) {
 				for (np = Boot; np < &Boot[NBOOTS]; np++)
 					if (np->p_flying < 0)
 						break;
 				if (np >= &Boot[NBOOTS])
 @@ -737,27 +741,27 @@ zap(pp, was_player, i)
 				(PLAYER *) NULL, FALSE, SPACE);
+		}
 # endif
 		sendcom(pp, ENDWIN);
 		(void) putc(' ', pp->p_output);
 		(void) fclose(pp->p_output);
 		End_player--;
 		if (pp != End_player) {
 			memcpy(pp, End_player, sizeof (PLAYER));
 			fdset[i] = fdset[End_player - Player + 3];
 			fdset[End_player - Player + 3].fd = -1;
-			(void) sprintf(Buf, "%5.2f%c%-10.10s %c",
+			(void) snprintf(Buf, sizeof(Buf), "%5.2f%c%-10.10s %c",
 				pp->p_ident->i_score, stat_char(pp),
 				pp->p_ident->i_name, pp->p_ident->i_team);
 			n = STAT_PLAY_ROW + 1 + (pp - Player);
 			for (np = Player; np < End_player; np++) {
 				cgoto(np, n, STAT_NAME_COL);
 				outstr(np, Buf, STAT_NAME_LEN);
+			}
 # ifdef MONITOR
 			for (np = Monitor; np < End_monitor; np++) {
 				cgoto(np, n, STAT_NAME_COL);
 				outstr(np, Buf, STAT_NAME_LEN);
+			}
 # endif
 @@ -776,27 +780,28 @@ zap(pp, was_player, i)
 			ce(np);
+		}
+	}
 	else {
 		sendcom(pp, ENDWIN);
 		(void) putc(LAST_PLAYER, pp->p_output);
 		(void) fclose(pp->p_output);
 		End_monitor--;
 		if (pp != End_monitor) {
 			memcpy(pp, End_monitor, sizeof (PLAYER));
 			fdset[i] = fdset[End_monitor - Monitor + MAXPL + 3];
 			fdset[End_monitor - Monitor + MAXPL + 3].fd = -1;
-			(void) sprintf(Buf, "%5.5s %-10.10s %c", " ",
+			(void) snprintf(Buf, sizeof(Buf), "%5.5s %-10.10s %c",
 				" ",
 				pp->p_ident->i_name, pp->p_ident->i_team);
 			n = STAT_MON_ROW + 1 + (pp - Player);
 			for (np = Player; np < End_player; np++) {
 				cgoto(np, n, STAT_NAME_COL);
 				outstr(np, Buf, STAT_NAME_LEN);
+			}
 			for (np = Monitor; np < End_monitor; np++) {
 				cgoto(np, n, STAT_NAME_COL);
 				outstr(np, Buf, STAT_NAME_LEN);
+			}
 		} else
 			fdset[i].fd = -1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: execute.c,v 1.5 2008/01/28 03:23:29 dholland Exp $	*/
+/*	$NetBSD: execute.c,v 1.6 2009/06/28 21:12:35 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  * + Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * + 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.
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: execute.c,v 1.5 2008/01/28 03:23:29 dholland Exp $");
+__RCSID("$NetBSD: execute.c,v 1.6 2009/06/28 21:12:35 dholland Exp $");
 #endif /* not lint */
 # include	<stdlib.h>
 # include	"hunt.h"
 static	void	cloak(PLAYER *);
 static	void	turn_player(PLAYER *, int);
 static	void	fire(PLAYER *, int);
 static	void	fire_slime(PLAYER *, int);
 static	void	move_player(PLAYER *, int);
 static	void	pickup(PLAYER *, int, int, int, int);
 static	void	scan(PLAYER *);
 @@ -356,27 +356,27 @@ fire(pp, req_index)
 	while (req_index >= 0 && pp->p_ammo < shot_req[req_index])
 		req_index--;
 	if (req_index < 0) {
 		message(pp, "Not enough charges.");
 		return;
+	}
 	if (pp->p_ncshot > MAXNCSHOT)
 		return;
 	if (pp->p_ncshot++ == MAXNCSHOT) {
 		cgoto(pp, STAT_GUN_ROW, STAT_VALUE_COL);
 		outstr(pp, "   ", 3);
+	}
 	pp->p_ammo -= shot_req[req_index];
-	(void) sprintf(Buf, "%3d", pp->p_ammo);
+	(void) snprintf(Buf, sizeof(Buf), "%3d", pp->p_ammo);
 	cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 	outstr(pp, Buf, 3);
 	add_shot(shot_type[req_index], pp->p_y, pp->p_x, pp->p_face,
 		shot_req[req_index], pp, FALSE, pp->p_face);
 	pp->p_undershot = TRUE;
 	/*
 	 * Show the object to everyone
 	 */
 	showexpl(pp->p_y, pp->p_x, shot_type[req_index]);
 	for (pp = Player; pp < End_player; pp++)
 		sendcom(pp, REFRESH);
 @@ -405,27 +405,27 @@ fire_slime(pp, req_index)
 	while (req_index >= 0 && pp->p_ammo < slime_req[req_index])
 		req_index--;
 	if (req_index < 0) {
 		message(pp, "Not enough charges.");
 		return;
+	}
 	if (pp->p_ncshot > MAXNCSHOT)
 		return;
 	if (pp->p_ncshot++ == MAXNCSHOT) {
 		cgoto(pp, STAT_GUN_ROW, STAT_VALUE_COL);
 		outstr(pp, "   ", 3);
+	}
 	pp->p_ammo -= slime_req[req_index];
-	(void) sprintf(Buf, "%3d", pp->p_ammo);
+	(void) snprintf(Buf, sizeof(Buf), "%3d", pp->p_ammo);
 	cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 	outstr(pp, Buf, 3);
 	add_shot(SLIME, pp->p_y, pp->p_x, pp->p_face,
 		slime_req[req_index] * SLIME_FACTOR, pp, FALSE, pp->p_face);
 	pp->p_undershot = TRUE;
 	/*
 	 * Show the object to everyone
 	 */
 	showexpl(pp->p_y, pp->p_x, SLIME);
 	for (pp = Player; pp < End_player; pp++)
 		sendcom(pp, REFRESH);
 @@ -526,51 +526,51 @@ static void
 cloak(pp)
 	PLAYER	*pp;
+{
 	if (pp->p_ammo <= 0) {
 		message(pp, "No more charges");
 		return;
+	}
 # ifdef BOOTS
 	if (pp->p_nboots > 0) {
 		message(pp, "Boots are too noisy to cloak!");
 		return;
+	}
 # endif
-	(void) sprintf(Buf, "%3d", --pp->p_ammo);
+	(void) snprintf(Buf, sizeof(Buf), "%3d", --pp->p_ammo);
 	cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 	outstr(pp, Buf, 3);
 	pp->p_cloak += CLOAKLEN;
 	if (pp->p_scan >= 0)
 		pp->p_scan = -1;
 	showstat(pp);
+}
 /*
  * scan:
  *	Turn on or increase length of a scan
  */
 static void
 scan(pp)
 	PLAYER	*pp;
+{
 	if (pp->p_ammo <= 0) {
 		message(pp, "No more charges");
 		return;
+	}
-	(void) sprintf(Buf, "%3d", --pp->p_ammo);
+	(void) snprintf(Buf, sizeof(Buf), "%3d", --pp->p_ammo);
 	cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 	outstr(pp, Buf, 3);
 	pp->p_scan += SCANLEN;
 	if (pp->p_cloak >= 0)
 		pp->p_cloak = -1;
 	showstat(pp);
+}
 /*
  * pickup:
 @@ -590,18 +590,18 @@ pickup(pp, y, x, prob, obj)
 		req = BULREQ;
 		break;
 	  case GMINE:
 		req = GRENREQ;
 		break;
 	  default:
 		abort();
+	}
 	if (rand_num(100) < prob)
 		add_shot(obj, y, x, LEFTS, req, (PLAYER *) NULL,
 			TRUE, pp->p_face);
 	else {
 		pp->p_ammo += req;
-		(void) sprintf(Buf, "%3d", pp->p_ammo);
+		(void) snprintf(Buf, sizeof(Buf), "%3d", pp->p_ammo);
 		cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 		outstr(pp, Buf, 3);
+	}
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: faketalk.c,v 1.11 2007/12/15 19:44:41 perry Exp $	*/
+/*	$NetBSD: faketalk.c,v 1.12 2009/06/28 21:12:35 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  * + Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * + 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.
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: faketalk.c,v 1.11 2007/12/15 19:44:41 perry Exp $");
+__RCSID("$NetBSD: faketalk.c,v 1.12 2009/06/28 21:12:35 dholland Exp $");
 #endif /* not lint */
 #include "bsd.h"
 #include "hunt.h"
 #if	defined(TALK_43) || defined(TALK_42)
 # include	<sys/time.h>
 # include	<sys/wait.h>
 # include	<ctype.h>
 # include	<netdb.h>
 # include	<signal.h>
 # include	<stdio.h>
 @@ -154,30 +154,32 @@ faketalk()
 # endif
 		_exit(1);
+	}
 	if ((f = fdopen(service, "r")) == NULL) {
 # ifdef LOG
 		syslog(LOG_ERR, "fdopen failed\n");
 # else
 		warn("faketalk:  fdopen");
 # endif
 		_exit(2);
+	}
 	(void) fgets(buf, BUFSIZ, f);
-	(void) sprintf(buf, "HELO HuntGame@%s\r\n", my_machine_name);
+	(void) snprintf(buf, sizeof(buf),
 			"HELO HuntGame@%s\r\n", my_machine_name);
 	(void) write(service, buf, strlen(buf));
 	(void) fgets(buf, BUFSIZ, f);
-	(void) sprintf(buf, "EXPN %s@%s\r\n", RENDEZVOUS, my_machine_name);
+	(void) snprintf(buf, sizeof(buf),
 			"EXPN %s@%s\r\n", RENDEZVOUS, my_machine_name);
 	(void) write(service, buf, strlen(buf));
 	while (fgets(buf, BUFSIZ, f) != NULL) {
 		char	*s, *t;
 		if (buf[0] != '2' || buf[1] != '5' || buf[2] != '0')
 			break;
 		if ((s = strchr(buf + 4, '<')) == NULL)
 			s = buf + 4, t = buf + strlen(buf) - 1;
 		else {
 			s += 1;
 			if ((t = strrchr(s, '>')) == NULL)
 				t = s + strlen(s) - 1;
 			else

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shots.c,v 1.6 2006/03/17 23:34:37 abs Exp $	*/
+/*	$NetBSD: shots.c,v 1.7 2009/06/28 21:12:35 dholland Exp $	*/
 /*
  * Copyright (c) 1983-2003, Regents of the University of California.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
+ *
  * + Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * + 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.
 @@ -22,27 +22,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
  * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * OWNER 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 <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: shots.c,v 1.6 2006/03/17 23:34:37 abs Exp $");
+__RCSID("$NetBSD: shots.c,v 1.7 2009/06/28 21:12:35 dholland Exp $");
 #endif /* not lint */
 # include	<err.h>
 # include	<signal.h>
 # include	<stdlib.h>
 # include	"hunt.h"
 # define	PLUS_DELTA(x, max)	if (x < max) x++; else x--
 # define	MINUS_DELTA(x, min)	if (x > min) x--; else x++
 static	void	chkshot(BULLET *, BULLET *);
 static	void	chkslime(BULLET *, BULLET *);
 static	void	explshot(BULLET *, int, int);
 @@ -306,27 +306,28 @@ move_normal_shot(bp)
 			    if (rand_num(100) < 10) {
 				if (bp->b_owner != NULL)
 					message(bp->b_owner,
 					    "Your charge was absorbed!");
 				if (bp->b_score != NULL)
 					bp->b_score->i_robbed += bp->b_charge;
 				pp->p_ammo += bp->b_charge;
 				if (pp->p_damage + bp->b_size * MINDAM
 				    > pp->p_damcap)
 					pp->p_ident->i_saved++;
 				message(pp, "Absorbed charge (good shield!)");
 				pp->p_ident->i_absorbed += bp->b_charge;
 				free((char *) bp);
-				(void) sprintf(Buf, "%3d", pp->p_ammo);
+				(void) snprintf(Buf, sizeof(Buf),
 						"%3d", pp->p_ammo);
 				cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 				outstr(pp, Buf, 3);
 				return FALSE;
+			    }
 			    pp->p_ident->i_faced += bp->b_charge;
+			}
 			/*
 			 * Small chance that the bullet just misses the
 			 * person.  If so, the bullet just goes on its
 			 * merry way without exploding.
 			 */
 			if (rand_num(100) < 5) {
 				pp->p_ident->i_ducked += bp->b_charge;
 @@ -487,27 +488,27 @@ drone_move:
 	  case RIGHT:
 	  case BELOW:
 	  case ABOVE:
 		/*
 		 * give the person a chance to catch a
 		 * drone if s/he is facing it
 		 */
 		if (rand_num(100) < 1 &&
 		opposite(bp->b_face, Maze[bp->b_y][bp->b_x])) {
 			pp = play_at(bp->b_y, bp->b_x);
 			pp->p_ammo += bp->b_charge;
 			message(pp, "**** Absorbed drone ****");
 			free((char *) bp);
-			(void) sprintf(Buf, "%3d", pp->p_ammo);
+			(void) snprintf(Buf, sizeof(buf), "%3d", pp->p_ammo);
 			cgoto(pp, STAT_AMMO_ROW, STAT_VALUE_COL);
 			outstr(pp, Buf, 3);
 			return FALSE;
+		}
 		bp->b_expl = TRUE;
 		break;
+	}
 	return TRUE;
+}
 # endif
 /*
  * save_bullet: