c2ba419409
* Correctly handle possibly misaligned pointers in readdir This reapplies #615, which was inadvertently reverted. * Tidy up unneeded `self::` qualifiers. * Make Dir's contents private. Also remove the `unsafe` from `impl_iter`. With `Dir`'s field being private, we can rely on the pointer being only what we've assigned to it. * Make `poll`'s timeout argument a `libc::c_int`. This clarifies that there are no subsequent conversions before calling the underlying libc API. * Use clock_gettime instead of clock_getres to get the time. * Mark FileType::from_raw as safe. It handles unknown values, so it can be marked safe.
48 lines
1.3 KiB
Rust
48 lines
1.3 KiB
Rust
use crate::{Errno, Result};
|
|
use bitflags::bitflags;
|
|
use std::{convert::TryInto, os::unix::prelude::*};
|
|
|
|
bitflags! {
|
|
pub struct PollFlags: libc::c_short {
|
|
const POLLIN = libc::POLLIN;
|
|
const POLLPRI = libc::POLLPRI;
|
|
const POLLOUT = libc::POLLOUT;
|
|
const POLLRDNORM = libc::POLLRDNORM;
|
|
const POLLWRNORM = libc::POLLWRNORM;
|
|
const POLLRDBAND = libc::POLLRDBAND;
|
|
const POLLWRBAND = libc::POLLWRBAND;
|
|
const POLLERR = libc::POLLERR;
|
|
const POLLHUP = libc::POLLHUP;
|
|
const POLLNVAL = libc::POLLNVAL;
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
|
|
#[repr(C)]
|
|
pub struct PollFd(libc::pollfd);
|
|
|
|
impl PollFd {
|
|
pub unsafe fn new(fd: RawFd, events: PollFlags) -> Self {
|
|
Self(libc::pollfd {
|
|
fd,
|
|
events: events.bits(),
|
|
revents: PollFlags::empty().bits(),
|
|
})
|
|
}
|
|
|
|
pub fn revents(self) -> Option<PollFlags> {
|
|
PollFlags::from_bits(self.0.revents)
|
|
}
|
|
}
|
|
|
|
pub fn poll(fds: &mut [PollFd], timeout: libc::c_int) -> Result<usize> {
|
|
Errno::from_result(unsafe {
|
|
libc::poll(
|
|
fds.as_mut_ptr() as *mut libc::pollfd,
|
|
fds.len() as libc::nfds_t,
|
|
timeout,
|
|
)
|
|
})
|
|
.and_then(|nready| nready.try_into().map_err(Into::into))
|
|
}
|