From gson@

[bsdgames-darwin.git] / hangman / getword.c

diff --git a/hangman/getword.c b/hangman/getword.c
index 3539c1404b61d32458da996fb1e826bba213bc88..ccb5725fa8b24a1569264f84cf97e7dfb32ade20 100644 (file)
--- a/hangman/getword.c
+++ b/hangman/getword.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: getword.c,v 1.5 1997/10/11 01:16:30 lukem Exp $        */
+/*     $NetBSD: getword.c,v 1.10 2012/06/19 05:45:00 dholland Exp $    */
 
 /*
  * Copyright (c) 1983, 1993
@@ -12,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.
- * 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.
  *
@@ -38,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)getword.c  8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: getword.c,v 1.5 1997/10/11 01:16:30 lukem Exp $");
+__RCSID("$NetBSD: getword.c,v 1.10 2012/06/19 05:45:00 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -49,7 +45,7 @@ __RCSID("$NetBSD: getword.c,v 1.5 1997/10/11 01:16:30 lukem Exp $");
  *     Get a valid word out of the dictionary file
  */
 void
-getword()
+getword(void)
 {
        FILE *inf;
        char *wp, *gp;
@@ -58,16 +54,16 @@ getword()
        inf = Dict;
        for (;;) {
                pos = (double) rand() / (RAND_MAX + 1.0) * (double) Dict_size;
-               fseek(inf, pos, 0);
+               fseek(inf, pos, SEEK_SET);
                if (fgets(Word, BUFSIZ, inf) == NULL)
                        continue;
                if (fgets(Word, BUFSIZ, inf) == NULL)
                        continue;
                Word[strlen(Word) - 1] = '\0';
-               if (strlen(Word) < MINLEN)
+               if (strlen(Word) < Minlen)
                        continue;
                for (wp = Word; *wp; wp++)
-                       if (!islower(*wp))
+                       if (!islower((unsigned char)*wp))
                                goto cont;
                break;
 cont:          ;