n -= l;
continue; /* Interrupted by a signal; keep going. */
}
- else if (l < 0 && errno == ENOSYS)
+ else if (l == -ENOSYS)
break; /* No syscall, so fallback to /dev/urandom. */
arc4random_getrandom_failure ();
}
#include <sys/wait.h>
#include <time.h>
#include <sys/uio.h>
+#include <sys/random.h>
#include <hurd.h>
#include <hurd/fd.h>
#define __fcntl64_nocancel(...) \
__fcntl_nocancel (__VA_ARGS__)
-#define __getrandom_nocancel(buf, size, flags) \
- __getrandom (buf, size, flags)
+static inline ssize_t
+__getrandom_nocancel (void *buf, size_t buflen, unsigned int flags)
+{
+ int save_errno = errno;
+ ssize_t r = __getrandom (buf, buflen, flags);
+ r = r == -1 ? -errno : r;
+ __set_errno (save_errno);
+ return r;
+}
#define __poll_infinity_nocancel(fds, nfds) \
__poll (fds, nfds, -1)
static inline ssize_t
__getrandom_nocancel (void *buf, size_t buflen, unsigned int flags)
{
- return INLINE_SYSCALL_CALL (getrandom, buf, buflen, flags);
+ return INTERNAL_SYSCALL_CALL (getrandom, buf, buflen, flags);
}
static inline int