mirrors/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2025-12-23 08:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

runcon: use Command::exec() instead of libc::execvp()

Browse source 
No need to use the libc crate for execvp, the standard rust library provides the functionality via `Command::exec()`.

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
This commit is contained in:
Etienne Cordonnier 2025-12-09 13:27:43 +01:00
parent aaa061052f
commit dae7befb14
1 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/uu/runcon/src/runcon.rs
View file

@ -15,9 +15,10 @@ use uucore::format_usage;
use std::borrow::Cow;
use std::ffi::{CStr, CString, OsStr, OsString};
use std::os::raw::c_char;
use std::io;
use std::os::unix::ffi::OsStrExt;
use std::{io, ptr};
use std::os::unix::process::CommandExt;
use std::process;
mod errors;
@ -367,23 +368,8 @@ fn get_custom_context(
/// compiler the only valid return type is to say "if this returns, it will
/// always return an error".
fn execute_command(command: &OsStr, arguments: &[OsString]) -> UResult<()> {
let c_command = os_str_to_c_string(command).map_err(RunconError::new)?;
let err = process::Command::new(command).args(arguments).exec();
let argv_storage: Vec<CString> = arguments
.iter()
.map(AsRef::as_ref)
.map(os_str_to_c_string)
.collect::<Result<_>>()
.map_err(RunconError::new)?;
let mut argv: Vec<*const c_char> = Vec::with_capacity(arguments.len().saturating_add(2));
argv.push(c_command.as_ptr());
argv.extend(argv_storage.iter().map(AsRef::as_ref).map(CStr::as_ptr));
argv.push(ptr::null());
unsafe { libc::execvp(c_command.as_ptr(), argv.as_ptr()) };
let err = io::Error::last_os_error();
let exit_status = if err.kind() == io::ErrorKind::NotFound {
error_exit_status::NOT_FOUND
} else {