Nuke whitespace foolish enough to expose itself during the great

"warning:" rectification.

18 files changed, 314 insertions, 314 deletions

diff --git a/games/adventure/crc.c b/games/adventure/crc.c
index d98a8595b04..8354a9a93c5 100644
--- a/games/adventure/crc.c
+++ b/games/adventure/crc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crc.c,v 1.7 2009/10/27 23:59:23 deraadt Exp $	*/
+/*	$OpenBSD: crc.c,v 1.8 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: crc.c,v 1.2 1995/03/21 12:04:59 cgd Exp $	*/
 
 /*-
@@ -107,7 +107,7 @@ crc_start(void)
 	crcval = step = 0;
 }
 
-/* Process nr bytes at a time; ptr points to them */	
+/* Process nr bytes at a time; ptr points to them */
 unsigned long
 crc(const char *ptr, int nr)
 {
diff --git a/games/adventure/main.c b/games/adventure/main.c
index bac7f848130..b7401e5301f 100644
--- a/games/adventure/main.c
+++ b/games/adventure/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.24 2016/12/25 20:30:41 krw Exp $	*/
+/*	$OpenBSD: main.c,v 1.25 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: main.c,v 1.5 1996/05/21 21:53:09 mrg Exp $	*/
 
 /*-
@@ -54,7 +54,7 @@ main(int argc, char *argv[])
 
 	if (pledge("stdio rpath wpath cpath", NULL) == -1)
 		err(1, "pledge");
-	
+
 	init();		/* Initialize everything */
 	signal(SIGINT, trapdel);
 
diff --git a/games/adventure/save.c b/games/adventure/save.c
index f430b89e5ba..a39d66da71e 100644
--- a/games/adventure/save.c
+++ b/games/adventure/save.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: save.c,v 1.11 2016/03/08 10:48:39 mestre Exp $	*/
+/*	$OpenBSD: save.c,v 1.12 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: save.c,v 1.2 1995/03/21 12:05:08 cgd Exp $	*/
 
 /*-
@@ -117,7 +117,7 @@ struct savestruct save_array[] =
  * to output the data using checksum to start random #s
  */
 int
-save(const char *outfile)	
+save(const char *outfile)
 {
 	FILE   *out;
 	struct savestruct *p;
diff --git a/games/adventure/vocab.c b/games/adventure/vocab.c
index 113c171089d..5ac5094af3c 100644
--- a/games/adventure/vocab.c
+++ b/games/adventure/vocab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vocab.c,v 1.15 2016/03/08 10:48:39 mestre Exp $	*/
+/*	$OpenBSD: vocab.c,v 1.16 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: vocab.c,v 1.2 1995/03/21 12:05:13 cgd Exp $	*/
 
 /*-
@@ -128,7 +128,7 @@ drop(int object, int where)
  * value: used for storing only
  */
 int
-vocab(const char *word, int type, int value)	
+vocab(const char *word, int type, int value)
 {
 	int	adr;
 	const char *s;
diff --git a/games/backgammon/teachgammon/teach.c b/games/backgammon/teachgammon/teach.c
index b8bdfb0e861..4c882f762b9 100644
--- a/games/backgammon/teachgammon/teach.c
+++ b/games/backgammon/teachgammon/teach.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: teach.c,v 1.17 2017/01/20 01:12:44 krw Exp $	*/
+/*	$OpenBSD: teach.c,v 1.18 2017/01/21 08:22:57 krw Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -76,35 +76,35 @@ main(int argc, char *argv[])
 			wrboard();
 			if ((i = text(intro2)))
 				break;
-		
+
 		case 3:
 			if ((i = text(moves)))
 				break;
-		
+
 		case 4:
 			if ((i = text(removepiece)))
 				break;
-		
+
 		case 5:
 			if ((i = text(hits)))
 				break;
-		
+
 		case 6:
 			if ((i = text(endgame)))
 				break;
-		
+
 		case 7:
 			if ((i = text(doubl)))
 				break;
-		
+
 		case 8:
 			if ((i = text(stragy)))
 				break;
-		
+
 		case 9:
 			if ((i = text(prog)))
 				break;
-		
+
 		case 10:
 			if ((i = text(lastch)))
 				break;
diff --git a/games/backgammon/teachgammon/tutor.h b/games/backgammon/teachgammon/tutor.h
index 0b8f23c7670..89824a4901c 100644
--- a/games/backgammon/teachgammon/tutor.h
+++ b/games/backgammon/teachgammon/tutor.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tutor.h,v 1.6 2017/01/20 01:55:25 tb Exp $	*/
+/*	$OpenBSD: tutor.h,v 1.7 2017/01/21 08:22:57 krw Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -51,7 +51,7 @@ extern	const char	*const intro1[];
 extern	const char	*const intro2[];
 extern	const char	*const lastch[];
 extern	const char	*const list[];
-extern	int	 	maxmoves;
+extern	int		maxmoves;
 extern	const char	*const moves[];
 extern	const char	*const opts;
 extern	const char	*const prog[];
diff --git a/games/hunt/huntd/answer.c b/games/hunt/huntd/answer.c
index aad1845931f..ac24060acf1 100644
--- a/games/hunt/huntd/answer.c
+++ b/games/hunt/huntd/answer.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: answer.c,v 1.21 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: answer.c,v 1.22 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: answer.c,v 1.3 1997/10/10 16:32:50 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
@@ -93,8 +93,8 @@ answer_first(void)
 	sp->sourcelen = socklen;
 
 	/* Warn if we lose connection info: */
-	if (socklen > sizeof Spawn->source) 
-		logx(LOG_WARNING, 
+	if (socklen > sizeof Spawn->source)
+		logx(LOG_WARNING,
 		    "struct sockaddr is not big enough! (%d > %zu)",
 		    socklen, sizeof Spawn->source);
 
@@ -122,11 +122,11 @@ answer_next(struct spawn *sp)
 	u_int32_t		version;
 	FILE			*conn;
 	int			len;
-	char 			teamstr[] = "[x]";
+	char			teamstr[] = "[x]";
 
 	if (sp->reading_msg) {
 		/* Receive a message from a player */
-		len = read(sp->fd, sp->msg + sp->msglen, 
+		len = read(sp->fd, sp->msg + sp->msglen,
 		    sizeof sp->msg - sp->msglen);
 		if (len < 0)
 			goto error;
@@ -148,7 +148,7 @@ answer_next(struct spawn *sp)
 	}
 
 	/* Fill the buffer */
-	len = read(sp->fd, sp->inbuf + sp->inlen, 
+	len = read(sp->fd, sp->inbuf + sp->inlen,
 	    sizeof sp->inbuf - sp->inlen);
 	if (len <= 0)
 		goto error;
@@ -233,7 +233,7 @@ answer_next(struct spawn *sp)
 	}
 
 	/* Find the player's running scorecard */
-	pp->p_ident = get_ident(&sp->source, sp->sourcelen, sp->uid, 
+	pp->p_ident = get_ident(&sp->source, sp->sourcelen, sp->uid,
 	    sp->name, sp->team);
 	pp->p_output = conn;
 	pp->p_death[0] = '\0';
@@ -253,7 +253,7 @@ answer_next(struct spawn *sp)
 	return TRUE;
 
 error:
-	if (len < 0) 
+	if (len < 0)
 		logit(LOG_WARNING, "read");
 	else
 		logx(LOG_WARNING, "lost connection to new client");
@@ -278,9 +278,9 @@ stmonitor(PLAYER *pp)
 	drawmaze(pp);
 
 	/* Put the monitor's name near the bottom right on all screens: */
-	outyx(ALL_PLAYERS, 
+	outyx(ALL_PLAYERS,
 		STAT_MON_ROW + 1 + (pp - Monitor), STAT_NAME_COL,
-		"%5.5s%c%-10.10s %c", " ", 
+		"%5.5s%c%-10.10s %c", " ",
 		stat_char(pp), pp->p_ident->i_name, pp->p_ident->i_team);
 
 	/* Ready the monitor: */
@@ -378,8 +378,8 @@ stplayer(PLAYER *newpp, int enter_status)
 		check(pp, y, x);
 
 	/* Create a score line for the new player: */
-	(void) snprintf(Buf, sizeof Buf, "%5.2f%c%-10.10s %c", 
-		newpp->p_ident->i_score, stat_char(newpp), 
+	(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);
 	len = strlen(Buf);
 	y = STAT_PLAY_ROW + 1 + (newpp - Player);
@@ -457,7 +457,7 @@ get_ident(struct sockaddr *sa, int salen, u_long uid, char *name, char team)
 		if (ip->i_team != team) {
 			logx(LOG_INFO, "player %s %s team %c",
 				name,
-				team == ' ' ? "left" : ip->i_team == ' ' ? 
+				team == ' ' ? "left" : ip->i_team == ' ' ?
 					"joined" : "changed to",
 				team == ' ' ? ip->i_team : team);
 			ip->i_team = team;
@@ -497,7 +497,7 @@ get_ident(struct sockaddr *sa, int salen, u_long uid, char *name, char team)
 		Scores = ip;
 
 		logx(LOG_INFO, "new player: %s%s%c%s",
-			name, 
+			name,
 			team == ' ' ? "" : " (team ",
 			team,
 			team == ' ' ? "" : ")");
diff --git a/games/hunt/huntd/conf.c b/games/hunt/huntd/conf.c
index 1f1c8aa9630..8c36bb1f110 100644
--- a/games/hunt/huntd/conf.c
+++ b/games/hunt/huntd/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.12 2017/01/20 03:47:31 krw Exp $	*/
+/*	$OpenBSD: conf.c,v 1.13 2017/01/21 08:22:57 krw Exp $	*/
 /* David Leonard <d@openbsd.org>, 1999. Public domain. */
 
 #include <sys/select.h>
@@ -129,7 +129,7 @@ parse_int(char *p, struct kwvar *kvp, const char *fnm, int *linep)
 
 	/* expect a number */
 	valuestart = p;
-	if (*p == '-') 
+	if (*p == '-')
 		p++;
 	digitstart = p;
 	while (isdigit((unsigned char)*p))
@@ -140,12 +140,12 @@ parse_int(char *p, struct kwvar *kvp, const char *fnm, int *linep)
 		*p = '\0';
 		newval = atoi(valuestart);
 		*p = savec;
-		logx(LOG_INFO, "%s:%d: %s: %d -> %d", 
+		logx(LOG_INFO, "%s:%d: %s: %d -> %d",
 			fnm, *linep, kvp->kw, *(int *)kvp->var, newval);
 		*(int *)kvp->var = newval;
 		return p;
 	} else {
-		logx(LOG_ERR, "%s:%d: invalid integer value \"%s\"", 
+		logx(LOG_ERR, "%s:%d: invalid integer value \"%s\"",
 		    fnm, *linep, valuestart);
 		return NULL;
 	}
@@ -203,14 +203,14 @@ parse_line(char *buf, char *fnm, int *line)
 	/* match the configuration variable name */
 	savec = *endword;
 	*endword = '\0';
-	for (kvp = keywords; kvp->kw; kvp++) 
+	for (kvp = keywords; kvp->kw; kvp++)
 		if (strcmp(kvp->kw, word) == 0)
 			break;
 	*endword = savec;
 
 	if (kvp->kw == NULL) {
-		logx(LOG_ERR, 
-		    "%s:%d: unrecognised variable \"%.*s\"", 
+		logx(LOG_ERR,
+		    "%s:%d: unrecognised variable \"%.*s\"",
 		    fnm, *line, (int)(endword - word), word);
 		return;
 	}
@@ -230,7 +230,7 @@ parse_line(char *buf, char *fnm, int *line)
 
 	/* parse the value */
 	p = parse_value(p, kvp, fnm, line);
-	if (!p) 
+	if (!p)
 		return;
 
 	/* skip trailing whitespace */
@@ -268,7 +268,7 @@ load_config(FILE *f, char *fnm)
 }
 
 /*
- * load various config file, allowing later ones to 
+ * load various config file, allowing later ones to
  * overwrite earlier values
  */
 void
@@ -276,10 +276,10 @@ config(void)
 {
 	char *home;
 	char nm[MAXNAMLEN + 1];
-	static char *fnms[] = { 
+	static char *fnms[] = {
 		"/etc/hunt.conf",
-		"%s/.hunt.conf", 
-		".hunt.conf", 
+		"%s/.hunt.conf",
+		".hunt.conf",
 		NULL
 	};
 	int fn;
@@ -294,7 +294,7 @@ config(void)
 		if ((f = fopen(nm, "r")) != NULL) {
 			load_config(f, nm);
 			fclose(f);
-		} 
+		}
 		else if (errno != ENOENT)
 			logit(LOG_WARNING, "%s", nm);
 	}
diff --git a/games/hunt/huntd/draw.c b/games/hunt/huntd/draw.c
index 63a8c565eb0..d04023e2cad 100644
--- a/games/hunt/huntd/draw.c
+++ b/games/hunt/huntd/draw.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: draw.c,v 1.10 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: draw.c,v 1.11 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: draw.c,v 1.2 1997/10/10 16:33:04 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
@@ -107,8 +107,8 @@ drawstatus(PLAYER *pp)
 
 	outyx(pp, STAT_PLAY_ROW, STAT_LABEL_COL, "Player:");
 	for (i = STAT_PLAY_ROW + 1, np = Player; np < End_player; np++, i++) {
-		outyx(pp, i, STAT_NAME_COL, "%5.2f%c%-10.10s %c", 
-			np->p_ident->i_score, stat_char(np), 
+		outyx(pp, i, STAT_NAME_COL, "%5.2f%c%-10.10s %c",
+			np->p_ident->i_score, stat_char(np),
 			np->p_ident->i_name, np->p_ident->i_team);
 	}
 
@@ -191,7 +191,7 @@ see(PLAYER *pp, int face)
 	x = pp->p_x;
 	y = pp->p_y;
 
-	#define seewalk(dx, dy) 					\
+	#define seewalk(dx, dy)						\
 		x += (dx);						\
 		y += (dy);						\
 		sp = &Maze[y][x];					\
@@ -259,7 +259,7 @@ void
 showstat(PLAYER *pp)
 {
 
-	outyx(ALL_PLAYERS, 
+	outyx(ALL_PLAYERS,
 		STAT_PLAY_ROW + 1 + (pp - Player), STAT_SCAN_COL,
 		"%c", stat_char(pp));
 }
diff --git a/games/hunt/huntd/driver.c b/games/hunt/huntd/driver.c
index e647a39dd95..a854f92b88d 100644
--- a/games/hunt/huntd/driver.c
+++ b/games/hunt/huntd/driver.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: driver.c,v 1.28 2016/03/28 11:49:45 chl Exp $	*/
+/*	$OpenBSD: driver.c,v 1.29 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: driver.c,v 1.5 1997/10/20 00:37:16 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
@@ -141,7 +141,7 @@ again:
 			read_fds = Fds_mask;
 			errno = 0;
 			timerclear(&timeout);
-			nready = select(Num_fds, &read_fds, NULL, NULL, 
+			nready = select(Num_fds, &read_fds, NULL, NULL,
 			    &timeout);
 			if (nready < 0 && errno != EINTR) {
 				logit(LOG_ERR, "select");
@@ -153,7 +153,7 @@ again:
 			/*
 			 * Nothing was ready. We do some work now
 			 * to see if the simulation has any pending work
-			 * to do, and decide if we need to block 
+			 * to do, and decide if we need to block
 			 * indefinitely or just timeout.
 			 */
 			do {
@@ -171,7 +171,7 @@ again:
 				 * just block waiting for external activity
 				 */
 					to = NULL;
-				
+
 				read_fds = Fds_mask;
 				errno = 0;
 				nready = select(Num_fds, &read_fds, NULL, NULL, 
@@ -196,7 +196,7 @@ again:
 			fd = sp->fd;
 			if (FD_ISSET(fd, &Have_inp) && answer_next(sp)) {
 				/*
-				 * Remove from the spawn list. (fd remains in 
+				 * Remove from the spawn list. (fd remains in
 				 * read set).
 				 */
 				*sp->prevnext = sp->next;
@@ -211,7 +211,7 @@ again:
 				if (first && should_announce)
 					announce_game();
 				first = FALSE;
-			} 
+			}
 			sp = spnext;
 		}
 
@@ -436,7 +436,7 @@ init(int background)
 		Server_socket = socket(AF_INET, SOCK_DGRAM, 0);
 
 		/* Permit multiple huntd's on the same port. */
-		if (setsockopt(Server_socket, SOL_SOCKET, SO_REUSEPORT, &true, 
+		if (setsockopt(Server_socket, SOL_SOCKET, SO_REUSEPORT, &true,
 		    sizeof true) < 0)
 			logit(LOG_ERR, "setsockopt SO_REUSEADDR");
 
@@ -596,7 +596,7 @@ checkdam(PLAYER *victim, PLAYER *attacker, IDENT *credit, int damage,
 		}
 
 		/* Set the death message: */
-		(void) snprintf(victim->p_death, sizeof victim->p_death, 
+		(void) snprintf(victim->p_death, sizeof victim->p_death,
 			"| %s by %s |", cp, blame);
 
 		/* No further score crediting needed. */
@@ -604,14 +604,14 @@ checkdam(PLAYER *victim, PLAYER *attacker, IDENT *credit, int damage,
 	}
 
 	/* Set the death message: */
-	(void) snprintf(victim->p_death, sizeof victim->p_death, 
+	(void) snprintf(victim->p_death, sizeof victim->p_death,
 		"| %s by %s |", cp, credit->i_name);
 
 	if (victim == attacker) {
 		/* No use killing yourself. */
 		credit->i_kills--;
 		credit->i_bkills++;
-	} 
+	}
 	else if (victim->p_ident->i_team == ' '
 	    || victim->p_ident->i_team != credit->i_team) {
 		/* A cross-team kill: */
@@ -642,7 +642,7 @@ checkdam(PLAYER *victim, PLAYER *attacker, IDENT *credit, int damage,
 			attacker->p_damage = 0;
 
 		/* Tell the attacker his new strength: */
-		outyx(attacker, STAT_DAM_ROW, STAT_VALUE_COL, "%2d/%2d", 
+		outyx(attacker, STAT_DAM_ROW, STAT_VALUE_COL, "%2d/%2d",
 			attacker->p_damage, attacker->p_damcap);
 
 		/* Tell the attacker his new 'kill count': */
@@ -753,12 +753,12 @@ zap(PLAYER *pp, FLAG was_player)
 			char buf[BUFSIZ];
 
 			/* Detonate: */
-			(void) add_shot(expl_type, pp->p_y, pp->p_x, 
-			    pp->p_face, expl_charge, (PLAYER *) NULL, 
+			(void) add_shot(expl_type, pp->p_y, pp->p_x,
+			    pp->p_face, expl_charge, (PLAYER *) NULL,
 			    TRUE, SPACE);
 
 			/* Explain what the explosion is about. */
-			snprintf(buf, sizeof buf, "%s detonated.", 
+			snprintf(buf, sizeof buf, "%s detonated.",
 				pp->p_ident->i_name);
 			message(ALL_PLAYERS, buf);
 
@@ -799,7 +799,7 @@ zap(PLAYER *pp, FLAG was_player)
 		volcano += pp->p_ammo - expl_charge;
 
 		/* Volcano eruption: */
-		if (conf_volcano && rand_num(100) < volcano / 
+		if (conf_volcano && rand_num(100) < volcano /
 		    conf_volcano_max) {
 			/* Erupt near the middle of the map */
 			do {
@@ -840,8 +840,8 @@ zap(PLAYER *pp, FLAG was_player)
 		if (pp != End_player) {
 			/* Move the last player into the gap: */
 			memcpy(pp, End_player, sizeof *pp);
-			outyx(ALL_PLAYERS, 
-				STAT_PLAY_ROW + 1 + (pp - Player), 
+			outyx(ALL_PLAYERS,
+				STAT_PLAY_ROW + 1 + (pp - Player),
 				STAT_NAME_COL,
 				"%5.2f%c%-10.10s %c",
 				pp->p_ident->i_score, stat_char(pp),
@@ -863,7 +863,7 @@ zap(PLAYER *pp, FLAG was_player)
 		End_monitor--;
 		if (pp != End_monitor) {
 			memcpy(pp, End_monitor, sizeof *pp);
-			outyx(ALL_PLAYERS, 
+			outyx(ALL_PLAYERS,
 				STAT_MON_ROW + 1 + (pp - Player), STAT_NAME_COL,
 				"%5.5s %-10.10s %c", " ",
 				pp->p_ident->i_name, pp->p_ident->i_team);
@@ -1017,7 +1017,7 @@ send_stats(void)
 
 /*
  * print_stats:
- * 	emit the game statistics
+ *	emit the game statistics
  */
 void
 print_stats(FILE *fp)
diff --git a/games/hunt/huntd/execute.c b/games/hunt/huntd/execute.c
index c54cd4cc157..be377c2ccdb 100644
--- a/games/hunt/huntd/execute.c
+++ b/games/hunt/huntd/execute.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: execute.c,v 1.13 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: execute.c,v 1.14 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: execute.c,v 1.2 1997/10/10 16:33:13 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
@@ -93,7 +93,7 @@ execute(PLAYER *pp)
 			sendcom(pp, REDRAW);
 			break;
 		  case 'q':
-			(void) strlcpy(pp->p_death, "| Quit |", 
+			(void) strlcpy(pp->p_death, "| Quit |",
 			    sizeof pp->p_death);
 			break;
 		}
diff --git a/games/hunt/huntd/expl.c b/games/hunt/huntd/expl.c
index e7211e20ae1..d7e34febc70 100644
--- a/games/hunt/huntd/expl.c
+++ b/games/hunt/huntd/expl.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: expl.c,v 1.14 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: expl.c,v 1.15 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: expl.c,v 1.2 1997/10/10 16:33:18 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
diff --git a/games/hunt/huntd/extern.c b/games/hunt/huntd/extern.c
index 01756bd6ce6..60bae67552f 100644
--- a/games/hunt/huntd/extern.c
+++ b/games/hunt/huntd/extern.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: extern.c,v 1.6 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: extern.c,v 1.7 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: extern.c,v 1.2 1997/10/10 16:33:24 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
diff --git a/games/hunt/huntd/hunt.h b/games/hunt/huntd/hunt.h
index 9ca4d6aa074..d0f6dff6bd0 100644
--- a/games/hunt/huntd/hunt.h
+++ b/games/hunt/huntd/hunt.h
@@ -1,34 +1,34 @@
-/*	$OpenBSD: hunt.h,v 1.5 2003/06/11 08:45:33 pjanzen Exp $	*/
+/*	$OpenBSD: hunt.h,v 1.6 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: hunt.h,v 1.5 1998/09/13 15:27:28 hubertf 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
diff --git a/games/hunt/huntd/makemaze.c b/games/hunt/huntd/makemaze.c
index 3d5df77978c..57efae4c7a9 100644
--- a/games/hunt/huntd/makemaze.c
+++ b/games/hunt/huntd/makemaze.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: makemaze.c,v 1.9 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: makemaze.c,v 1.10 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: makemaze.c,v 1.2 1997/10/10 16:33:43 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
diff --git a/games/hunt/huntd/server.h b/games/hunt/huntd/server.h
index 6e334db3133..75710957f20 100644
--- a/games/hunt/huntd/server.h
+++ b/games/hunt/huntd/server.h
@@ -1,33 +1,33 @@
-/*	$OpenBSD: server.h,v 1.11 2016/01/07 21:29:31 mestre Exp $	*/
+/*	$OpenBSD: server.h,v 1.12 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: hunt.h,v 1.5 1998/09/13 15:27:28 hubertf 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
diff --git a/games/hunt/huntd/shots.c b/games/hunt/huntd/shots.c
index 57191713b56..ea60f98008d 100644
--- a/games/hunt/huntd/shots.c
+++ b/games/hunt/huntd/shots.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: shots.c,v 1.13 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: shots.c,v 1.14 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: shots.c,v 1.3 1997/10/11 08:13:50 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */
 
@@ -558,7 +558,7 @@ drone_move:
 		 * Players have a 1% chance of absorbing a drone,
 		 * if they are facing it.
 		 */
-		if (rand_num(100) < conf_pdroneabsorb && opposite(bp->b_face, 
+		if (rand_num(100) < conf_pdroneabsorb && opposite(bp->b_face,
 		    Maze[bp->b_y][bp->b_x])) {
 
 			/* Feel the power: */
@@ -623,7 +623,7 @@ save_bullet(BULLET *bp)
 	  case BOOT_PAIR:
 		mark_boot(bp);
 		/* FALLTHROUGH */
-		
+
 	  /* The bullet flies over everything else: */
 	  default:
 		Maze[bp->b_y][bp->b_x] = bp->b_type;
@@ -679,7 +679,7 @@ again:
 	switch (Maze[y][x]) {
 	  default:
 		/*
-		 * Flier is over something other than space, a wall 
+		 * Flier is over something other than space, a wall
 		 * or a door. Randomly move (drift) the flier a little bit
 		 * and then try again:
 		 */
@@ -875,7 +875,7 @@ chkslime(BULLET *bp, BULLET *next)
 	*nbp = *bp;
 
 	/* Move it around: */
-	move_slime(nbp, nbp->b_type == SLIME ? conf_slimespeed : 
+	move_slime(nbp, nbp->b_type == SLIME ? conf_slimespeed :
 	    conf_lavaspeed, next);
 }
 
diff --git a/games/hunt/huntd/terminal.c b/games/hunt/huntd/terminal.c
index 1d374704aea..7405e114baa 100644
--- a/games/hunt/huntd/terminal.c
+++ b/games/hunt/huntd/terminal.c
@@ -1,33 +1,33 @@
-/*	$OpenBSD: terminal.c,v 1.13 2016/08/27 02:06:40 guenther Exp $	*/
+/*	$OpenBSD: terminal.c,v 1.14 2017/01/21 08:22:57 krw Exp $	*/
 /*	$NetBSD: terminal.c,v 1.2 1997/10/10 16:34:05 lukem 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 
+ *
+ * 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 
+ *
+ * + 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 
+ * + 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.
- * + Neither the name of the University of California, San Francisco nor 
- *   the names of its contributors may be used to endorse or promote 
- *   products derived from this software without specific prior written 
+ * + Neither the name of the University of California, San Francisco 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 COPYRIGHT HOLDERS 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 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 
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 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.
  */