Fix merge conflicts

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

diff --git a/atc/main.c b/atc/main.c
index 536c0ef6c5f0adb2103694fe8a6389df70817399..9ef6ce111d9719165c0d6293f33d0327a01f6dde 100644 (file)
--- a/atc/main.c
+++ b/atc/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.21 2012/10/12 10:44:20 dholland Exp $       */
+/*     $NetBSD: main.c,v 1.25 2021/05/02 12:50:43 rillig Exp $ */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -51,12 +51,23 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 1993\
 #if 0
 static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.21 2012/10/12 10:44:20 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.25 2021/05/02 12:50:43 rillig Exp $");
 #endif
 #endif /* not lint */
 
-#include "include.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <termios.h>
+#include <getopt.h>
+#include <err.h>
+
 #include "pathnames.h"
+#include "def.h"
+#include "struct.h"
+#include "extern.h"
+#include "tunable.h"
 
 extern FILE    *yyin;
 
@@ -64,6 +75,7 @@ static int read_file(const char *);
 static const char *default_game(void);
 static const char *okay_game(const char *);
 static int list_games(void);
+static void quit(int);
 
 int
 main(int argc, char *argv[])
@@ -89,7 +101,7 @@ main(int argc, char *argv[])
                switch (ch) {
                case '?':
                case 'u':
-               default: 
+               default:
                        f_usage = 1;
                        break;
                case 'l':
@@ -116,7 +128,7 @@ main(int argc, char *argv[])
        srandom(seed);
 
        if (f_usage)
-               (void)fprintf(stderr, 
+               (void)fprintf(stderr,
                    "Usage: %s -[u?lstp] [-[gf] game_name] [-r random seed]\n",
                    argv[0]);
        if (f_showscore)
@@ -129,7 +141,7 @@ main(int argc, char *argv[])
                (void)strlcpy(buf, _PATH_GAMES, 100);
                (void)puts(buf);
        }
-               
+
        if (f_usage || f_showscore || f_list || f_printpath)
                exit(0);
 
@@ -144,7 +156,7 @@ main(int argc, char *argv[])
        init_gr();
        setup_screen(sp);
 
-       (void)addplane();
+       addplane();
 
        (void)signal(SIGINT, quit);
        (void)signal(SIGQUIT, quit);
@@ -316,3 +328,30 @@ list_games(void)
        }
        return (0);
 }
+
+/* ARGSUSED */
+static void
+quit(int dummy __unused)
+{
+       int c;
+#ifdef BSD
+       struct itimerval        itv;
+#endif
+       ioaskquit();
+       c = getAChar();
+       if (c == EOF || c == 'y') {
+               /* disable timer */
+#ifdef BSD
+               itv.it_value.tv_sec = 0;
+               itv.it_value.tv_usec = 0;
+               (void)setitimer(ITIMER_REAL, &itv, NULL);
+#endif
+#ifdef SYSV
+               alarm(0);
+#endif
+               shutdown_gr();
+               (void)log_score(0);
+               exit(0);
+       }
+       ionoquit();
+}