summaryrefslogtreecommitdiffstats
path: root/contrib/one-true-awk
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2014-10-10 23:18:44 +0000
committerpfg <pfg@FreeBSD.org>2014-10-10 23:18:44 +0000
commite384592b57c8db7e176d49ea18582f5ebc6c365b (patch)
treedd2d486a0bc2a63d26e4050eb60d759e25882cd2 /contrib/one-true-awk
parent5595ee40038c5126db4f066c82af2fb2883d2946 (diff)
downloadFreeBSD-src-e384592b57c8db7e176d49ea18582f5ebc6c365b.zip
FreeBSD-src-e384592b57c8db7e176d49ea18582f5ebc6c365b.tar.gz
MFC r271879:
awk: Use random(3) instead of rand(3) While none of them is considered even near to cryptographic level, random(3) is a better random generator than rand(3). Use random(3) for awk as is done in other systems. PR: 193147
Diffstat (limited to 'contrib/one-true-awk')
-rw-r--r--contrib/one-true-awk/awk.12
-rw-r--r--contrib/one-true-awk/main.c2
-rw-r--r--contrib/one-true-awk/run.c8
3 files changed, 7 insertions, 5 deletions
diff --git a/contrib/one-true-awk/awk.1 b/contrib/one-true-awk/awk.1
index 6119613..b0d243b 100644
--- a/contrib/one-true-awk/awk.1
+++ b/contrib/one-true-awk/awk.1
@@ -208,7 +208,7 @@ or of
if no argument.
.TP
.B rand
-random number on (0,1)
+random number on [0,1)
.TP
.B srand
sets seed for
diff --git a/contrib/one-true-awk/main.c b/contrib/one-true-awk/main.c
index ab01676..ec70294 100644
--- a/contrib/one-true-awk/main.c
+++ b/contrib/one-true-awk/main.c
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
signal(SIGFPE, fpecatch);
srand_seed = 1;
- srand(srand_seed);
+ srandom((unsigned long) srand_seed);
yyin = NULL;
symtab = makesymtab(NSYMTAB/NSYMTAB);
diff --git a/contrib/one-true-awk/run.c b/contrib/one-true-awk/run.c
index cafaff3..2bcd9df 100644
--- a/contrib/one-true-awk/run.c
+++ b/contrib/one-true-awk/run.c
@@ -1521,8 +1521,10 @@ Cell *bltin(Node **a, int n) /* builtin functions. a[0] is type, a[1] is arg lis
u = (Awkfloat) system(getsval(x)) / 256; /* 256 is unix-dep */
break;
case FRAND:
- /* in principle, rand() returns something in 0..RAND_MAX */
- u = (Awkfloat) (rand() % RAND_MAX) / RAND_MAX;
+ /* random() returns numbers in [0..2^31-1]
+ * in order to get a number in [0, 1), divide it by 2^31
+ */
+ u = (Awkfloat) random() / (0x7fffffffL + 0x1UL);
break;
case FSRAND:
if (isrec(x)) /* no argument provided */
@@ -1530,7 +1532,7 @@ Cell *bltin(Node **a, int n) /* builtin functions. a[0] is type, a[1] is arg lis
else
u = getfval(x);
tmp = u;
- srand((unsigned int) u);
+ srandom((unsigned long) u);
u = srand_seed;
srand_seed = tmp;
break;
OpenPOWER on IntegriCloud