Move UCB-licensed code from 4-clause to 3-clause licence.

[bsdgames-darwin.git] / backgammon / common_source / subs.c

diff --git a/backgammon/common_source/subs.c b/backgammon/common_source/subs.c
index e1017713a8c1b313c576e53ce9de66b661b257ab..1daeb72e85d24b93f75854a35d4ef70be5d033f2 100644 (file)
--- a/backgammon/common_source/subs.c
+++ b/backgammon/common_source/subs.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: subs.c,v 1.8 1998/09/13 15:19:35 hubertf Exp $ */
+/*     $NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 agc 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)subs.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: subs.c,v 1.8 1998/09/13 15:19:35 hubertf Exp $");
+__RCSID("$NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 agc Exp $");
 #endif
 #endif /* not lint */
 
@@ -47,11 +43,11 @@ __RCSID("$NetBSD: subs.c,v 1.8 1998/09/13 15:19:35 hubertf Exp $");
 int     buffnum;
 char    outbuff[BUFSIZ];
 
-static char plred[] = "Player is red, computer is white.";
-static char plwhite[] = "Player is white, computer is red.";
-static char nocomp[] = "(No computer play.)";
+static const char plred[] = "Player is red, computer is white.";
+static const char plwhite[] = "Player is white, computer is red.";
+static const char nocomp[] = "(No computer play.)";
 
-char   *descr[] = {
+const char   *const descr[] = {
        "Usage:  backgammon [-] [n r w b pr pw pb t3a]\n",
        "\t-\tgets this list\n\tn\tdon't ask for rules or instructions",
        "\tr\tplayer is red (implies n)\n\tw\tplayer is white (implies n)",
@@ -73,7 +69,7 @@ errexit(s)
        getout(0);
 }
 
-void
+int
 addbuf(c)
        int     c;
 {
@@ -84,6 +80,7 @@ addbuf(c)
                buffnum = 0;
        }
        outbuff[buffnum] = c;
+       return (0);
 }
 
 void
@@ -136,10 +133,10 @@ writec(c)
 
 void
 writel(l)
-       char   *l;
+       const char   *l;
 {
 #ifdef DEBUG
-       char   *s;
+       const char   *s;
 
        if (trace == NULL)
                trace = fopen("bgtrace", "w");
@@ -324,7 +321,7 @@ getarg(arg)
         * the game is being recovered */
 
        s = *arg;
-       while (s[0][0] == '-') {
+       while (*s && s[0][0] == '-') {
                switch (s[0][1]) {
 
                        /* don't ask if rules or instructions needed */
@@ -388,7 +385,11 @@ getarg(arg)
                case 's':
                        s++;
                        /* recover file */
-                       recover(s[0]);
+                       if (s[0] == NULL) {
+                               writel("No save file named\n");
+                               getout(0);
+                       } else
+                               recover(s[0]);
                        break;
                }
                s++;
@@ -442,7 +443,7 @@ fixtty(t)
 
 void
 getout(dummy)
-       int     dummy;
+       int     dummy __attribute__((__unused__));
 {
        /* go to bottom of screen */
        if (tflag) {