move offensive quotes per board@

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

diff --git a/hangman/getword.c b/hangman/getword.c
index c54d293dd3af2736799f8a963b6fff4f9fa82890..ccb5725fa8b24a1569264f84cf97e7dfb32ade20 100644 (file)
--- a/hangman/getword.c
+++ b/hangman/getword.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: getword.c,v 1.10 2012/06/19 05:45:00 dholland Exp $    */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,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.
  *
@@ -31,40 +29,41 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)getword.c  5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: getword.c,v 1.3 1994/06/29 21:22:50 deraadt Exp $";
+#if 0
+static char sccsid[] = "@(#)getword.c  8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: getword.c,v 1.10 2012/06/19 05:45:00 dholland Exp $");
+#endif
 #endif /* not lint */
 
-# include      "hangman.h"
-
-# if pdp11
-#      define  RN      (((off_t) rand() << 16) | (off_t) rand())
-# else
-#      define  RN      rand()
-# endif
+#include "hangman.h"
 
 /*
  * getword:
  *     Get a valid word out of the dictionary file
  */
-getword()
+void
+getword(void)
 {
-       register FILE           *inf;
-       register char           *wp, *gp;
+       FILE *inf;
+       char *wp, *gp;
+       long pos;
 
        inf = Dict;
        for (;;) {
-               fseek(inf, abs(RN % Dict_size), 0);
+               pos = (double) rand() / (RAND_MAX + 1.0) * (double) Dict_size;
+               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:          ;