Loading...
--- Libc/Libc-1725.40.4/stdlib/FreeBSD/rand.c
+++ Libc/Libc-825.26/stdlib/FreeBSD/rand.c
@@ -33,7 +33,7 @@
static char sccsid[] = "@(#)rand.c 8.1 (Berkeley) 6/14/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.17 2007/12/11 20:39:32 ache Exp $");
#include "namespace.h"
#include <sys/time.h> /* for sranddev() */
@@ -95,13 +95,14 @@
static u_long next = 1;
int
-rand(void)
+rand()
{
return (do_rand(&next));
}
void
-srand(u_int seed)
+srand(seed)
+u_int seed;
{
next = seed;
}
@@ -115,12 +116,12 @@
* secure random(4) interface.
*/
void
-sranddev(void)
+sranddev()
{
int fd, done;
done = 0;
- fd = _open("/dev/random", O_RDONLY | O_CLOEXEC, 0);
+ fd = _open("/dev/random", O_RDONLY, 0);
if (fd >= 0) {
if (_read(fd, (void *) &next, sizeof(next)) == sizeof(next))
done = 1;
@@ -129,9 +130,10 @@
if (!done) {
struct timeval tv;
+ unsigned long junk;
gettimeofday(&tv, NULL);
- srand((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec);
+ srand((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
}
}