 @@ -1,14 +1,14 @@
-/*	$NetBSD: input.c,v 1.22 2007/12/15 19:44:38 perry Exp $	*/
+/*	$NetBSD: input.c,v 1.23 2009/05/26 00:00:56 dholland Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
+ *
  * 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.
 @@ -36,27 +36,27 @@
  * Copyright (c) 1987 by Ed James, UC Berkeley.  All rights reserved.
+ *
  * Copy permission is hereby granted provided that this notice is
  * retained on all partial or complete copies.
+ *
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: input.c,v 1.22 2007/12/15 19:44:38 perry Exp $");
+__RCSID("$NetBSD: input.c,v 1.23 2009/05/26 00:00:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include "include.h"
 #include "pathnames.h"
 #define MAXRULES	6
 #define MAXDEPTH	15
 #define RETTOKEN	'\n'
 #define REDRAWTOKEN	'\014'	/* CTRL(L) */
 #define	SHELLTOKEN	'!'
 #define HELPTOKEN	'?'
 @@ -198,27 +198,28 @@ rezero(void)
 	T_STATE = 0;
 	T_RULE = -1;
 	T_CH = -1;
 	T_POS = 0;
 	(void)strcpy(T_STR, "");
+}
 void
 push(int ruleno, int ch)
+{
 	int	newstate, newpos;
 	assert(level < (MAXDEPTH - 1));
-	(void)sprintf(T_STR, st[T_STATE].rule[ruleno].str, tval);
+	(void)snprintf(T_STR, sizeof(T_STR),
 		st[T_STATE].rule[ruleno].str, tval);
 	T_RULE = ruleno;
 	T_CH = ch;
 	newstate = st[T_STATE].rule[ruleno].to_state;
 	newpos = T_POS + strlen(T_STR);
 	ioaddstr(T_POS, T_STR);
 	if (level == 0)
 		ioclrtobot();
 	level++;
 	T_STATE = newstate;
 	T_POS = newpos;
 	T_RULE = -1;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: log.c,v 1.19 2007/12/15 19:44:38 perry Exp $	*/
+/*	$NetBSD: log.c,v 1.20 2009/05/26 00:00:56 dholland Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
+ *
  * 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.
 @@ -36,27 +36,27 @@
  * Copyright (c) 1987 by Ed James, UC Berkeley.  All rights reserved.
+ *
  * Copy permission is hereby granted provided that this notice is
  * retained on all partial or complete copies.
+ *
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: log.c,v 1.19 2007/12/15 19:44:38 perry Exp $");
+__RCSID("$NetBSD: log.c,v 1.20 2009/05/26 00:00:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include "include.h"
 #include "pathnames.h"
 static FILE *score_fp;
 int
 compar(const void *va, const void *vb)
+{
 	const SCORE	*a, *b;
 @@ -74,33 +74,34 @@ compar(const void *va, const void *vb)
 #define SECAHOUR	(SECAMIN * MINAHOUR)
 #define SECADAY		(SECAHOUR * HOURADAY)
 #define DAY(t)		((t) / SECADAY)
 #define HOUR(t)		(((t) % SECADAY) / SECAHOUR)
 #define MIN(t)		(((t) % SECAHOUR) / SECAMIN)
 #define SEC(t)		((t) % SECAMIN)
 const char *
 timestr(int t)
+{
 	static char	s[80];
 	if (DAY(t) > 0)
-		(void)sprintf(s, "%dd+%02dhrs", DAY(t), HOUR(t));
+		(void)snprintf(s, sizeof(s), "%dd+%02dhrs", DAY(t), HOUR(t));
 	else if (HOUR(t) > 0)
-		(void)sprintf(s, "%d:%02d:%02d", HOUR(t), MIN(t), SEC(t));
+		(void)snprintf(s, sizeof(s), "%d:%02d:%02d", HOUR(t), MIN(t),
 			SEC(t));
 	else if (MIN(t) > 0)
-		(void)sprintf(s, "%d:%02d", MIN(t), SEC(t));
+		(void)snprintf(s, sizeof(s), "%d:%02d", MIN(t), SEC(t));
 	else if (SEC(t) > 0)
-		(void)sprintf(s, ":%02d", SEC(t));
+		(void)snprintf(s, sizeof(s), ":%02d", SEC(t));
 	else
 		*s = '\0';
 	return (s);
+}
 void
 open_score_file(void)
+{
 	mode_t old_mask;
 	int score_fd;
 	int flags;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: update.c,v 1.19 2007/12/15 19:44:38 perry Exp $	*/
+/*	$NetBSD: update.c,v 1.20 2009/05/26 00:00:56 dholland Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ed James.
+ *
  * 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.
 @@ -36,27 +36,27 @@
  * Copyright (c) 1987 by Ed James, UC Berkeley.  All rights reserved.
+ *
  * Copy permission is hereby granted provided that this notice is
  * retained on all partial or complete copies.
+ *
  * For more info on this and all of my stuff, mail edjames@berkeley.edu.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)update.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: update.c,v 1.19 2007/12/15 19:44:38 perry Exp $");
+__RCSID("$NetBSD: update.c,v 1.20 2009/05/26 00:00:56 dholland Exp $");
 #endif
 #endif /* not lint */
 #include "include.h"
 /* ARGSUSED */
 void
 update(int dummy __unused)
+{
 	int	i, dir_diff, unclean;
 	PLANE	*pp, *p1, *p2;
 #ifdef SYSV
 @@ -191,70 +191,76 @@ update(int dummy __unused)
 		if (pp->status == S_GONE) {
 			safe_planes++;
 			delete(&air, pp);
+		}
+	}
 	draw_all();
 	for (p1 = air.head; p1 != NULL; p1 = p1->next)
 		for (p2 = p1->next; p2 != NULL; p2 = p2->next)
 			if (too_close(p1, p2, 1)) {
 				static char	buf[80];
-				(void)sprintf(buf, "collided with plane '%c'.",
+				(void)snprintf(buf, sizeof(buf),
 					"collided with plane '%c'.",
 					name(p2));
 				loser(p1, buf);
+			}
 	/*
 	 * Check every other update.  Actually, only add on even updates.
 	 * Otherwise, prop jobs show up *on* entrance.  Remember that
 	 * we don't update props on odd updates.
 	 */
 	if ((rand() % sp->newplane_time) == 0)
 		(void)addplane();
 #ifdef SYSV
 	alarm(sp->update_secs);
 #endif
+}
 const char *
 command(const PLANE *pp)
+{
 	static char	buf[50], *bp, *comm_start;
 	size_t bpsize;
 	buf[0] = '\0';
 	bp = buf;
-	(void)sprintf(bp, "%c%d%c%c%d: ", name(pp), pp->altitude,
+	bpsize = sizeof(buf);
 	(void)snprintf(bp, bpsize, "%c%d%c%c%d: ", name(pp), pp->altitude,
 		(pp->fuel < LOWFUEL) ? '*' : ' ',
 		(pp->dest_type == T_AIRPORT) ? 'A' : 'E', pp->dest_no);
 	comm_start = bp = strchr(buf, '\0');
 	bpsize = buf + sizeof(buf) - bp;
 	if (pp->altitude == 0)
-		(void)sprintf(bp, "Holding @ A%d", pp->orig_no);
+		(void)snprintf(bp, bpsize, "Holding @ A%d", pp->orig_no);
 	else if (pp->new_dir >= MAXDIR || pp->new_dir < 0)
-		(void)strcpy(bp, "Circle");
+		(void)snprintf(bp, bpsize, "Circle");
 	else if (pp->new_dir != pp->dir)
-		(void)sprintf(bp, "%d", dir_deg(pp->new_dir));
+		(void)snprintf(bp, bpsize, "%d", dir_deg(pp->new_dir));
 	bp = strchr(buf, '\0');
 	bpsize = buf + sizeof(buf) - bp;
 	if (pp->delayd)
-		(void)sprintf(bp, " @ B%d", pp->delayd_no);
+		(void)snprintf(bp, bpsize, " @ B%d", pp->delayd_no);
 	bp = strchr(buf, '\0');
 	bpsize = buf + sizeof(buf) - bp;
 	if (*comm_start == '\0' &&
 	    (pp->status == S_UNMARKED || pp->status == S_IGNORED))
-		(void)strcpy(bp, "---------");
+		(void)snprintf(bp, bpsize, "---------");
 	return (buf);
+}
 char
 name(const PLANE *p)
+{
 	if (p->plane_type == 0)
 		return ('A' + p->plane_no);
 	else
 		return ('a' + p->plane_no);
+}
 int