Skip to content

Commit

Permalink
Fix the build with --no-default-features and more circumstances.
Browse files Browse the repository at this point in the history 
When building with --no-default-features, the default use-libc-auxv
feature is disabled, and rustix falls back to reading the auxv variables
using /proc/self/auxv. This requires some filesystem functions to do,
so ensure that the filesystem code is enabled in configurations that
need that.

Fixes #706.
  • Loading branch information
@sunfishcode
sunfishcode committed Jun 29, 2023
1 parent d30f908 commit ada8be3
Show file tree
Hide file tree
Showing 6 changed files with 238 additions and 147 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ jobs:
- run: cargo check --workspace --release --no-default-features --features use-libc -vv
- run: cargo check --workspace --release --no-default-features --features all-apis -vv
- run: cargo check --workspace --release --no-default-features --features all-apis,use-libc -vv
- run: cargo check --workspace --release --no-default-features --features time -vv
- run: cargo check --workspace --release --no-default-features --features time,use-libc -vv
- run: cargo check --workspace --release --no-default-features --target=i686-unknown-linux-gnu -Zbuild-std -vv

check_nightly:
name: Check nightly-only targets
Expand Down
14 changes: 13 additions & 1 deletion src/backend/linux_raw/c.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,19 @@ pub(crate) use linux_raw_sys::general::{
#[cfg(test)]
pub(crate) use linux_raw_sys::general::epoll_event;

#[cfg(feature = "fs")]
#[cfg(any(
feature = "fs",
all(
not(feature = "use-libc-auxv"),
not(target_vendor = "mustang"),
any(
feature = "param",
feature = "runtime",
feature = "time",
target_arch = "x86",
)
)
))]
pub(crate) use linux_raw_sys::general::{
AT_FDCWD, NFS_SUPER_MAGIC, O_LARGEFILE, PROC_SUPER_MAGIC, UTIME_NOW, UTIME_OMIT, XATTR_CREATE,
XATTR_REPLACE,
Expand Down
272 changes: 134 additions & 138 deletions src/backend/linux_raw/conv.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ use super::time::types::TimerfdClockId;
use crate::clockid::ClockId;
use crate::fd::OwnedFd;
use crate::ffi::CStr;
#[cfg(feature = "fs")]
use crate::fs::{FileType, Mode, OFlags};
use crate::io;
#[cfg(any(feature = "process", feature = "runtime", feature = "termios"))]
use crate::pid::Pid;
Expand All @@ -50,9 +48,6 @@ use core::ptr::null_mut;
use linux_raw_sys::general::__kernel_clockid_t;
#[cfg(target_pointer_width = "64")]
use linux_raw_sys::general::__kernel_loff_t;
#[cfg(target_pointer_width = "32")]
#[cfg(feature = "fs")]
use linux_raw_sys::general::O_LARGEFILE;
#[cfg(feature = "net")]
use linux_raw_sys::net::socklen_t;

Expand Down Expand Up @@ -301,75 +296,159 @@ pub(super) fn socklen_t<'a, Num: ArgNumber>(i: socklen_t) -> ArgReg<'a, Num> {
pass_usize(i as usize)
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<Mode> for ArgReg<'a, Num> {
#[inline]
fn from(mode: Mode) -> Self {
pass_usize(mode.bits() as usize)
#[cfg(any(
feature = "fs",
all(
not(feature = "use-libc-auxv"),
not(target_vendor = "mustang"),
any(
feature = "param",
feature = "runtime",
feature = "time",
target_arch = "x86",
)
)
))]
pub(crate) mod fs {
use super::*;
use crate::fs::{FileType, Mode, OFlags};
#[cfg(target_pointer_width = "32")]
use linux_raw_sys::general::O_LARGEFILE;

impl<'a, Num: ArgNumber> From<Mode> for ArgReg<'a, Num> {
#[inline]
fn from(mode: Mode) -> Self {
pass_usize(mode.bits() as usize)
}
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<(Mode, FileType)> for ArgReg<'a, Num> {
#[inline]
fn from(pair: (Mode, FileType)) -> Self {
pass_usize(pair.0.as_raw_mode() as usize | pair.1.as_raw_mode() as usize)
impl<'a, Num: ArgNumber> From<(Mode, FileType)> for ArgReg<'a, Num> {
#[inline]
fn from(pair: (Mode, FileType)) -> Self {
pass_usize(pair.0.as_raw_mode() as usize | pair.1.as_raw_mode() as usize)
}
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::AtFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::AtFlags) -> Self {
c_uint(flags.bits())
impl<'a, Num: ArgNumber> From<crate::fs::AtFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::AtFlags) -> Self {
c_uint(flags.bits())
}
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::XattrFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::XattrFlags) -> Self {
c_uint(flags.bits())
impl<'a, Num: ArgNumber> From<crate::fs::XattrFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::XattrFlags) -> Self {
c_uint(flags.bits())
}
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::inotify::CreateFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::inotify::CreateFlags) -> Self {
c_uint(flags.bits())
impl<'a, Num: ArgNumber> From<crate::fs::inotify::CreateFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::inotify::CreateFlags) -> Self {
c_uint(flags.bits())
}
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::inotify::WatchFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::inotify::WatchFlags) -> Self {
c_uint(flags.bits())
impl<'a, Num: ArgNumber> From<crate::fs::inotify::WatchFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::inotify::WatchFlags) -> Self {
c_uint(flags.bits())
}
}

