Remove the need for -Wno-pointer-sign. Object diffs checked.

[bsdgames-darwin.git] / trek / main.c

diff --git a/trek/main.c b/trek/main.c
index cb3029decbd33e554f7af04318f74865182fc423..3c55293f145f310c86594667aaf1522a03cf44f4 100644 (file)
--- a/trek/main.c
+++ b/trek/main.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: main.c,v 1.22 2009/05/25 00:37:27 dholland Exp $       */
+

 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -10,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.
  * 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.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -31,25 +29,30 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#include <sys/cdefs.h>

 #ifndef lint
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
- All rights reserved.\n";
+__COPYRIGHT("@(#) Copyright (c) 1980, 1993\
+ The Regents of the University of California.  All rights reserved.");

 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-/*static char sccsid[] = "from: @(#)main.c     5.7 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:50:18 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: main.c,v 1.22 2009/05/25 00:37:27 dholland Exp $");
+#endif

 #endif /* not lint */
 
 #endif /* not lint */
 

-# include      "trek.h"
-# include      <stdio.h>
-# include      <sgtty.h>
-# include      <setjmp.h>
-
-# define       PRIO            00      /* default priority */
+#include <stdio.h>
+#include <setjmp.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <err.h>
+#include <time.h>
+#include <sys/types.h>
+#include "trek.h"
+#include "getpar.h"

 
 

-int    Mother  = 51 + (51 << 8);

 
 /*
 **      ####  #####    #    ####          #####  ####   #####  #   #
 
 /*
 **      ####  #####    #    ####          #####  ####   #####  #   #


@@ -125,7 +128,7 @@ int Mother  = 51 + (51 << 8);
 **
 **     Many things in trek are not as clear as they might be, but are
 **     done to reduce space.  I compile with the -f and -O flags.  I
 **
 **     Many things in trek are not as clear as they might be, but are
 **     done to reduce space.  I compile with the -f and -O flags.  I

-**     am constrained to running with non-seperated I/D space, since
+**     am constrained to running with non-separated I/D space, since

 **     we don't have doubleing point hardware here; even if we did, I
 **     would like trek to be available to the large number of people
 **     who either have an 11/40 or do not have FP hardware.  I also
 **     we don't have doubleing point hardware here; even if we did, I
 **     would like trek to be available to the large number of people
 **     who either have an 11/40 or do not have FP hardware.  I also


@@ -150,38 +153,29 @@ int       Mother  = 51 + (51 << 8);
 
 jmp_buf env;
 
 
 jmp_buf env;
 

-main(argc, argv)
-int    argc;
-char   **argv;
+static void
+usage(const char *av0)

 {
 {

-       long                    vect;
-       /* extern FILE          *f_log; */
-       register char           opencode;
-       int                     prio;
-       register int            ac;
-       register char           **av;
-       struct  sgttyb          argp;
-
-       av = argv;
-       ac = argc;
-       av++;
-       time(&vect);
-       srand(vect);
-       opencode = 'w';
-       prio = PRIO;
-       if (gtty(1, &argp) == 0)
-       {
-               if ((argp.sg_ispeed ) < B1200)
-                       Etc.fast++;
-       }
-       while (ac > 1 && av[0][0] == '-')
-       {
-               switch (av[0][1])
-               {
-                 case 'a':     /* append to log file */
-                       opencode = 'a';
-                       break;
+       errx(1, "Usage: %s [-fs]", av0);
+}
+
+int main(int, char **);
+
+int
+main(int argc, char **argv)
+{
+       int ch;
+
+       /* Revoke setgid privileges */
+       setgid(getgid());
+
+       /* Default to fast mode */
+       Etc.fast = 1;
+
+       srandom((long) time(NULL));

 
 

+       while ((ch = getopt(argc, argv, "fst")) != -1) {
+               switch (ch) {

                  case 'f':     /* set fast mode */
                        Etc.fast++;
                        break;
                  case 'f':     /* set fast mode */
                        Etc.fast++;
                        break;


@@ -190,47 +184,32 @@ char      **argv;
                        Etc.fast = 0;
                        break;
 
                        Etc.fast = 0;
                        break;
 

-#              ifdef xTRACE
+#ifdef xTRACE

                  case 't':     /* trace */
                  case 't':     /* trace */

-                       if (getuid() != Mother)
-                               goto badflag;

                        Trace++;
                        break;
                        Trace++;
                        break;

-#              endif
-
-                 case 'p':     /* set priority */
-                       if (getuid() != Mother)
-                               goto badflag;
-                       prio = atoi(av[0] + 2);
-                       break;
+#endif

 
                  default:
 
                  default:

-                 badflag:
-                       printf("Invalid option: %s\n", av[0]);
-
+                       usage(argv[0]);

                }
                }

-               ac--;
-               av++;

        }
        }

-       if (ac > 2)
-               syserr(0, "arg count");
-               /*
-       if (ac > 1)
-               f_log = fopen(av[0], opencode);
-               */
+       if (optind < argc)
+               usage(argv[0]);

 
 

-       printf("\n   * * *   S T A R   T R E K   * * *\n\nPress return to continue.\n");
+       printf("\n   * * *   S T A R   T R E K   * * *\n\n"
+              "Press return to continue.\n");

 
 

-       if (setjmp(env))
-       {
+       if (setjmp(env)) {

                if ( !getynpar("Another game") )
                        exit(0);
        }
                if ( !getynpar("Another game") )
                        exit(0);
        }

-       do
-       {
+
+       do {

                setup();
                play();
        } while (getynpar("Another game"));
 
        fflush(stdout);
                setup();
                play();
        } while (getynpar("Another game"));
 
        fflush(stdout);

+       return 0;

 }
 }