Grammar fix, from ray at raylai org via jmc@openbsd.

[bsdgames-darwin.git] / hack / hack.unix.c

diff --git a/hack/hack.unix.c b/hack/hack.unix.c
index 0160c46330ce78ec65f272e3e66b68ac1112c96e..13f9724425ec1332327ecb4cfb17233c3602c3f8 100644 (file)
--- a/hack/hack.unix.c
+++ b/hack/hack.unix.c
@@ -1,12 +1,69 @@
-/*     $NetBSD: hack.unix.c,v 1.5 1997/10/19 16:59:21 christos Exp $   */
+/*     $NetBSD: hack.unix.c,v 1.9 2003/04/02 18:36:41 jsm Exp $        */
 
 /*
- * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
+ * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
+ * Amsterdam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - 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.
+ *
+ * - Neither the name of the Stichting Centrum voor Wiskunde en
+ * Informatica, nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
+ * All rights reserved.
+ *
+ * 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.
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.unix.c,v 1.5 1997/10/19 16:59:21 christos Exp $");
+__RCSID("$NetBSD: hack.unix.c,v 1.9 2003/04/02 18:36:41 jsm Exp $");
 #endif                         /* not lint */
 
 /* This file collects some Unix dependencies; hack.pager.c contains some more */
@@ -36,6 +93,8 @@ __RCSID("$NetBSD: hack.unix.c,v 1.5 1997/10/19 16:59:21 christos Exp $");
 #include "hack.h"              /* mainly for strchr() which depends on BSD */
 #include "extern.h"
 
+extern int locknum;
+
 
 void
 setrandom()
@@ -64,12 +123,8 @@ getdate()
        static char     datestr[7];
        struct tm      *lt = getlt();
 
-       (void) sprintf(datestr, "%2d%2d%2d",
-                      lt->tm_year, lt->tm_mon + 1, lt->tm_mday);
-       if (datestr[2] == ' ')
-               datestr[2] = '0';
-       if (datestr[4] == ' ')
-               datestr[4] = '0';
+       (void) sprintf(datestr, "%02d%02d%02d",
+                      lt->tm_year % 100, lt->tm_mon + 1, lt->tm_mday);
        return (datestr);
 }
 
@@ -129,7 +184,7 @@ gethdate(name)
         */
 #define                MAXPATHLEN      1024
 
-       char           *np, *path;
+       const char           *np, *path;
        char            filename[MAXPATHLEN + 1];
        if (strchr(name, '/') != NULL || (path = getenv("PATH")) == NULL)
                path = "";
@@ -156,7 +211,7 @@ gethdate(name)
 }
 
 int
-uptodate(fd)
+uptodate(int fd)
 {
        if (fstat(fd, &buf)) {
                pline("Cannot get status of saved level? ");
@@ -213,7 +268,6 @@ veryold(fd)
 void
 getlock()
 {
-       extern int      hackpid, locknum;
        int             i = 0, fd;
 
        (void) fflush(stdout);
@@ -250,7 +304,7 @@ getlock()
                if (locknum)
                        lock[0] = 'a' + i++;
 
-               if ((fd = open(lock, 0)) == -1) {
+               if ((fd = open(lock, O_RDONLY)) == -1) {
                        if (errno == ENOENT)
                                goto gotlock;   /* no such file */
                        perror(lock);