impl<'a, Num: ArgNumber> From<crate::fs::MemfdFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::MemfdFlags) -> Self {
c_uint(flags.bits())
}
}

impl<'a, Num: ArgNumber> From<crate::fs::RenameFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::RenameFlags) -> Self {
c_uint(flags.bits())
}
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::MemfdFlags> for ArgReg<'a, Num> {
impl<'a, Num: ArgNumber> From<crate::fs::StatxFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::StatxFlags) -> Self {
c_uint(flags.bits())
}
}

#[cfg(target_pointer_width = "32")]
#[inline]
fn from(flags: crate::fs::MemfdFlags) -> Self {
c_uint(flags.bits())
fn oflags_bits(oflags: OFlags) -> c::c_uint {
let mut bits = oflags.bits();
// Add `O_LARGEFILE`, unless `O_PATH` is set, as Linux returns `EINVAL`
// when both are set.
if !oflags.contains(OFlags::PATH) {
bits |= O_LARGEFILE;
}
bits
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::RenameFlags> for ArgReg<'a, Num> {
#[cfg(target_pointer_width = "64")]
#[inline]
fn from(flags: crate::fs::RenameFlags) -> Self {
c_uint(flags.bits())
const fn oflags_bits(oflags: OFlags) -> c::c_uint {
oflags.bits()
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::StatxFlags> for ArgReg<'a, Num> {
impl<'a, Num: ArgNumber> From<OFlags> for ArgReg<'a, Num> {
#[inline]
fn from(oflags: OFlags) -> Self {
pass_usize(oflags_bits(oflags) as usize)
}
}

/// Convert an `OFlags` into a `u64` for use in the `open_how` struct.
#[inline]
fn from(flags: crate::fs::StatxFlags) -> Self {
c_uint(flags.bits())
pub(crate) fn oflags_for_open_how(oflags: OFlags) -> u64 {
u64::from(oflags_bits(oflags))
}

impl<'a, Num: ArgNumber> From<crate::fs::FallocateFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::FallocateFlags) -> Self {
c_uint(flags.bits())
}
}

impl<'a, Num: ArgNumber> From<crate::fs::Advice> for ArgReg<'a, Num> {
#[inline]
fn from(advice: crate::fs::Advice) -> Self {
c_uint(advice as c::c_uint)
}
}

impl<'a, Num: ArgNumber> From<crate::fs::SealFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::SealFlags) -> Self {
c_uint(flags.bits())
}
}

impl<'a, Num: ArgNumber> From<crate::fs::Access> for ArgReg<'a, Num> {
#[inline]
fn from(access: crate::fs::Access) -> Self {
c_uint(access.bits())
}
}

impl<'a, Num: ArgNumber> From<crate::backend::fs::types::MountFlagsArg> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::backend::fs::types::MountFlagsArg) -> Self {
c_uint(flags.0)
}
}

impl<'a, Num: ArgNumber> From<crate::backend::fs::types::UnmountFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::backend::fs::types::UnmountFlags) -> Self {
c_uint(flags.bits())
}
}
}

Expand Down Expand Up @@ -536,49 +615,6 @@ pub(super) fn dev_t<'a, Num: ArgNumber>(dev: u64) -> io::Result<ArgReg<'a, Num>>
Ok(pass_usize(dev.try_into().map_err(|_err| io::Errno::INVAL)?))
}

