Libc-1439.40.11.tar.gz

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

diff --git a/stdlib/FreeBSD/rand.c b/stdlib/FreeBSD/rand.c
index 359e12a93b61f73c6a79768f471e4ea858525b90..7090acc7d131c12e0c461e347d0ed59b6c05562b 100644 (file)
--- a/stdlib/FreeBSD/rand.c
+++ b/stdlib/FreeBSD/rand.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.

  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.


@@ -37,7 +33,7 @@
 static char sccsid[] = "@(#)rand.c     8.1 (Berkeley) 6/14/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 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.15 2003/02/17 03:52:35 ache Exp $");
+__FBSDID("$FreeBSD$");

 
 #include "namespace.h"
 #include <sys/time.h>          /* for sranddev() */
 
 #include "namespace.h"
 #include <sys/time.h>          /* for sranddev() */


@@ -64,7 +60,7 @@ do_rand(unsigned long *ctx)
 #else   /* !USE_WEAK_SEEDING */
 /*
  * Compute x = (7^5 * x) mod (2^31 - 1)
 #else   /* !USE_WEAK_SEEDING */
 /*
  * Compute x = (7^5 * x) mod (2^31 - 1)

- * wihout overflowing 31 bits:
+ * without overflowing 31 bits:

  *      (2^31 - 1) = 127773 * (7^5) + 2836
  * From "Random number generators: good ones are hard to find",
  * Park and Miller, Communications of the ACM, vol. 31, no. 10,
  *      (2^31 - 1) = 127773 * (7^5) + 2836
  * From "Random number generators: good ones are hard to find",
  * Park and Miller, Communications of the ACM, vol. 31, no. 10,


@@ -120,12 +116,12 @@ u_int seed;
  * secure random(4) interface.
  */
 void
  * secure random(4) interface.
  */
 void

-sranddev()
+sranddev(void)

 {
        int fd, done;
 
        done = 0;
 {
        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;
        if (fd >= 0) {
                if (_read(fd, (void *) &next, sizeof(next)) == sizeof(next))
                        done = 1;


@@ -134,10 +130,9 @@ sranddev()
 
        if (!done) {
                struct timeval tv;
 
        if (!done) {
                struct timeval tv;

-               unsigned long junk;

 
                gettimeofday(&tv, NULL);
 
                gettimeofday(&tv, NULL);

-               srand((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
+               srand((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec);

        }
 }
 
        }
 }