Remove ifdefs for V7 (as opposed to older) unix.

[bsdgames-darwin.git] / backgammon / teachgammon / teach.c

diff --git a/backgammon/teachgammon/teach.c b/backgammon/teachgammon/teach.c
index 28e613fc198faf2c110cfd2c40d1d89d8d0c0522..0fb58d50581be6c9787d087ca5ba2c78f8672631 100644 (file)
--- a/backgammon/teachgammon/teach.c
+++ b/backgammon/teachgammon/teach.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: teach.c,v 1.10 1999/08/14 16:29:23 tron Exp $  */
+/*     $NetBSD: teach.c,v 1.23 2012/10/13 19:25:22 dholland 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.
  *
@@ -35,24 +31,22 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
-       The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1980, 1993\
+ The Regents of the University of California.  All rights reserved.");
 #endif                         /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)teach.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: teach.c,v 1.10 1999/08/14 16:29:23 tron Exp $");
+__RCSID("$NetBSD: teach.c,v 1.23 2012/10/13 19:25:22 dholland Exp $");
 #endif
 #endif                         /* not lint */
 
 #include "back.h"
 #include "tutor.h"
 
-extern short ospeed;           /* tty output speed for termlib */
-
-const char   *const helpm[] = {
+static const char *const helpm[] = {
        "\nEnter a space or newline to roll, or",
        "     b   to display the board",
        "     d   to double",
@@ -60,20 +54,19 @@ const char   *const helpm[] = {
        0
 };
 
-const char   *const contin[] = {
+static const char *const contin[] = {
        "",
        0
 };
 
 int
-main(argc, argv)
-       int     argc;
-       char   *argv[];
+main(int argc __unused, char *argv[])
 {
        int     i;
+       struct move mmstore, *mm;
 
        /* revoke setgid privileges */
-       setregid(getgid(), getgid());
+       setgid(getgid());
 
        signal(SIGINT, getout);
        if (tcgetattr(0, &old) == -1)   /* get old tty mode */
@@ -84,20 +77,20 @@ main(argc, argv)
        raw.c_lflag &= ~ICANON; /* set up modes */
        ospeed = cfgetospeed(&old);     /* for termlib */
        tflag = getcaps(getenv("TERM"));
-#ifdef V7
+
+       /* need this now beceause getarg() may try to load a game */
+       mm = &mmstore;
+       move_init(mm);
        while (*++argv != 0)
-#else
-       while (*++argv != -1)
-#endif
-               getarg(&argv);
+               getarg(mm, &argv);
        if (tflag) {
                noech.c_oflag &= ~(ONLCR | OXTABS);
                raw.c_oflag &= ~(ONLCR | OXTABS);
                clear();
        }
-       text(hello);
-       text(list);
-       i = text(contin);
+       wrtext(hello);
+       wrtext(list);
+       i = wrtext(contin);
        if (i == 0)
                i = 2;
        init();
@@ -107,58 +100,58 @@ main(argc, argv)
                        leave();
 
                case 2:
-                       if ((i = text(intro1)) != 0)
+                       if ((i = wrtext(intro1)) != 0)
                                break;
                        wrboard();
-                       if ((i = text(intro2)) != 0)
+                       if ((i = wrtext(intro2)) != 0)
                                break;
 
                case 3:
-                       if ((i = text(moves)) != 0)
+                       if ((i = wrtext(moves)) != 0)
                                break;
 
                case 4:
-                       if ((i = text(removepiece)) != 0)
+                       if ((i = wrtext(removepiece)) != 0)
                                break;
 
                case 5:
-                       if ((i = text(hits)) != 0)
+                       if ((i = wrtext(hits)) != 0)
                                break;
 
                case 6:
-                       if ((i = text(endgame)) != 0)
+                       if ((i = wrtext(endgame)) != 0)
                                break;
 
                case 7:
-                       if ((i = text(doubl)) != 0)
+                       if ((i = wrtext(doubl)) != 0)
                                break;
 
                case 8:
-                       if ((i = text(stragy)) != 0)
+                       if ((i = wrtext(stragy)) != 0)
                                break;
 
                case 9:
-                       if ((i = text(prog)) != 0)
+                       if ((i = wrtext(prog)) != 0)
                                break;
 
                case 10:
-                       if ((i = text(lastch)) != 0)
+                       if ((i = wrtext(lastch)) != 0)
                                break;
                }
-       tutor();
+       tutor(mm);
        /* NOTREACHED */
        return (0);
 }
 
 void
-leave()
+leave(void)
 {
        if (tflag)
                clear();
        else
                writec('\n');
        fixtty(&old);
-       execl(EXEC, "backgammon", "-n", args[0]?args:0, 0);
+       execl(EXEC, "backgammon", "-n", args[0]?args:0, (char *) 0);
        writel("Help! Backgammon program is missing\007!!\n");
-       exit(-1);
+       exit(1);
 }