avoid buffer overrun. fix from openbsd.

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

diff --git a/trek/srscan.c b/trek/srscan.c
index b99798e82282bdcf4b1b9a5c709500d5f00b9fd8..7456d233db9c0766edb478bee2baa25a3bdfd9a8 100644 (file)
--- a/trek/srscan.c
+++ b/trek/srscan.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: srscan.c,v 1.5 1999/07/21 13:19:11 hubertf Exp $       */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The 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
@@ -31,13 +33,18 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)srscan.c   5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: srscan.c,v 1.2 1993/08/01 18:49:56 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)srscan.c   8.1 (Berkeley) 5/31/93";
+#else
+__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
@@ -54,7 +61,7 @@ static char rcsid[] = "$Id: srscan.c,v 1.2 1993/08/01 18:49:56 mycroft Exp $";
 **     The current quadrant is filled in on the computer chart.
 */
 
-char   *Color[4] =
+const char     *const Color[4] =
 {
        "GREEN",
        "DOCKED",
@@ -62,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))
        {