unstr: Check that the input filename fits in the buffer.

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

diff --git a/trek/dock.c b/trek/dock.c
index 7dcc1f5215e95aca7f2cb360732dccb02195a362..2e93600d1bede1c632f09701e4d974be076a01bf 100644 (file)
--- a/trek/dock.c
+++ b/trek/dock.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: dock.c,v 1.3 1995/04/22 10:58:45 cgd Exp $     */
+/*     $NetBSD: dock.c,v 1.10 2009/05/24 22:55:03 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,15 +29,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)dock.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: dock.c,v 1.3 1995/04/22 10:58:45 cgd Exp $";
+__RCSID("$NetBSD: dock.c,v 1.10 2009/05/24 22:55:03 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      "trek.h"
+#include <stdio.h>
+#include "trek.h"
 
 /*
 **  DOCK TO STARBASE
@@ -58,33 +56,37 @@ static char rcsid[] = "$NetBSD: dock.c,v 1.3 1995/04/22 10:58:45 cgd Exp $";
 **     are docked.
 */
 
-dock()
+/*ARGSUSED*/
+void
+dock(int v __unused)
 {
-       register int            i, j;
-       int                     ok;
-       register struct event   *e;
+       int             i, j;
+       int             ok;
+       struct event    *e;
 
-       if (Ship.cond == DOCKED)
-               return (printf("Chekov: But captain, we are already docked\n"));
+       if (Ship.cond == DOCKED) {
+               printf("Chekov: But captain, we are already docked\n");
+               return;
+       }
        /* check for ok to dock, i.e., adjacent to a starbase */
        ok = 0;
-       for (i = Ship.sectx - 1; i <= Ship.sectx + 1 && !ok; i++)
-       {
+       for (i = Ship.sectx - 1; i <= Ship.sectx + 1 && !ok; i++) {
                if (i < 0 || i >= NSECTS)
                        continue;
-               for (j = Ship.secty - 1; j <= Ship.secty + 1; j++)
-               {
+               for (j = Ship.secty - 1; j <= Ship.secty + 1; j++) {
                        if (j  < 0 || j >= NSECTS)
                                continue;
-                       if (Sect[i][j] == BASE)
-                       {
+                       if (Sect[i][j] == BASE) {
                                ok++;
                                break;
                        }
                }
        }
-       if (!ok)
-               return (printf("Chekov: But captain, we are not adjacent to a starbase.\n"));
+       if (!ok) {
+               printf("Chekov: But captain, we are not adjacent to a "
+                      "starbase.\n");
+               return;
+       }
 
        /* restore resources */
        Ship.energy = Param.energy;
@@ -107,8 +109,7 @@ dock()
        dumpssradio();
 
        /* reschedule any device repairs */
-       for (i = 0; i < MAXEVENTS; i++)
-       {
+       for (i = 0; i < MAXEVENTS; i++) {
                e = &Event[i];
                if (e->evcode != E_FIXDV)
                        continue;
@@ -125,13 +126,14 @@ dock()
 **     is to reschedule any damages so that they will take longer.
 */
 
-undock()
+/*ARGSUSED*/
+void
+undock(int v __unused)
 {
-       register struct event   *e;
-       register int            i;
+       struct event    *e;
+       int             i;
 
-       if (Ship.cond != DOCKED)
-       {
+       if (Ship.cond != DOCKED) {
                printf("Sulu: Pardon me captain, but we are not docked.\n");
                return;
        }
@@ -139,8 +141,7 @@ undock()
        Move.free = 0;
 
        /* reschedule device repair times (again) */
-       for (i = 0; i < MAXEVENTS; i++)
-       {
+       for (i = 0; i < MAXEVENTS; i++) {
                e = &Event[i];
                if (e->evcode != E_FIXDV)
                        continue;