avoid buffer overrun. fix from openbsd.

[bsdgames-darwin.git] / trek / srscan.c

diff --git a/trek/srscan.c b/trek/srscan.c
index 6c28726275781d43039758c9844cd8a13f1f3613..7456d233db9c0766edb478bee2baa25a3bdfd9a8 100644 (file)
--- a/trek/srscan.c
+++ b/trek/srscan.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: srscan.c,v 1.3 1995/04/22 10:59:31 cgd Exp $   */
+/*     $NetBSD: srscan.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -33,16 +33,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)srscan.c   8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: srscan.c,v 1.3 1995/04/22 10:59:31 cgd Exp $";
+__RCSID("$NetBSD: srscan.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $");
 #endif
 #endif /* not lint */
 
-# include      "trek.h"
-# include      "getpar.h"
+#include <stdio.h>
+#include "trek.h"
+#include "getpar.h"
 
 /*
 **  SHORT RANGE SENSOR SCAN
@@ -59,7 +61,7 @@ static char rcsid[] = "$NetBSD: srscan.c,v 1.3 1995/04/22 10:59:31 cgd Exp $";
 **     The current quadrant is filled in on the computer chart.
 */
 
-char   *Color[4] =
+const char     *const Color[4] =
 {
        "GREEN",
        "DOCKED",
@@ -67,17 +69,16 @@ char        *Color[4] =
        "RED"
 };
 
+void
 srscan(f)
 int    f;
 {
-       register int            i, j;
-       register int            statinfo;
-       char                    *s;
-       int                     percent;
-       struct quad             *q;
-       extern struct cvntab    Skitab[];
-       extern struct cvntab    Lentab[];
-       struct cvntab           *p;
+       int             i, j;
+       int             statinfo;
+       const char      *s;
+       int             percent;
+       struct quad     *q = NULL;
+       const struct cvntab     *p;
 
        if (f >= 0 && check_out(SRSCAN))
        {