- Don't allocate memory dynamically on the stack (for SSP)

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

diff --git a/gomoku/main.c b/gomoku/main.c
index 4d5cf2dd5d0db8ddaebc090ea9b498dc490e96cd..4d9acb26d065bad6eb93512e67f8a1702a54a83d 100644 (file)
--- a/gomoku/main.c
+++ b/gomoku/main.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.25 2010/03/29 05:16:08 dholland Exp $       */
+/*     $NetBSD: main.c,v 1.27 2016/06/12 02:15:26 dholland Exp $       */
 
 /*
  * Copyright (c) 1994
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\
 #if 0
 static char sccsid[] = "@(#)main.c     8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.25 2010/03/29 05:16:08 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.27 2016/06/12 02:15:26 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -94,10 +94,6 @@ main(int argc, char **argv)
        char *tmp;
        int color, curmove, i, ch;
        int input[2];
-       static const char *const fmt[2] = {
-               "%3d %-6s",
-               "%3d        %-6s"
-       };
 
        /* Revoke setgid privileges */
        setgid(getgid());
@@ -295,7 +291,8 @@ again:
                        break;
                }
                if (interactive) {
-                       misclog(fmt[color], movenum, stoc(curmove));
+                       misclog("%3d%s%-6s", movenum, color ? "        " : " ",
+                           stoc(curmove));
                }
                if ((i = makemove(color, curmove)) != MOVEOK)
                        break;
@@ -565,12 +562,17 @@ panic(const char *fmt, ...)
 {
        va_list ap;
 
+       if (interactive) {
+               bdisp();
+               cursfini();
+       }
+
        fprintf(stderr, "%s: ", prog);
        va_start(ap, fmt);
        vfprintf(stderr, fmt, ap);
        va_end(ap);
        fprintf(stderr, "\n");
 
-       fputs("resign\n", stdout);
-       quit();
+       fputs("I resign\n", stdout);
+       exit(1);
 }