RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

coreutils: fixed panic when multi-call binary has empty or non-UTF-8 name

Browse source 
The multi-call `coreutils` binary starts by trying to
convert its invocation path into a UTF-8 string, panicking
if this doesn't work.

This patch makes `coreutils` exit gracefully in this case.
This commit is contained in:
Bart Massey 2023-02-14 00:21:16 -08:00
parent 072335a2ff
commit abc5cfb950
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bin/coreutils.rs
View file

@ -41,8 +41,8 @@ fn binary_path(args: &mut impl Iterator<Item = OsString>) -> PathBuf {
} }
} }
fn name(binary_path: &Path) -> &str { fn name(binary_path: &Path) -> Option<&str> {
binary_path.file_stem().unwrap().to_str().unwrap() binary_path.file_stem()?.to_str()
} }
fn main() { fn main() {
@ -52,7 +52,10 @@ fn main() {
let mut args = uucore::args_os(); let mut args = uucore::args_os();
let binary = binary_path(&mut args); let binary = binary_path(&mut args);
let binary_as_util = name(&binary); let binary_as_util = name(&binary).unwrap_or_else(|| {
usage(&utils, "<unknown binary name>");
process::exit(0);
});
// binary name equals util name? // binary name equals util name?
if let Some(&(uumain, _)) = utils.get(binary_as_util) { if let Some(&(uumain, _)) = utils.get(binary_as_util) {