Fix darwin-amd64

[bsdgames-darwin.git] / fish / fish.c

diff --git a/fish/fish.c b/fish/fish.c
index 6c88f8531df7a4716603086bbd48612b39c670ad..78e2dc528cf13203f1ec478dbce10fc8ce1876a8 100644 (file)
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: fish.c,v 1.16 2005/02/15 12:56:20 jsm Exp $    */
+/*     $NetBSD: fish.c,v 1.23 2018/03/05 04:59:54 eadler Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,15 +34,15 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
-       The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1990, 1993\
+ The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)fish.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: fish.c,v 1.16 2005/02/15 12:56:20 jsm Exp $");
+__RCSID("$NetBSD: fish.c,v 1.23 2018/03/05 04:59:54 eadler Exp $");
 #endif
 #endif /* not lint */
 
@@ -67,38 +67,35 @@ __RCSID("$NetBSD: fish.c,v 1.16 2005/02/15 12:56:20 jsm Exp $");
 #define        COMPUTER        0
 #define        OTHER(a)        (1 - (a))
 
-const char *const cards[] = {
+static const char *const cards[] = {
        "A", "2", "3", "4", "5", "6", "7",
        "8", "9", "10", "J", "Q", "K", NULL,
 };
 #define        PRC(card)       (void)printf(" %s", cards[card])
 
-int promode;
-int asked[RANKS], comphand[RANKS], deck[TOTCARDS];
-int userasked[RANKS], userhand[RANKS];
-int curcard = TOTCARDS;
-
-void   chkwinner(int, const int *);
-int    compmove(void);
-int    countbooks(const int *);
-int    countcards(const int *);
-int    drawcard(int, int *);
-int    gofish(int, int, int *);
-void   goodmove(int, int, int *, int *);
-void   init(void);
-void   instructions(void);
-int    main(int, char *[]);
-int    nrandom(int);
-void   printhand(const int *);
-void   printplayer(int);
-int    promove(void);
-void   usage(void) __attribute__((__noreturn__));
-int    usermove(void);
+static int promode;
+static int asked[RANKS], comphand[RANKS], deck[TOTCARDS];
+static int userasked[RANKS], userhand[RANKS];
+static int curcard = TOTCARDS;
+
+static void chkwinner(int, const int *);
+static int compmove(void);
+static int countbooks(const int *);
+static int countcards(const int *);
+static int drawcard(int, int *);
+static int gofish(int, int, int *);
+static void goodmove(int, int, int *, int *);
+static void init(void);
+static void instructions(void);
+static int nrandom(int);
+static void printhand(const int *);
+static void printplayer(int);
+static int promove(void);
+static void usage(void) __dead;
+static int usermove(void);
 
 int
-main(argc, argv)
-       int argc;
-       char **argv;
+main(int argc, char **argv)
 {
        int ch, move;
 
@@ -115,7 +112,7 @@ main(argc, argv)
                        usage();
                }
 
-       srandom(time((time_t *)NULL));
+       srandom(time(NULL));
        instructions();
        init();
 
@@ -149,8 +146,8 @@ istart:             for (;;) {
        /* NOTREACHED */
 }
 
-int
-usermove()
+static int
+usermove(void)
 {
        int n;
        const char *const *p;
@@ -174,9 +171,14 @@ usermove()
                        continue;
                }
                buf[strlen(buf) - 1] = '\0';
-               if (!strcasecmp(buf, "p") && !promode) {
-                       promode = 1;
-                       (void)printf("Entering pro mode.\n");
+               if (!strcasecmp(buf, "p")) {
+                       if (!promode) {
+                               promode = 1;
+                               printf("Entering pro mode.\n");
+                       }
+                       else {
+                               printf("Already in pro mode.\n");
+                       }
                        continue;
                }
                if (!strcasecmp(buf, "quit"))
@@ -189,10 +191,15 @@ usermove()
                        continue;
                }
                n = p - cards;
-               if (userhand[n]) {
+               if (userhand[n] <= 3) {
                        userasked[n] = 1;
                        return(n);
                }
+               if (userhand[n] == 4) {
+                       printf("You already have all of those.\n");
+                       continue;
+               }
+
                if (nrandom(3) == 1)
                        (void)printf("You don't have any of those!\n");
                else
@@ -204,8 +211,8 @@ usermove()
        /* NOTREACHED */
 }
 
-int
-compmove()
+static int
+compmove(void)
 {
        static int lmove;
 
@@ -222,8 +229,8 @@ compmove()
        return(lmove);
 }
 
-int
-promove()
+static int
+promove(void)
 {
        int i, max;
 
@@ -261,10 +268,8 @@ promove()
        /* NOTREACHED */
 }
 
-int
-drawcard(player, hand)
-       int player;
-       int *hand;
+static int
+drawcard(int player, int *hand)
 {
        int card;
 
@@ -282,10 +287,8 @@ drawcard(player, hand)
        return(card);
 }
 
-int
-gofish(askedfor, player, hand)
-       int askedfor, player;
-       int *hand;
+static int
+gofish(int askedfor, int player, int *hand)
 {
        printplayer(OTHER(player));
        (void)printf("say \"GO FISH!\"\n");
@@ -299,10 +302,8 @@ gofish(askedfor, player, hand)
        return(0);
 }
 
-void
-goodmove(player, move, hand, opphand)
-       int player, move;
-       int *hand, *opphand;
+static void
+goodmove(int player, int move, int *hand, int *opphand)
 {
        printplayer(OTHER(player));
        (void)printf("have %d %s%s.\n",
@@ -323,10 +324,8 @@ goodmove(player, move, hand, opphand)
        (void)printf("get another guess!\n");
 }
 
-void
-chkwinner(player, hand)
-       int player;
-       const int *hand;
+static void
+chkwinner(int player, const int *hand)
 {
        int cb, i, ub;
 
@@ -353,9 +352,8 @@ chkwinner(player, hand)
        exit(0);
 }
 
-void
-printplayer(player)
-       int player;
+static void
+printplayer(int player)
 {
        switch (player) {
        case COMPUTER:
@@ -367,9 +365,8 @@ printplayer(player)
        }
 }
 
-void
-printhand(hand)
-       const int *hand;
+static void
+printhand(const int *hand)
 {
        int book, i, j;
 
@@ -388,9 +385,8 @@ printhand(hand)
        (void)putchar('\n');
 }
 
-int
-countcards(hand)
-       const int *hand;
+static int
+countcards(const int *hand)
 {
        int i, count;
 
@@ -399,9 +395,8 @@ countcards(hand)
        return(count);
 }
 
-int
-countbooks(hand)
-       const int *hand;
+static int
+countbooks(const int *hand)
 {
        int i, count;
 
@@ -416,8 +411,8 @@ countbooks(hand)
        return(count);
 }
 
-void
-init()
+static void
+init(void)
 {
        int i, j, temp;
 
@@ -437,16 +432,15 @@ init()
        }
 }
 
-int
-nrandom(n)
-       int n;
+static int
+nrandom(int n)
 {
 
        return((int)random() % n);
 }
 
-void
-instructions()
+static void
+instructions(void)
 {
        int input;
        pid_t pid;
@@ -486,8 +480,8 @@ instructions()
        while ((input = getchar()) != EOF && input != '\n');
 }
 
-void
-usage()
+static void
+usage(void)
 {
        (void)fprintf(stderr, "usage: fish [-p]\n");
        exit(1);