-/* $NetBSD: fish.c,v 1.6 1998/09/13 15:27:27 hubertf Exp $ */
+/* $NetBSD: fish.c,v 1.20 2009/08/12 05:55:53 dholland Exp $ */
/*-
* Copyright (c) 1990, 1993
* 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.
*
#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.6 1998/09/13 15:27:27 hubertf Exp $");
+__RCSID("$NetBSD: fish.c,v 1.20 2009/08/12 05:55:53 dholland Exp $");
#endif
#endif /* not lint */
#define RANKS 13
#define HANDSIZE 7
#define CARDS 4
+#define TOTCARDS RANKS * CARDS
#define USER 1
#define COMPUTER 0
#define OTHER(a) (1 - (a))
-char *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[RANKS];
-int userasked[RANKS], userhand[RANKS];
-
-void chkwinner __P((int, int *));
-int compmove __P((void));
-int countbooks __P((int *));
-int countcards __P((int *));
-int drawcard __P((int, int *));
-int gofish __P((int, int, int *));
-void goodmove __P((int, int, int *, int *));
-void init __P((void));
-void instructions __P((void));
-int main __P((int, char *[]));
-int nrandom __P((int));
-void printhand __P((int *));
-void printplayer __P((int));
-int promove __P((void));
-void usage __P((void)) __attribute__((__noreturn__));
-int usermove __P((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;
+ /* Revoke setgid privileges */
+ setgid(getgid());
+
while ((ch = getopt(argc, argv, "p")) != -1)
switch(ch) {
case 'p':
break;
case '?':
default:
- (void)fprintf(stderr, "usage: fish [-p]\n");
- exit(1);
+ usage();
}
srandom(time((time_t *)NULL));
/* NOTREACHED */
}
-int
-usermove()
+static int
+usermove(void)
{
int n;
- char **p;
+ const char *const *p;
char buf[256];
(void)printf("\nYour hand is:");
for (;;) {
(void)printf("You ask me for: ");
(void)fflush(stdout);
- if (fgets(buf, BUFSIZ, stdin) == NULL)
+ if (fgets(buf, sizeof(buf), stdin) == NULL)
exit(0);
if (buf[0] == '\0')
continue;
if (buf[0] == '\n') {
(void)printf("%d cards in my hand, %d in the pool.\n",
- countcards(comphand), countcards(deck));
+ countcards(comphand), curcard);
(void)printf("My books:");
(void)countbooks(comphand);
continue;
/* NOTREACHED */
}
-int
-compmove()
+static int
+compmove(void)
{
static int lmove;
return(lmove);
}
-int
-promove()
+static int
+promove(void)
{
int i, max;
/* NOTREACHED */
}
-int
-drawcard(player, hand)
- int player;
- int *hand;
+static int
+drawcard(int player, int *hand)
{
int card;
- while (deck[card = nrandom(RANKS)] == 0);
- ++hand[card];
- --deck[card];
+ ++hand[card = deck[--curcard]];
if (player == USER || hand[card] == CARDS) {
printplayer(player);
(void)printf("drew %s", cards[card]);
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");
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",
(void)printf("get another guess!\n");
}
-void
-chkwinner(player, hand)
- int player;
- int *hand;
+static void
+chkwinner(int player, const int *hand)
{
int cb, i, ub;
exit(0);
}
-void
-printplayer(player)
- int player;
+static void
+printplayer(int player)
{
switch (player) {
case COMPUTER:
}
}
-void
-printhand(hand)
- int *hand;
+static void
+printhand(const int *hand)
{
int book, i, j;
(void)putchar('\n');
}
-int
-countcards(hand)
- int *hand;
+static int
+countcards(const int *hand)
{
int i, count;
return(count);
}
-int
-countbooks(hand)
- int *hand;
+static int
+countbooks(const int *hand)
{
int i, count;
return(count);
}
-void
-init()
+static void
+init(void)
{
- int i, rank;
+ int i, j, temp;
- for (i = 0; i < RANKS; ++i)
- deck[i] = CARDS;
- for (i = 0; i < HANDSIZE; ++i) {
- while (!deck[rank = nrandom(RANKS)]);
- ++userhand[rank];
- --deck[rank];
+ for (i = 0; i < TOTCARDS; ++i)
+ deck[i] = i % RANKS;
+ for (i = 0; i < TOTCARDS - 1; ++i) {
+ j = nrandom(TOTCARDS-i);
+ if (j == 0)
+ continue;
+ temp = deck[i];
+ deck[i] = deck[i+j];
+ deck[i+j] = temp;
}
for (i = 0; i < HANDSIZE; ++i) {
- while (!deck[rank = nrandom(RANKS)]);
- ++comphand[rank];
- --deck[rank];
+ ++userhand[deck[--curcard]];
+ ++comphand[deck[--curcard]];
}
}
-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;
+ int fd;
+ const char *pager;
int status;
(void)printf("Would you like instructions (y or n)? ");
switch (pid = fork()) {
case 0: /* child */
- (void)setuid(getuid());
- (void)setgid(getgid());
- (void)execl(_PATH_MORE, "more", _PATH_INSTR, NULL);
- err(1, "%s %s", _PATH_MORE, _PATH_INSTR);
+ if (!isatty(1))
+ pager = "cat";
+ else {
+ if (!(pager = getenv("PAGER")) || (*pager == 0))
+ pager = _PATH_MORE;
+ }
+ if ((fd = open(_PATH_INSTR, O_RDONLY)) == -1)
+ err(1, "open %s", _PATH_INSTR);
+ if (dup2(fd, 0) == -1)
+ err(1, "dup2");
+ (void)execl("/bin/sh", "sh", "-c", pager, (char *) NULL);
+ err(1, "exec sh -c %s", pager);
/*NOTREACHED*/
case -1:
err(1, "fork");
while ((input = getchar()) != EOF && input != '\n');
}
-void
-usage()
+static void
+usage(void)
{
(void)fprintf(stderr, "usage: fish [-p]\n");
exit(1);