From 3ae4e09ad943b5f6b5b830a86ee4ab967f1653dc Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Mon, 25 May 2009 00:37:27 +0000
Subject: [PATCH] Use random() instead of rand(), so we get something like
 random numbers out.

This changes the "tournament codes"; that is, the same code will give
you a different game now from what it used to. (This is because the
codes are basically random seeds.) I really really doubt anyone cares
about this, especially since the tournament feature appears to be
undocumented.
---
 games/trek/main.c  | 11 +++--------
 games/trek/ranf.c  | 13 ++++---------
 games/trek/setup.c |  6 +++---
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/games/trek/main.c b/games/trek/main.c
index bbf327dbce99..3c55293f145f 100644
--- a/games/trek/main.c
+++ b/games/trek/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.21 2009/05/25 00:29:08 dholland Exp $	*/
+/*	$NetBSD: main.c,v 1.22 2009/05/25 00:37:27 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,13 +39,12 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.21 2009/05/25 00:29:08 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.22 2009/05/25 00:37:27 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include <stdio.h>
 #include <setjmp.h>
-#include <termios.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <err.h>
@@ -165,8 +164,6 @@ int main(int, char **);
 int
 main(int argc, char **argv)
 {
-	time_t		curtime;
-	long			vect;
 	int ch;
 
 	/* Revoke setgid privileges */
@@ -175,9 +172,7 @@ main(int argc, char **argv)
 	/* Default to fast mode */
 	Etc.fast = 1;
 
-	time(&curtime);
-	vect = (long) curtime;
-	srand(vect);
+	srandom((long) time(NULL));
 
 	while ((ch = getopt(argc, argv, "fst")) != -1) {
 		switch (ch) {
diff --git a/games/trek/ranf.c b/games/trek/ranf.c
index 2b553d9b6b59..9ed235459a5f 100644
--- a/games/trek/ranf.c
+++ b/games/trek/ranf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ranf.c,v 1.6 2009/05/24 19:18:44 dholland Exp $	*/
+/*	$NetBSD: ranf.c,v 1.7 2009/05/25 00:37:27 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)ranf.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: ranf.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: ranf.c,v 1.7 2009/05/25 00:37:27 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -45,19 +45,14 @@ __RCSID("$NetBSD: ranf.c,v 1.6 2009/05/24 19:18:44 dholland Exp $");
 int
 ranf(int max)
 {
-	int	t;
-
 	if (max <= 0)
 		return (0);
-	t = rand() >> 5;
-	return (t % max);
+	return (random() % max);
 }
 
 
 double
 franf(void)
 {
-	double		t;
-	t = rand() & 077777;
-	return (t / 32767.0);
+	return random() / (double)RANDOM_MAX;
 }
diff --git a/games/trek/setup.c b/games/trek/setup.c
index 249f14971f94..769cab262a4a 100644
--- a/games/trek/setup.c
+++ b/games/trek/setup.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: setup.c,v 1.12 2009/05/24 21:44:56 dholland Exp $	*/
+/*	$NetBSD: setup.c,v 1.13 2009/05/25 00:37:27 dholland Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: setup.c,v 1.12 2009/05/24 21:44:56 dholland Exp $");
+__RCSID("$NetBSD: setup.c,v 1.13 2009/05/25 00:37:27 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -109,7 +109,7 @@ setup(void)
 		d = 0;
 		for (i = 0; Game.passwd[i]; i++)
 			d += Game.passwd[i] << i;
-		srand(d);
+		srandom(d);
 	}
 	Param.bases = Now.bases = ranf(6 - Game.skill) + 2;
 	if (Game.skill == 6)