Module Name: src
Committed By: rillig
Date: Sun May 2 12:24:59 UTC 2021
Modified Files:
src/games/fish: fish.c
Log Message:
fish: use arc4random_uniform for drawing random numbers
Thanks nia@ for the hint.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/fish/fish.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/fish/fish.c
diff -u src/games/fish/fish.c:1.24 src/games/fish/fish.c:1.25
--- src/games/fish/fish.c:1.24 Sat May 1 21:10:57 2021
+++ src/games/fish/fish.c Sun May 2 12:24:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fish.c,v 1.24 2021/05/01 21:10:57 rillig Exp $ */
+/* $NetBSD: fish.c,v 1.25 2021/05/02 12:24:59 rillig Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1990, 19
#if 0
static char sccsid[] = "@(#)fish.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: fish.c,v 1.24 2021/05/01 21:10:57 rillig Exp $");
+__RCSID("$NetBSD: fish.c,v 1.25 2021/05/02 12:24:59 rillig Exp $");
#endif
#endif /* not lint */
@@ -54,7 +54,6 @@ __RCSID("$NetBSD: fish.c,v 1.24 2021/05/
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <time.h>
#include <err.h>
#include "pathnames.h"
@@ -87,7 +86,6 @@ static int gofish(int, int, int *);
static void goodmove(int, int, int *, int *);
static void init(void);
static void instructions(void);
-static int nrandom(int);
static void printhand(const int *);
static void printplayer(int);
static int promove(void);
@@ -112,11 +110,10 @@ main(int argc, char **argv)
usage();
}
- srandom(time(NULL));
instructions();
init();
- if (nrandom(2) == 1) {
+ if (arc4random_uniform(2) == 1) {
printplayer(COMPUTER);
(void)printf("get to start.\n");
goto istart;
@@ -200,11 +197,11 @@ usermove(void)
continue;
}
- if (nrandom(3) == 1)
+ if (arc4random_uniform(3) == 1)
(void)printf("You don't have any of those!\n");
else
(void)printf("You don't have any %s's!\n", cards[n]);
- if (nrandom(4) == 1)
+ if (arc4random_uniform(4) == 1)
(void)printf("No cheating!\n");
(void)printf("Guess again.\n");
}
@@ -240,7 +237,7 @@ promove(void)
userasked[i] = 0;
return(i);
}
- if (nrandom(3) == 1) {
+ if (arc4random_uniform(3) == 1) {
for (i = 0;; ++i)
if (comphand[i] && comphand[i] != CARDS) {
max = i;
@@ -252,7 +249,7 @@ promove(void)
max = i;
return(max);
}
- if (nrandom(1024) == 0723) {
+ if (arc4random_uniform(1024) == 0723) {
for (i = 0; i < RANKS; ++i)
if (userhand[i] && comphand[i])
return(i);
@@ -341,11 +338,11 @@ chkwinner(int player, const int *hand)
(void)printf("\nI have %d, you have %d.\n", cb, ub);
if (ub > cb) {
(void)printf("\nYou win!!!\n");
- if (nrandom(1024) == 0723)
+ if (arc4random_uniform(1024) == 0723)
(void)printf("Cheater, cheater, pumpkin eater!\n");
} else if (cb > ub) {
(void)printf("\nI win!!!\n");
- if (nrandom(1024) == 0723)
+ if (arc4random_uniform(1024) == 0723)
(void)printf("Hah! Stupid peasant!\n");
} else
(void)printf("\nTie!\n");
@@ -419,7 +416,7 @@ init(void)
for (i = 0; i < TOTCARDS; ++i)
deck[i] = i % RANKS;
for (i = 0; i < TOTCARDS - 1; ++i) {
- j = nrandom(TOTCARDS-i);
+ j = arc4random_uniform(TOTCARDS-i);
if (j == 0)
continue;
temp = deck[i];
@@ -432,18 +429,6 @@ init(void)
}
}
-static int
-nrandom(int n)
-{
- long r;
-
- for (;;) {
- r = random();
- if (r < RANDOM_MAX - RANDOM_MAX % n)
- return (int)(r % n);
- }
-}
-
static void
instructions(void)
{
