Fix compilation errors on illumos.

Make rustix compile under x86_64-unknown-illumos. This configuration is
not yet tested; this just fixes the compilation errors.

Author: sunfishcode

.github/workflows/main.yml

@@ -57,6 +57,7 @@ jobs:
         x86_64-unknown-freebsd
         x86_64-unknown-netbsd
         x86_64-fuchsia
+        x86_64-unknown-illumos
         i686-unknown-linux-gnu
         i686-unknown-linux-musl
         wasm32-unknown-emscripten
@@ -77,6 +78,7 @@ jobs:
     - run: cargo check --workspace --release -vv --target=x86_64-unknown-freebsd
     - run: cargo check --workspace --release -vv --target=x86_64-unknown-netbsd
     - run: cargo check --workspace --release -vv --target=x86_64-fuchsia
+    - run: cargo check --workspace --release -vv --target=x86_64-unknown-illumos
     - run: cargo check --workspace --release -vv --target=i686-unknown-linux-gnu
     - run: cargo check --workspace --release -vv --target=i686-unknown-linux-musl
     - run: cargo check --workspace --release -vv --target=wasm32-unknown-emscripten

src/fs/abs.rs

@@ -1,8 +1,18 @@
 //! POSIX-style filesystem functions which operate on bare paths.
 
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 use crate::{imp, io, path};
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 use imp::fs::StatFs;
 
 /// `statfs`—Queries filesystem metadata.
@@ -11,7 +21,12 @@ use imp::fs::StatFs;
 ///  - [Linux]
 ///
 /// [Linux]: https://man7.org/linux/man-pages/man2/statfs.2.html
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 #[inline]
 pub fn statfs<P: path::Arg>(path: P) -> io::Result<StatFs> {
     path.into_with_z_str(|path| imp::syscalls::statfs(path))

src/fs/at.rs

@@ -18,7 +18,9 @@ use crate::process::{Gid, Uid};
 use crate::{imp, path};
 use alloc::vec::Vec;
 use imp::fd::{AsFd, BorrowedFd};
-use imp::fs::{Access, AtFlags, Mode, OFlags, Stat};
+#[cfg(not(target_os = "illumos"))]
+use imp::fs::Access;
+use imp::fs::{AtFlags, Mode, OFlags, Stat};
 #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "wasi")))]
 use imp::fs::{Dev, FileType};
 
@@ -247,6 +249,7 @@ pub fn statat<P: path::Arg, Fd: AsFd>(dirfd: &Fd, path: P, flags: AtFlags) -> io
 ///
 /// [POSIX]: https://pubs.opengroup.org/onlinepubs/9699919799/functions/faccessat.html
 /// [Linux]: https://man7.org/linux/man-pages/man2/faccessat.2.html
+#[cfg(not(target_os = "illumos"))]
 #[inline]
 #[doc(alias = "faccessat")]
 pub fn accessat<P: path::Arg, Fd: AsFd>(

src/fs/fcntl.rs

@@ -81,6 +81,7 @@ pub fn fcntl_setfl<Fd: AsFd>(fd: &Fd, flags: OFlags) -> io::Result<()> {
         not(any(
             target_os = "dragonfly",
             target_os = "freebsd",
+            target_os = "illumos",
             target_os = "ios",
             target_os = "macos",
             target_os = "netbsd",

src/fs/fd.rs

@@ -8,13 +8,19 @@ use crate::{imp, io};
 use imp::fd::{AsFd, BorrowedFd};
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox"
 )))]
 use imp::fs::FallocateFlags;
 use imp::fs::Stat;
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 // not implemented in libc for netbsd yet
 use imp::fs::StatFs;
 #[cfg(not(target_os = "wasi"))]
@@ -110,7 +116,12 @@ pub fn fstat<Fd: AsFd>(fd: &Fd) -> io::Result<Stat> {
 ///  - [Linux]
 ///
 /// [Linux]: https://man7.org/linux/man-pages/man2/fstatfs.2.html
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))] // not implemented in libc for netbsd yet
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))] // not implemented in libc for netbsd yet
 #[inline]
 pub fn fstatfs<Fd: AsFd>(fd: &Fd) -> io::Result<StatFs> {
     let fd = fd.as_fd();
@@ -148,6 +159,7 @@ pub fn futimens<Fd: AsFd>(fd: &Fd, times: &Timestamps) -> io::Result<()> {
 /// [Linux `posix_fallocate`]: https://man7.org/linux/man-pages/man3/posix_fallocate.3.html
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox"

src/fs/mod.rs

@@ -15,6 +15,7 @@ mod cwd;
 mod dir;
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
@@ -33,6 +34,7 @@ mod file_type;
 mod getpath;
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "freebsd",
     target_os = "macos",
@@ -51,8 +53,15 @@ mod sendfile;
 #[cfg(all(target_os = "linux", target_env = "gnu"))]
 mod statx;
 
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 pub use abs::statfs;
+#[cfg(not(any(target_os = "illumos", target_os = "redox")))]
+pub use at::accessat;
 #[cfg(any(target_os = "ios", target_os = "macos"))]
 pub use at::fclonefileat;
 #[cfg(not(any(
@@ -64,12 +73,12 @@ pub use at::fclonefileat;
 pub use at::mknodat;
 #[cfg(any(linux_raw, all(libc, any(target_os = "android", target_os = "linux"))))]
 pub use at::renameat_with;
+#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
+pub use at::{chmodat, chownat};
 #[cfg(not(target_os = "redox"))]
 pub use at::{
-    accessat, linkat, mkdirat, openat, readlinkat, renameat, statat, symlinkat, unlinkat, utimensat,
+    linkat, mkdirat, openat, readlinkat, renameat, statat, symlinkat, unlinkat, utimensat,
 };
-#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
-pub use at::{chmodat, chownat};
 #[cfg(not(target_os = "redox"))]
 pub use constants::AtFlags;
 #[cfg(any(target_os = "ios", target_os = "macos"))]
@@ -90,6 +99,7 @@ pub use cwd::cwd;
 pub use dir::{Dir, DirEntry};
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
@@ -102,6 +112,7 @@ pub use fcntl::fcntl_dupfd_cloexec;
 #[cfg(not(any(
     target_os = "dragonfly",
     target_os = "freebsd",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
@@ -120,6 +131,7 @@ pub use fcopyfile::{
 };
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox"
@@ -132,7 +144,12 @@ pub use fd::fallocate;
     target_os = "redox"
 )))]
 pub use fd::fdatasync;
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 // not implemented in libc for netbsd yet
 pub use fd::fstatfs;
 #[cfg(not(target_os = "wasi"))]