#[cfg(target_pointer_width = "32")]
#[cfg(feature = "fs")]
#[inline]
fn oflags_bits(oflags: OFlags) -> c::c_uint {
let mut bits = oflags.bits();
// Add `O_LARGEFILE`, unless `O_PATH` is set, as Linux returns `EINVAL`
// when both are set.
if !oflags.contains(OFlags::PATH) {
bits |= O_LARGEFILE;
}
bits
}

#[cfg(target_pointer_width = "64")]
#[cfg(feature = "fs")]
#[inline]
const fn oflags_bits(oflags: OFlags) -> c::c_uint {
oflags.bits()
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<OFlags> for ArgReg<'a, Num> {
#[inline]
fn from(oflags: OFlags) -> Self {
pass_usize(oflags_bits(oflags) as usize)
}
}

/// Convert an `OFlags` into a `u64` for use in the `open_how` struct.
#[cfg(feature = "fs")]
#[inline]
pub(super) fn oflags_for_open_how(oflags: OFlags) -> u64 {
u64::from(oflags_bits(oflags))
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::FallocateFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::FallocateFlags) -> Self {
c_uint(flags.bits())
}
}

/// Convert a `Resource` into a syscall argument.
#[cfg(feature = "process")]
impl<'a, Num: ArgNumber> From<Resource> for ArgReg<'a, Num> {
Expand Down Expand Up @@ -610,22 +646,6 @@ impl<'a, Num: ArgNumber> From<Signal> for ArgReg<'a, Num> {
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::Advice> for ArgReg<'a, Num> {
#[inline]
fn from(advice: crate::fs::Advice) -> Self {
c_uint(advice as c::c_uint)
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::SealFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::fs::SealFlags) -> Self {
c_uint(flags.bits())
}
}

#[cfg(feature = "io_uring")]
impl<'a, Num: ArgNumber> From<crate::io_uring::IoringEnterFlags> for ArgReg<'a, Num> {
#[inline]
Expand Down Expand Up @@ -710,14 +730,6 @@ impl<'a, Num: ArgNumber> From<(crate::thread::FutexOperation, crate::thread::Fut
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::fs::Access> for ArgReg<'a, Num> {
#[inline]
fn from(access: crate::fs::Access) -> Self {
c_uint(access.bits())
}
}

#[cfg(feature = "net")]
impl<'a, Num: ArgNumber> From<crate::net::SocketType> for ArgReg<'a, Num> {
#[inline]
Expand Down Expand Up @@ -751,22 +763,6 @@ impl<'a, Num: ArgNumber, T> From<&'a mut [MaybeUninit<T>]> for ArgReg<'a, Num> {
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::backend::fs::types::MountFlagsArg> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::backend::fs::types::MountFlagsArg) -> Self {
c_uint(flags.0)
}
}

#[cfg(feature = "fs")]
impl<'a, Num: ArgNumber> From<crate::backend::fs::types::UnmountFlags> for ArgReg<'a, Num> {
#[inline]
fn from(flags: crate::backend::fs::types::UnmountFlags) -> Self {
c_uint(flags.bits())
}
}

#[cfg(any(feature = "process", feature = "thread"))]
impl<'a, Num: ArgNumber> From<crate::ugid::Uid> for ArgReg<'a, Num> {
#[inline]
Expand Down
5 changes: 3 additions & 2 deletions src/backend/linux_raw/fs/syscalls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
#![allow(clippy::undocumented_unsafe_blocks)]

use crate::backend::c;
use crate::backend::conv::fs::oflags_for_open_how;
use crate::backend::conv::{
by_ref, c_int, c_uint, dev_t, oflags_for_open_how, opt_mut, pass_usize, raw_fd, ret, ret_c_int,
ret_c_uint, ret_infallible, ret_owned_fd, ret_usize, size_of, slice, slice_mut, zero,
by_ref, c_int, c_uint, dev_t, opt_mut, pass_usize, raw_fd, ret, ret_c_int, ret_c_uint,
ret_infallible, ret_owned_fd, ret_usize, size_of, slice, slice_mut, zero,
};
#[cfg(target_pointer_width = "64")]
use crate::backend::conv::{loff_t, loff_t_from_u64, ret_u64};
Expand Down
Loading

0 comments on commit ada8be3

Please sign in to comment.