diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dd7a4b9d2..f9e6e4d518 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). ([#952](https://github.com/nix-rust/nix/pull/952)) - Added the `time_t` and `suseconds_t` public aliases within `sys::time`. ([#968](https://github.com/nix-rust/nix/pull/968)) +- Added `unistd::execvpe` for Haiku, Linux and OpenBSD + ([#975](https://github.com/nix-rust/nix/pull/975)) ### Changed - Increased required Rust version to 1.24.1 diff --git a/src/unistd.rs b/src/unistd.rs index aadd3c6bd4..12f3566a44 100644 --- a/src/unistd.rs +++ b/src/unistd.rs @@ -701,6 +701,27 @@ pub fn execvp(filename: &CString, args: &[CString]) -> Result { Err(Error::Sys(Errno::last())) } +/// Replace the current process image with a new one and replicate shell `PATH` +/// searching behavior (see +/// [`execvpe(3)`](http://man7.org/linux/man-pages/man3/exec.3.html)). +/// +/// This functions like a combination of `execvp(2)` and `execve(2)` to pass an +/// environment and have a search path. See these two for additional +/// information. +#[cfg(any(target_os = "haiku", + target_os = "linux", + target_os = "openbsd"))] +pub fn execvpe(filename: &CString, args: &[CString], env: &[CString]) -> Result { + let args_p = to_exec_array(args); + let env_p = to_exec_array(env); + + unsafe { + libc::execvpe(filename.as_ptr(), args_p.as_ptr(), env_p.as_ptr()) + }; + + Err(Error::Sys(Errno::last())) +} + /// Replace the current process image with a new one (see /// [fexecve(2)](http://pubs.opengroup.org/onlinepubs/9699919799/functions/fexecve.html)). /// diff --git a/test/test_unistd.rs b/test/test_unistd.rs index 52eb365c21..b03e8853ab 100644 --- a/test/test_unistd.rs +++ b/test/test_unistd.rs @@ -243,6 +243,9 @@ cfg_if!{ } } +#[cfg(any(target_os = "haiku", target_os = "linux", target_os = "openbsd"))] +execve_test_factory!(test_execvpe, execvpe, &CString::new("sh").unwrap()); + cfg_if!{ if #[cfg(target_os = "android")] { use nix::fcntl::AtFlags;