From 508fa19abf6e209a5c3a7c5368453fe64060d8c1 Mon Sep 17 00:00:00 2001 From: Mahdi Ali-Raihan Date: Tue, 3 Nov 2026 00:55:57 -0500 Subject: [PATCH 1/2] Add _PATH_BSHELL to Solaris and Illumos; add _CS_PATH to Solaris as well --- libc-test/build/main.rs | 1 + libc-test/semver/illumos.txt | 1 + libc-test/semver/solarish.txt | 2 ++ src/unix/solarish/illumos.rs | 2 -- src/unix/solarish/mod.rs | 5 +++++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libc-test/build/main.rs b/libc-test/build/main.rs index 718854156ab7..29262b523549 100755 --- a/libc-test/build/main.rs +++ b/libc-test/build/main.rs @@ -995,6 +995,7 @@ fn test_solarish(t: &Target) { "netinet/tcp.h", "netinet/udp.h", "netinet/icmp6.h", + "paths.h", "poll.h", "port.h", "pthread.h", diff --git a/libc-test/semver/illumos.txt b/libc-test/semver/illumos.txt index b80f2e56d96e..67de5eadb093 100644 --- a/libc-test/semver/illumos.txt +++ b/libc-test/semver/illumos.txt @@ -29,6 +29,7 @@ TFD_NONBLOCK TFD_TIMER_ABSTIME TFD_TIMER_CANCEL_ON_SET _CS_PATH +_PATH_BSHELL execl execle execlp diff --git a/libc-test/semver/solarish.txt b/libc-test/semver/solarish.txt index d5a775196f01..c95401687b5d 100644 --- a/libc-test/semver/solarish.txt +++ b/libc-test/semver/solarish.txt @@ -33,6 +33,8 @@ POSIX_SPAWN_WAITPID_NP SIGEV_PORT SIGRTMAX SIGRTMIN +_CS_PATH +_PATH_BSHELL _POSIX_VDISABLE _ST_FSTYPSZ aio_cancel diff --git a/src/unix/solarish/illumos.rs b/src/unix/solarish/illumos.rs index 0f4ddc28953e..38e94a728bfe 100644 --- a/src/unix/solarish/illumos.rs +++ b/src/unix/solarish/illumos.rs @@ -169,8 +169,6 @@ pub const LOCK_UN: c_int = 8; /// for details. pub const _PC_LAST: c_int = 101; -pub const _CS_PATH: c_int = 65; - pub const VSTATUS: usize = 16; pub const VERASE2: usize = 17; diff --git a/src/unix/solarish/mod.rs b/src/unix/solarish/mod.rs index 54c9ad0d267d..e1579d8a2d5e 100644 --- a/src/unix/solarish/mod.rs +++ b/src/unix/solarish/mod.rs @@ -2197,6 +2197,11 @@ pub const P_FORCED: c_int = 0x10000000; pub const PI_TYPELEN: c_int = 16; pub const PI_FPUTYPE: c_int = 32; +pub const _CS_PATH: c_int = 65; + +// paths.h +pub const _PATH_BSHELL: *const c_char = cstr!("/usr/bin/sh"); + // sys/auxv.h pub const AT_SUN_HWCAP: c_uint = 2009; From 9a260f2a280ff02c49d66b84c474ca1adae0942b Mon Sep 17 00:00:00 2001 From: Mahdi Ali-Raihan Date: Tue, 3 Nov 2026 02:57:25 -0500 Subject: [PATCH 2/2] Add _PATH_DEFPATH to illumos --- libc-test/semver/illumos.txt | 1 + src/unix/solarish/illumos.rs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/libc-test/semver/illumos.txt b/libc-test/semver/illumos.txt index 67de5eadb093..dc7831cfe329 100644 --- a/libc-test/semver/illumos.txt +++ b/libc-test/semver/illumos.txt @@ -30,6 +30,7 @@ TFD_TIMER_ABSTIME TFD_TIMER_CANCEL_ON_SET _CS_PATH _PATH_BSHELL +_PATH_DEFPATH execl execle execlp diff --git a/src/unix/solarish/illumos.rs b/src/unix/solarish/illumos.rs index 38e94a728bfe..2f9312dd5d5a 100644 --- a/src/unix/solarish/illumos.rs +++ b/src/unix/solarish/illumos.rs @@ -233,6 +233,9 @@ pub const TFD_NONBLOCK: i32 = 0o4000; pub const TFD_TIMER_ABSTIME: i32 = 1 << 0; pub const TFD_TIMER_CANCEL_ON_SET: i32 = 1 << 1; +// paths.h +pub const _PATH_DEFPATH: *const c_char = cstr!("/usr/ccs/bin:/usr/bin:/bin"); + extern "C" { pub fn eventfd(initval: c_uint, flags: c_int) -> c_int;