diff options
Diffstat (limited to 'rnd.c')
| -rw-r--r-- | rnd.c | 44 |
1 files changed, 30 insertions, 14 deletions
@@ -2,30 +2,32 @@ #include "common.h" -static char reservoir[128U << 10]; -static size_t reservoir_off = sizeof(reservoir); +static char *reservoir; +static size_t reservoir_off; +static size_t reservoir_size; static int random_fd; static const char *random_fname; -size_t -max_blksize(void) -{ - size_t ret = sizeof(reservoir); - while (ret & (ret - 1U)) - ret &= ret - 1U; - return ret; -} - - void -init_random(int fd, const char *fname) +init_random(int fd, const char *fname, off_t blksize) { struct stat st; + if (blksize <= 0) { + blksize = (off_t)64 << 20; + } else if (blksize > (off_t)1 << 30) { + weprintf("limiting block size to 1G"); + blksize = 1; + blksize <<= 30; + } + random_fname = fname; random_fd = fd; + reservoir_size = (size_t)blksize; + reservoir = emalloc(reservoir_size); + errno = 0; if (isatty(random_fd) || errno == EBADF) { use_builtin_generator: @@ -41,13 +43,27 @@ init_random(int fd, const char *fname) } +void +destroy_random(void) +{ + free(reservoir); +} + + +size_t +max_blksize(void) +{ + return reservoir_size; +} + + const char * get_random(size_t needed) { size_t off; ssize_t r; - if (sizeof(reservoir) - reservoir_off >= needed) + if (reservoir_size - reservoir_off >= needed) return &reservoir[reservoir_off]; if (random_fd < 0) { |