cgram: allow providing an input file instead of the random fortune

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

diff --git a/gomoku/stoc.c b/gomoku/stoc.c
index 16488e6d011a02cadcb8e1bf90f81534c5e49cdf..c7b1eff896193e0b106cc4cf44be53e2ffd36617 100644 (file)
--- a/gomoku/stoc.c
+++ b/gomoku/stoc.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: stoc.c,v 1.7 2003/08/07 09:37:18 agc Exp $     */
+/*     $NetBSD: stoc.c,v 1.12 2009/08/12 06:19:17 dholland Exp $       */
 
 /*
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)stoc.c     8.1 (Berkeley) 7/24/94";
 #else
-__RCSID("$NetBSD: stoc.c,v 1.7 2003/08/07 09:37:18 agc Exp $");
+__RCSID("$NetBSD: stoc.c,v 1.12 2009/08/12 06:19:17 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,12 +59,14 @@ static      const struct    mvstr   mv[] = {
        { -1,           0 }
 };
 
+static int lton(int);
+
+
 /*
  * Turn the spot number form of a move into the character form.
  */
 const char *
-stoc(s)
-       int s;
+stoc(int s)
 {
        static char buf[32];
        int i;
@@ -72,7 +74,7 @@ stoc(s)
        for (i = 0; mv[i].m_code >= 0; i++)
                if (s == mv[i].m_code)
                        return(mv[i].m_text);
-       sprintf(buf, "%c%d", letters[s % BSZ1], s / BSZ1);
+       snprintf(buf, sizeof(buf), "%c%d", letters[s % BSZ1], s / BSZ1);
        return(buf);
 }
 
@@ -80,28 +82,26 @@ stoc(s)
  * Turn the character form of a move into the spot number form.
  */
 int
-ctos(mp)
-       const char *mp;
+ctos(const char *mp)
 {
        int i;
 
        for (i = 0; mv[i].m_code >= 0; i++)
                if (strcmp(mp, mv[i].m_text) == 0)
                        return(mv[i].m_code);
-       if (!isalpha(mp[0]))
+       if (!isalpha((unsigned char)mp[0]))
                return(ILLEGAL);
        i = atoi(&mp[1]);
        if (i < 1 || i > 19)
                return(ILLEGAL);
-       return(PT(lton(mp[0]), i));
+       return(PT(lton((unsigned char)mp[0]), i));
 }
 
 /*
  * Turn a letter into a number.
  */
-int
-lton(c)
-       int c;
+static int
+lton(int c)
 {
        int i;