mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-06-28 07:18:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make some quick fixes

Browse source
This commit is contained in:
Justine Tunney 2023-10-08 17:56:59 -07:00
parent 94dc7a684e
commit 820c3599ed
No known key found for this signature in database
GPG key ID: BE714B4575D6E328
10 changed files with 50 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libc/calls/getrandom.c
View file

@ -143,33 +143,27 @@ static void GetRandomArnd(char *p, size_t n) {
}
static ssize_t GetRandomBsd(char *p, size_t n, void impl(char *, size_t)) {
errno_t e;
size_t m, i;
if (_weaken(pthread_testcancel_np) &&
(e = _weaken(pthread_testcancel_np)())) {
errno = e;
return -1;
}
for (i = 0;;) {
m = MIN(n - i, 256);
impl(p + i, m);
if ((i += m) == n) {
return n;
}
if (_weaken(pthread_testcancel)) {
_weaken(pthread_testcancel)();
}
}
}
static ssize_t GetDevUrandom(char *p, size_t n) {
int fd;
ssize_t rc;
BLOCK_SIGNALS;
fd = sys_openat(AT_FDCWD, "/dev/urandom", O_RDONLY | O_CLOEXEC, 0);
if (fd == -1) return -1;
pthread_cleanup_push((void *)sys_close, (void *)(intptr_t)fd);
rc = sys_read(fd, p, n);
pthread_cleanup_pop(1);
if (fd != -1) {
rc = sys_read(fd, p, n);
} else {
rc = -1;
}
ALLOW_SIGNALS;
return rc;
}
@ -252,7 +246,7 @@ ssize_t getrandom(void *p, size_t n, unsigned f) {
ssize_t rc;
if ((!p && n) || (IsAsan() && !__asan_is_valid(p, n))) {
rc = efault();
} else if ((f & ~(GRND_RANDOM | GRND_NONBLOCK))) {
} else if (f & ~(GRND_RANDOM | GRND_NONBLOCK)) {
rc = einval();
} else {
rc = __getrandom(p, n, f);