@@ -143,6 +160,7 @@ pub use file_type::FileType;
 pub use getpath::getpath;
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "freebsd",
     target_os = "macos",
@@ -163,13 +181,23 @@ pub use statx::{statx, StatxFlags};
 
 pub use imp::fs::Stat;
 
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 pub use imp::fs::StatFs;
 
 #[cfg(any(linux_raw, all(libc, target_os = "linux", target_env = "gnu")))]
 pub use imp::fs::Statx;
 
-#[cfg(not(any(target_os = "netbsd", target_os = "openbsd", target_os = "redox")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "redox"
+)))]
 pub use imp::fs::FallocateFlags;
 
 /// `UTIME_NOW` for use with [`utimensat`].

src/imp/libc/fs/dir.rs

@@ -1,5 +1,6 @@
 use super::super::c;
 use super::super::conv::owned_fd;
+#[cfg(not(target_os = "illumos"))]
 use super::FileType;
 #[cfg(not(any(io_lifetimes_use_std, not(feature = "std"))))]
 use crate::fd::IntoFd;
@@ -115,6 +116,7 @@ impl Dir {
 // struct, as the name is NUL-terminated and memory may not be allocated for
 // the full extent of the struct. Copy the fields one at a time.
 unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
+    #[cfg(not(target_os = "illumos"))]
     let d_type = input.d_type;
 
     #[cfg(not(any(
@@ -158,6 +160,7 @@ unsafe fn read_dirent(input: &libc_dirent) -> libc_dirent {
     // whole `d_name` field, which may not be entirely allocated.
     #[cfg_attr(target_os = "wasi", allow(unused_mut))]
     let mut dirent = libc_dirent {
+        #[cfg(not(target_os = "illumos"))]
         d_type,
         #[cfg(not(any(
             target_os = "dragonfly",
@@ -269,6 +272,7 @@ impl DirEntry {
 
     /// Returns the type of this directory entry.
     #[inline]
+    #[cfg(not(target_os = "illumos"))]
     pub fn file_type(&self) -> FileType {
         FileType::from_dirent_d_type(self.dirent.d_type)
     }

src/imp/libc/fs/mod.rs

@@ -5,6 +5,7 @@ pub(crate) mod syscalls;
 mod dir;
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "freebsd",
     target_os = "macos",
@@ -20,6 +21,7 @@ mod types;
 pub use dir::{Dir, DirEntry};
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "freebsd",
     target_os = "macos",
@@ -31,18 +33,29 @@ pub use dir::{Dir, DirEntry};
 pub use makedev::{major, makedev, minor};
 #[cfg(not(any(
     target_os = "dragonfly",
+    target_os = "illumos",
     target_os = "ios",
     target_os = "macos",
     target_os = "netbsd",
     target_os = "openbsd",
     target_os = "redox"
 )))]
 pub use types::Advice;
-#[cfg(not(any(target_os = "netbsd", target_os = "openbsd", target_os = "redox")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "openbsd",
+    target_os = "redox"
+)))]
 pub use types::FallocateFlags;
 #[cfg(not(target_os = "wasi"))]
 pub use types::FlockOperation;
-#[cfg(not(any(target_os = "netbsd", target_os = "redox", target_os = "wasi")))]
+#[cfg(not(any(
+    target_os = "illumos",
+    target_os = "netbsd",
+    target_os = "redox",
+    target_os = "wasi"
+)))]
 pub use types::StatFs;
 #[cfg(any(target_os = "ios", target_os = "macos"))]
 pub use types::{copyfile_state_t, CloneFlags, CopyfileFlags};