Merge branch 'master' into tcp_congestion

Author: Fensteer

CHANGELOG.md

@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 
 ### Added
+- Added `FromStr` and `Display` impls for `nix::sys::Signal`
+  ([#884](https://github.com/nix-rust/nix/pull/884))
 - Added a `sync` wrapper.
   ([#961](https://github.com/nix-rust/nix/pull/961))
 - Added a `sysinfo` wrapper.
@@ -38,6 +40,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#972](https://github.com/nix-rust/nix/pull/972))
 - Added option `TCP_CONGESTION` in `setsockopt`.
   ([#972](https://github.com/nix-rust/nix/pull/972))
+- 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
@@ -86,8 +90,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#857](https://github.com/nix-rust/nix/pull/857))
 - Added `request_code_write_int!` on FreeBSD/DragonFlyBSD
   ([#833](https://github.com/nix-rust/nix/pull/833))
-- Added `FromStr` and `Display` impls for `nix::sys::Signal`
-  ([#884](https://github.com/nix-rust/nix/pull/884))
 
 ### Changed
 - `Display` and `Debug` for `SysControlAddr` now includes all fields.

src/unistd.rs

@@ -701,6 +701,27 @@ pub fn execvp(filename: &CString, args: &[CString]) -> Result<Void> {
     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<Void> {
+    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)).
 ///

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;