diff options
author | Qingping Hou <dave2008713@gmail.com> | 2015-05-03 02:19:52 -0400 |
---|---|---|
committer | Qingping Hou <dave2008713@gmail.com> | 2015-05-05 05:23:05 -0400 |
commit | 40539b5c23db468f963a82ee947eb79d654220cf (patch) | |
tree | 4d870e47c51f1d3b1b95d811bebf48254ec4d153 /src/unistd.rs | |
parent | 05b7749fdc147b3f413b97b3a0adfc0cec91891c (diff) | |
download | nix-40539b5c23db468f963a82ee947eb79d654220cf.zip |
feat: add execvpe
Diffstat (limited to 'src/unistd.rs')
-rw-r--r-- | src/unistd.rs | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/unistd.rs b/src/unistd.rs index 354e46db..a4e37412 100644 --- a/src/unistd.rs +++ b/src/unistd.rs @@ -29,6 +29,9 @@ mod ffi { // execute program // doc: http://man7.org/linux/man-pages/man2/execve.2.html pub fn execve(filename: *const c_char, argv: *const *const c_char, envp: *const *const c_char) -> c_int; + // doc: http://man7.org/linux/man-pages/man3/exec.3.html + #[cfg(any(target_os = "linux", target_os = "android"))] + pub fn execvpe(filename: *const c_char, argv: *const *const c_char, envp: *const *const c_char) -> c_int; // run the current process in the background // doc: http://man7.org/linux/man-pages/man3/daemon.3.html @@ -312,9 +315,12 @@ pub fn chroot<P: ?Sized + NixPath>(path: &P) -> Result<()> { #[cfg(any(target_os = "linux", target_os = "android"))] mod linux { + use std::ptr; use sys::syscall::{syscall, SYSPIVOTROOT}; use errno::Errno; use {Error, Result, NixPath}; + use std::ffi::CString; + use libc::c_char; pub fn pivot_root<P1: ?Sized + NixPath, P2: ?Sized + NixPath>( new_root: &P1, put_old: &P2) -> Result<()> { @@ -332,4 +338,23 @@ mod linux { Ok(()) } + + #[inline] + pub fn execvpe(filename: &CString, args: &[CString], env: &[CString]) -> Result<()> { + let mut args_p: Vec<*const c_char> = args.iter().map(|s| s.as_ptr()).collect(); + args_p.push(ptr::null()); + + let mut env_p: Vec<*const c_char> = env.iter().map(|s| s.as_ptr()).collect(); + env_p.push(ptr::null()); + + let res = unsafe { + super::ffi::execvpe(filename.as_ptr(), args_p.as_ptr(), env_p.as_ptr()) + }; + + if res != 0 { + return Err(Error::Sys(Errno::last())); + } + + unreachable!() + } } |