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..dc7831cfe329 100644 --- a/libc-test/semver/illumos.txt +++ b/libc-test/semver/illumos.txt @@ -29,6 +29,8 @@ TFD_NONBLOCK TFD_TIMER_ABSTIME TFD_TIMER_CANCEL_ON_SET _CS_PATH +_PATH_BSHELL +_PATH_DEFPATH 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..2f9312dd5d5a 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; @@ -235,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; 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;