Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add some try_intos for smaller enum types #23

Merged
merged 1 commit into from
Apr 21, 2024
Merged

Add some try_intos for smaller enum types #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@

use ctru_sys::__errno;

// Avoid conflicting a real POSIX errno by using a value < 0
// Should we define this in ctru-sys somewhere or something?
const ECTRU: libc::c_int = -1;

/// Provides the libc `getrandom` API.
///
/// # Safety
///
/// `buflen` must be less than or equal to the size of the buffer pointed to by `buf`.
///
#[no_mangle]
pub unsafe extern "C" fn getrandom(
buf: *mut libc::c_void,
Expand All @@ -14,22 +24,18 @@ pub unsafe extern "C" fn getrandom(
let maxlen = if flags & libc::GRND_RANDOM != 0 {
512
} else {
0x1FFFFFF
0x1FF_FFFF
};
buflen = buflen.min(maxlen);

// Avoid conflicting a real POSIX errno by using a value < 0
// Should we define this in ctru-sys somewhere or something?
const ECTRU: libc::c_int = -1;

let ret = ctru_sys::psInit();

// Error handling code for psInit
if ctru_sys::R_FAILED(ret) {
// Best-effort attempt at translating return codes
*__errno() = match ctru_sys::R_SUMMARY(ret) as libc::c_uint {
*__errno() = match ctru_sys::R_SUMMARY(ret).try_into() {
// The service handle is full (would block to await availability)
ctru_sys::RS_WOULDBLOCK => libc::EAGAIN,
Ok(ctru_sys::RS_WOULDBLOCK) => libc::EAGAIN,
// The caller doesn't have the right to call the service
_ => ECTRU,
};
Expand All @@ -44,12 +50,12 @@ pub unsafe extern "C" fn getrandom(
buflen as libc::ssize_t
} else {
// Best-effort attempt at translating return codes
*__errno() = match ctru_sys::R_SUMMARY(ret) as libc::c_uint {
ctru_sys::RS_WOULDBLOCK => libc::EAGAIN,
ctru_sys::RS_INVALIDARG | ctru_sys::RS_WRONGARG => {
match ctru_sys::R_DESCRIPTION(ret) as libc::c_uint {
*__errno() = match ctru_sys::R_SUMMARY(ret).try_into() {
Ok(ctru_sys::RS_WOULDBLOCK) => libc::EAGAIN,
Ok(ctru_sys::RS_INVALIDARG | ctru_sys::RS_WRONGARG) => {
match ctru_sys::R_DESCRIPTION(ret).try_into() {
// The handle is incorrect (even though we just made it)
ctru_sys::RD_INVALID_HANDLE => ECTRU,
Ok(ctru_sys::RD_INVALID_HANDLE) => ECTRU,
_ => libc::EINVAL,
}
}
Expand Down