42fae4e3b8
* Yanix now returns io::Error This commit may seem somewhat controversial at first, but hear me out first. Currently, Yanix would return a custom error that's a wrapper around three other error types returned by various entities inside Rust's `libstd`. In particular, Yanix's error type would wrap `io::Error`, `num::TryFromIntError` and `ffi::NulError`. It turns out that there is a natural conversion between the first and the last and provided by the standard library, i.e., `From<ffi::NulError> for io::Error` is provided. So at the surface it may seem that only the first two wrapped error types are worth keeping. Digging a little bit deeper into `libstd`, `num::TryFromIntError` is essentially speaking only a marker that the integral conversion went wrong. The struct implementing this error stores a unit type, and nothing more. It therefore seems like a waste to wrap this particular error when we could unify everything under `io::Error`. And so, whenever we perform an int conversion, I suggest we simply remap the error to `io::Error::from_raw_os_error(libc::EOVERFLOW)` since this carries a comparable amount of information. As a result of completely discarding `yanix::Error` custom error type, we are invariably simplifying `yanix` itself, but also allowing `wasi-common` to simplify in several places as well. * Adapt wasi-common to changes in yanix * Add Cargo.lock * Unwrap try_into's where possible * Remove unnecessary type annotation
35 lines
1.1 KiB
Rust
35 lines
1.1 KiB
Rust
use crate::{
|
|
file::{FdFlag, OFlag},
|
|
from_result, from_success_code,
|
|
};
|
|
use std::io::Result;
|
|
use std::os::unix::prelude::*;
|
|
|
|
pub unsafe fn dup_fd(fd: RawFd, close_on_exec: bool) -> Result<RawFd> {
|
|
// Both fcntl commands expect a RawFd arg which will specify
|
|
// the minimum duplicated RawFd number. In our case, I don't
|
|
// think we have to worry about this that much, so passing in
|
|
// the RawFd descriptor we want duplicated
|
|
from_result(if close_on_exec {
|
|
libc::fcntl(fd, libc::F_DUPFD_CLOEXEC, fd)
|
|
} else {
|
|
libc::fcntl(fd, libc::F_DUPFD, fd)
|
|
})
|
|
}
|
|
|
|
pub unsafe fn get_fd_flags(fd: RawFd) -> Result<FdFlag> {
|
|
from_result(libc::fcntl(fd, libc::F_GETFD)).map(FdFlag::from_bits_truncate)
|
|
}
|
|
|
|
pub unsafe fn set_fd_flags(fd: RawFd, flags: FdFlag) -> Result<()> {
|
|
from_success_code(libc::fcntl(fd, libc::F_SETFD, flags.bits()))
|
|
}
|
|
|
|
pub unsafe fn get_status_flags(fd: RawFd) -> Result<OFlag> {
|
|
from_result(libc::fcntl(fd, libc::F_GETFL)).map(OFlag::from_bits_truncate)
|
|
}
|
|
|
|
pub unsafe fn set_status_flags(fd: RawFd, flags: OFlag) -> Result<()> {
|
|
from_success_code(libc::fcntl(fd, libc::F_SETFL, flags.bits()))
|
|
}
|