Correct descriptions of "marked" vs. "ignored" -- they were swapped.

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

diff --git a/atc/main.c b/atc/main.c
index 29bf723f7a85af30606cd6bccc9dab075af46052..da545c6970792f0069465cd9306b28b52da3479e 100644 (file)
--- a/atc/main.c
+++ b/atc/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.5 1997/10/10 02:07:30 lukem Exp $   */
+/*     $NetBSD: main.c,v 1.11 2000/05/08 07:56:01 mycroft Exp $        */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -55,7 +55,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
 #if 0
 static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.5 1997/10/10 02:07:30 lukem Exp $");
+__RCSID("$NetBSD: main.c,v 1.11 2000/05/08 07:56:01 mycroft Exp $");
 #endif
 #endif /* not lint */
 
@@ -71,63 +71,53 @@ main(ac, av)
        int                     seed;
        int                     f_usage = 0, f_list = 0, f_showscore = 0;
        int                     f_printpath = 0;
-       char                    *file = NULL;
-       char                    *name, *ptr;
+       const char              *file = NULL;
+       int                     ch;
        struct sigaction        sa;
 #ifdef BSD
        struct itimerval        itv;
 #endif
 
-       start_time = seed = time(0);
+       /* Open the score file then revoke setgid privileges */
+       open_score_file();
+       setgid(getgid());
 
-       name = *av++;
-       while (*av) {
-#ifndef SAVEDASH
-               if (**av == '-') 
-                       ++*av;
-               else
+       start_time = seed = time(NULL);
+
+       while ((ch = getopt(ac, av, "ulstpg:f:r:")) != -1) {
+               switch (ch) {
+               case '?':
+               case 'u':
+               default: 
+                       f_usage++;
+                       break;
+               case 'l':
+                       f_list++;
+                       break;
+               case 's':
+               case 't':
+                       f_showscore++;
+                       break;
+               case 'p':
+                       f_printpath++;
+                       break;
+               case 'r':
+                       seed = atoi(optarg);
+                       break;
+               case 'f':
+               case 'g':
+                       file = optarg;
                        break;
-#endif
-               ptr = *av++;
-               while (*ptr) {
-                       switch (*ptr) {
-                       case '?':
-                       case 'u':
-                               f_usage++;
-                               break;
-                       case 'l':
-                               f_list++;
-                               break;
-                       case 's':
-                       case 't':
-                               f_showscore++;
-                               break;
-                       case 'p':
-                               f_printpath++;
-                               break;
-                       case 'r':
-                               seed = atoi(*av);
-                               av++;
-                               break;
-                       case 'f':
-                       case 'g':
-                               file = *av;
-                               av++;
-                               break;
-                       default: 
-                               warnx("unknown option '%c'\n", *ptr);
-                               f_usage++;
-                               break;
-                       }
-                       ptr++;
                }
        }
+       if (optind < ac)
+               f_usage++;
        srandom(seed);
 
        if (f_usage)
                fprintf(stderr, 
                    "Usage: %s -[u?lstp] [-[gf] game_name] [-r random seed]\n",
-                       name);
+                       av[0]);
        if (f_showscore)
                log_score(1);
        if (f_list)
@@ -168,6 +158,7 @@ main(ac, av)
        tcgetattr(fileno(stdin), &tty_start);
        tty_new = tty_start;
        tty_new.c_lflag &= ~(ICANON|ECHO);
+       tty_new.c_iflag |= ICRNL;
        tty_new.c_cc[VMIN] = 1;
        tty_new.c_cc[VTIME] = 0;
        tcsetattr(fileno(stdin), TCSADRAIN, &tty_new);
@@ -221,7 +212,7 @@ main(ac, av)
 
 int
 read_file(s)
-       char    *s;
+       const char      *s;
 {
        extern FILE     *yyin;
        int             retval;
@@ -229,7 +220,7 @@ read_file(s)
        file = s;
        yyin = fopen(s, "r");
        if (yyin == NULL) {
-               perror(s);
+               warn("fopen %s", s);
                return (-1);
        }
        retval = yyparse();
@@ -241,7 +232,7 @@ read_file(s)
                return (0);
 }
 
-char   *
+const char     *
 default_game()
 {
        FILE            *fp;
@@ -252,7 +243,7 @@ default_game()
        strcat(games, GAMES);
 
        if ((fp = fopen(games, "r")) == NULL) {
-               perror(games);
+               warn("fopen %s", games);
                return (NULL);
        }
        if (fgets(line, sizeof(line), fp) == NULL) {
@@ -266,19 +257,20 @@ default_game()
        return (file);
 }
 
-char   *
+const char     *
 okay_game(s)
-       char    *s;
+       const char      *s;
 {
        FILE            *fp;
        static char     file[256];
-       char            *ret = NULL, line[256], games[256];
+       const char      *ret = NULL;
+       char            line[256], games[256];
 
        strcpy(games, _PATH_GAMES);
        strcat(games, GAMES);
 
        if ((fp = fopen(games, "r")) == NULL) {
-               perror(games);
+               warn("fopen %s", games);
                return (NULL);
        }
        while (fgets(line, sizeof(line), fp) != NULL) {
@@ -312,7 +304,7 @@ list_games()
        strcat(games, GAMES);
 
        if ((fp = fopen(games, "r")) == NULL) {
-               perror(games);
+               warn("fopen %s", games);
                return (-1);
        }
        puts("available games:");