Libc-1158.50.2.tar.gz

[apple/libc.git] / stdlib / FreeBSD / rand.c

diff --git a/stdlib/FreeBSD/rand.c b/stdlib/FreeBSD/rand.c
index fd9973f7d8e00d6dd0ae580607b9b3a891334090..7090acc7d131c12e0c461e347d0ed59b6c05562b 100644 (file)
--- a/stdlib/FreeBSD/rand.c
+++ b/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: src/lib/libc/stdlib/rand.c,v 1.17 2007/12/11 20:39:32 ache Exp $");
+__FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include <sys/time.h>          /* for sranddev() */
@@ -116,12 +116,12 @@ u_int seed;
  * secure random(4) interface.
  */
 void
-sranddev()
+sranddev(void)
 {
        int fd, done;
 
        done = 0;
-       fd = _open("/dev/random", O_RDONLY, 0);
+       fd = _open("/dev/random", O_RDONLY | O_CLOEXEC, 0);
        if (fd >= 0) {
                if (_read(fd, (void *) &next, sizeof(next)) == sizeof(next))
                        done = 1;
@@ -130,10 +130,9 @@ sranddev()
 
        if (!done) {
                struct timeval tv;
-               unsigned long junk;
 
                gettimeofday(&tv, NULL);
-               srand((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
+               srand((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec);
        }
 }