The patch below improves the security of the game atc(6), by having it

[bsdgames-darwin.git] / sail / misc.c

diff --git a/sail/misc.c b/sail/misc.c
index 7b0c465e16275ad5d1222037a8c1a643937ba55f..c78e952fd545a10134095b9f04c36166575ce0cc 100644 (file)
--- a/sail/misc.c
+++ b/sail/misc.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: misc.c,v 1.5 1997/10/13 19:44:38 christos Exp $        */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,23 +33,31 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c     5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: misc.c,v 1.2 1993/08/01 18:51:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)misc.c     8.2 (Berkeley) 4/28/95";
+#else
+__RCSID("$NetBSD: misc.c,v 1.5 1997/10/13 19:44:38 christos Exp $");
+#endif
 #endif /* not lint */
 
-#include "externs.h"
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "extern.h"
 #include "pathnames.h"
 
 #define distance(x,y) (abs(x) >= abs(y) ? abs(x) + abs(y)/2 : abs(y) + abs(x)/2)
 
 /* XXX */
+int
 range(from, to)
 struct ship *from, *to;
 {
-       register bow1r, bow1c, bow2r, bow2c;
+       int bow1r, bow1c, bow2r, bow2c;
        int stern1r, stern1c, stern2c, stern2r;
-       register int bb, bs, sb, ss, result;
+       int bb, bs, sb, ss, result;
 
        if (!to->file->dir)
                return -1;
@@ -71,11 +81,11 @@ struct ship *from, *to;
 
 struct ship *
 closestenemy(from, side, anyship)
-register struct ship *from;
+struct ship *from;
 char side, anyship;
 {
-       register struct ship *sp;
-       register char a;
+       struct ship *sp;
+       char a;
        int olddist = 30000, dist;
        struct ship *closest = 0;
 
@@ -98,10 +108,11 @@ char side, anyship;
        return closest;
 }
 
+int
 angle(dr, dc)
-register dr, dc;
+int dr, dc;
 {
-       register i;
+       int i;
 
        if (dc >= 0 && dr > 0)
                i = 0;
@@ -125,11 +136,12 @@ register dr, dc;
        return i % 8 + 1;
 }
 
+int
 gunsbear(from, to)             /* checks for target bow or stern */
-register struct ship *from, *to;
+struct ship *from, *to;
 {
        int Dr, Dc, i;
-       register ang;
+       int ang;
 
        Dr = from->file->row - to->file->row;
        Dc = to->file->col - from->file->col;
@@ -146,12 +158,13 @@ register struct ship *from, *to;
        return 0;
 }
 
+int
 portside(from, on, quick)
-register struct ship *from, *on;
+struct ship *from, *on;
 int quick;                     /* returns true if fromship is */
 {                              /* shooting at onship's starboard side */
-       register ang;
-       register Dr, Dc;
+       int ang;
+       int Dr, Dc;
 
        Dr = from->file->row - on->file->row;
        Dc = on->file->col - from->file->col;
@@ -166,10 +179,11 @@ int quick;                        /* returns true if fromship is */
        return ang < 5;
 }
 
+int
 colours(sp)
-register struct ship *sp;
+struct ship *sp;
 {
-       register char flag;
+       char flag = '\0';
 
        if (sp->file->struck)
                flag = '!';
@@ -183,16 +197,16 @@ register struct ship *sp;
        return sp->file->FS ? flag : tolower(flag);
 }
 
-#include <sys/file.h>
-log(s)
-register struct ship *s;
+void
+logger(s)
+struct ship *s;
 {
        FILE *fp;
        int persons;
        int n;
        struct logs log[NLOG];
        float net;
-       register struct logs *lp;
+       struct logs *lp;
 
        if ((fp = fopen(_PATH_LOGFILE, "r+")) == NULL)
                return;