diff options
| author | David Carlier <devnexen@gmail.com> | 2023-01-21 17:10:07 +0000 |
|---|---|---|
| committer | David Carlier <devnexen@gmail.com> | 2023-07-30 10:32:35 +0100 |
| commit | 4b73cf3446b3b5aea7996de7cddbe5ebb46b7ca0 (patch) | |
| tree | 527c54e5eb51ad6c26619db1cea50bbdd193fbea | |
| parent | 2e0136a131f6ed5f6071adf36db08dd8d2205d19 (diff) | |
| download | rust-4b73cf3446b3b5aea7996de7cddbe5ebb46b7ca0.tar.gz rust-4b73cf3446b3b5aea7996de7cddbe5ebb46b7ca0.zip | |
rand use getrandom for freebsd (available since 12.x)
| -rw-r--r-- | library/std/src/sys/unix/rand.rs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/library/std/src/sys/unix/rand.rs b/library/std/src/sys/unix/rand.rs index fbf158f56fc..bdf725fbe5a 100644 --- a/library/std/src/sys/unix/rand.rs +++ b/library/std/src/sys/unix/rand.rs @@ -62,18 +62,15 @@ mod imp { unsafe { getrandom(buf.as_mut_ptr().cast(), buf.len(), libc::GRND_NONBLOCK) } } - #[cfg(any(target_os = "espidf", target_os = "horizon"))] + #[cfg(any(target_os = "espidf", target_os = "horizon", target_os = "freebsd"))] fn getrandom(buf: &mut [u8]) -> libc::ssize_t { - unsafe { libc::getrandom(buf.as_mut_ptr().cast(), buf.len(), 0) } - } - - #[cfg(target_os = "freebsd")] - fn getrandom(buf: &mut [u8]) -> libc::ssize_t { - // FIXME: using the above when libary std's libc is updated + #[cfg(not(target_os = "freebsd"))] + use libc::getrandom; + #[cfg(target_os = "freebsd")] extern "C" { fn getrandom( - buffer: *mut libc::c_void, - length: libc::size_t, + buf: *mut libc::c_void, + buflen: libc::size_t, flags: libc::c_uint, ) -> libc::ssize_t; } @@ -236,6 +233,7 @@ mod imp { } } +// FIXME: once the 10.x release becomes the minimum, this can be dropped for simplification. #[cfg(target_os = "netbsd")] mod imp { use crate::ptr; |
