O_NONBLOCK from src/lib/w32/w32misc.h is stricly for use with our
fcntl(). pick_seed() passes it to open(), which is wrong. With any
luck, open() fails as it should anyway (the files being opened are not
expected to exist under Windows). Messed up in commit
9102ecce5 "Fix
PRNG seeding to resist guessing", v4.3.31.
Clean up: guard with #ifndef _WIN32.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
* chance.c: Roll dice
*
* Known contributors to this file:
* chance.c: Roll dice
*
* Known contributors to this file:
- * Markus Armbruster, 2006-2012
+ * Markus Armbruster, 2006-2021
unsigned
pick_seed(void)
{
unsigned
pick_seed(void)
{
unsigned seed;
int got_seed = 0;
struct timeval tv;
pid_t pid;
unsigned seed;
int got_seed = 0;
struct timeval tv;
pid_t pid;
+#ifndef _WIN32
+ int fd;
/*
* Modern systems provide random number devices, but the details
/*
* Modern systems provide random number devices, but the details
got_seed = read(fd, &seed, sizeof(seed)) == sizeof(seed);
close(fd);
}
got_seed = read(fd, &seed, sizeof(seed)) == sizeof(seed);
close(fd);
}
if (!got_seed) {
/* Kernel didn't provide, fall back to hashing time and PID */
if (!got_seed) {
/* Kernel didn't provide, fall back to hashing time and PID */