.include <bsd.own.mk> early

[bsdgames-darwin.git] / cribbage / crib.c

diff --git a/cribbage/crib.c b/cribbage/crib.c
index cf59d5aa1c8450517641cbd8838feb9ed4bd7ad1..dc9756b53086d3c9f6129257bfbb56bc3e4ac3e4 100644 (file)
--- a/cribbage/crib.c
+++ b/cribbage/crib.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: crib.c,v 1.7 1997/07/10 06:47:29 mikel Exp $   */
+/*     $NetBSD: crib.c,v 1.16 2001/12/06 11:59:45 blymn Exp $  */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -33,21 +33,23 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1980, 1993\n\
-       The Regents of the University of California.  All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)crib.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: crib.c,v 1.7 1997/07/10 06:47:29 mikel Exp $";
+__RCSID("$NetBSD: crib.c,v 1.16 2001/12/06 11:59:45 blymn Exp $");
 #endif
 #endif /* not lint */
 
 #include <curses.h>
+#include <err.h>
+#include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
@@ -58,6 +60,8 @@ static char rcsid[] = "$NetBSD: crib.c,v 1.7 1997/07/10 06:47:29 mikel Exp $";
 #include "cribcur.h"
 #include "pathnames.h"
 
+int    main __P((int, char *[]));
+
 int
 main(argc, argv)
        int argc;
@@ -66,8 +70,30 @@ main(argc, argv)
        BOOLEAN playing;
        FILE *f;
        int ch;
+       int fd;
+       int flags;
+
+       f = fopen(_PATH_LOG, "a");
+       if (f == NULL)
+               warn("fopen %s", _PATH_LOG);
+       if (f != NULL && fileno(f) < 3)
+               exit(1);
+
+       /* Revoke setgid privileges */
+       setgid(getgid());
+
+       /* Set close-on-exec flag on log file */
+       if (f != NULL) {
+               fd = fileno(f);
+               flags = fcntl(fd, F_GETFD);
+               if (flags < 0)
+                       err(1, "fcntl F_GETFD");
+               flags |= FD_CLOEXEC;
+               if (fcntl(fd, F_SETFD, flags) == -1)
+                       err(1, "fcntl F_SETFD");
+       }
 
-       while ((ch = getopt(argc, argv, "eqr")) != EOF)
+       while ((ch = getopt(argc, argv, "eqr")) != -1)
                switch (ch) {
                case 'e':
                        explain = TRUE;
@@ -86,7 +112,7 @@ main(argc, argv)
 
        initscr();
        (void)signal(SIGINT, rint);
-       crmode();
+       cbreak();
        noecho();
 
        Playwin = subwin(stdscr, PLAY_Y, PLAY_X, 0, 0);
@@ -106,7 +132,7 @@ main(argc, argv)
                        mvcur(0, COLS - 1, LINES - 1, 0);
                        fflush(stdout);
                        instructions();
-                       crmode();
+                       cbreak();
                        noecho();
                        clear();
                        refresh();
@@ -126,17 +152,12 @@ main(argc, argv)
                playing = (getuchar() == 'Y');
        } while (playing);
 
-       if ((f = fopen(_PATH_LOG, "a")) != NULL) {
+       if (f != NULL) {
                (void)fprintf(f, "%s: won %5.5d, lost %5.5d\n",
                    getlogin(), cgames, pgames);
                (void) fclose(f);
        }
        bye();
-       if (!f) {
-               (void) fprintf(stderr, "\ncribbage: can't open %s.\n",
-                   _PATH_LOG);
-               exit(1);
-       }
        exit(0);
 }
 
@@ -175,8 +196,6 @@ makeboard()
 void
 gamescore()
 {
-       extern int Lastscore[];
-
        if (pgames || cgames) {
                mvprintw(SCORE_Y + 1, SCORE_X + 28, "Games: %3d", pgames);
                mvprintw(SCORE_Y + 7, SCORE_X + 28, "Games: %3d", cgames);
@@ -193,10 +212,11 @@ gamescore()
 void
 game()
 {
-       register int i, j;
+       int i, j;
        BOOLEAN flag;
        BOOLEAN compcrib;
 
+       compcrib = FALSE;
        makedeck(deck);
        shuffle(deck);
        if (gamecount == 0) {
@@ -287,7 +307,7 @@ int
 playhand(mycrib)
        BOOLEAN mycrib;
 {
-       register int deckpos;
+       int deckpos;
 
        werase(Compwin);
        wrefresh(Compwin);
@@ -319,7 +339,7 @@ int
 deal(mycrib)
        BOOLEAN mycrib;
 {
-       register int i, j;
+       int i, j;
 
        for (i = j = 0; i < FULLHAND; i++) {
                if (mycrib) {
@@ -342,7 +362,7 @@ void
 discard(mycrib)
        BOOLEAN mycrib;
 {
-       register char *prompt;
+       const char *prompt;
        CARD crd;
 
        prcrib(mycrib, TRUE);
@@ -373,7 +393,7 @@ cut(mycrib, pos)
        BOOLEAN mycrib;
        int  pos;
 {
-       register int i;
+       int i;
        BOOLEAN win;
 
        win = FALSE;
@@ -416,7 +436,7 @@ void
 prcrib(mycrib, blank)
        BOOLEAN mycrib, blank;
 {
-       register int y, cardx;
+       int y, cardx;
 
        if (mycrib)
                cardx = CRIB_X;
@@ -448,12 +468,13 @@ peg(mycrib)
        BOOLEAN mycrib;
 {
        static CARD ch[CINHAND], ph[CINHAND];
-       register int i, j, k;
-       register int l;
-       register int cnum, pnum, sum;
-       register BOOLEAN myturn, mego, ugo, last, played;
+       int i, j, k;
+       int l;
+       int cnum, pnum, sum;
+       BOOLEAN myturn, mego, ugo, last, played;
        CARD crd;
 
+       played = FALSE;
        cnum = pnum = CINHAND;
        for (i = 0; i < CINHAND; i++) { /* make copies of hands */
                ch[i] = chand[i];
@@ -580,7 +601,7 @@ peg(mycrib)
        prhand(ph, pnum, Playwin, FALSE);
        prhand(ch, cnum, Compwin, TRUE);
        prtable(sum);
-       if (last)
+       if (last) {
                if (played) {
                        msg(quiet ? "I get one for last" :
                            "I get one point for last");
@@ -594,6 +615,7 @@ peg(mycrib)
                        if (chkscr(&pscore, 1))
                                return TRUE;
                }
+       }
        return (FALSE);
 }