More robust read loop

This commit is contained in:
Jōshin 2018-12-27 11:06:22 -08:00
parent f1b44b42a9
commit 30390fa180

35
ent.c
View File

@ -1,27 +1,38 @@
#include <ent/ent.h> #include <ent/ent.h>
#if defined(ENT_USE_URANDOM) #if defined(ENT_URANDOM)
# include <assert.h>
# include <fcntl.h> #include <assert.h>
# include <sys/types.h> #include <fcntl.h>
# include <unistd.h> #include <sys/types.h>
#include <unistd.h>
int int
ent_getentropy(void* buf, size_t buflen) ent_getentropy(void* buf, size_t len)
{ {
int fd; int fd;
ssize_t ret;
assert(buflen <= 256); assert(len <= 256);
if (-1 == (fd = open("/dev/urandom", O_RDONLY))) { if (-1 == (fd = open("/dev/urandom", O_RDONLY))) {
return -1; return -1;
} }
if (buflen != read(fd, buf, buflen)) { while (len != 0 && (ret = read(fd, buf, len)) != 0) {
(void) close(fd); if (ret == -1) {
return -1; if (errno == EINTR)
continue;
break;
}
len -= ret;
buf += ret;
} }
close(fd); (void) close(fd);
return 0; if (ret == 0) {
ret = -1;
errno = EIO;
}
return ret < 0 ? ret : 0;
} }
#endif /* ENT_USE_URANDOM */ #endif /* ENT_USE_URANDOM */