diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs index 26beaff6e..9e7105b0e 100644 --- a/src/uucore/src/lib/lib.rs +++ b/src/uucore/src/lib/lib.rs @@ -119,21 +119,11 @@ pub fn set_utility_is_second_arg() { static ARGV: Lazy> = Lazy::new(|| wild::args_os().collect()); static UTIL_NAME: Lazy = Lazy::new(|| { - if get_utility_is_second_arg() { - let i = match ARGV[1].eq("manpage") { - true => 1, - false => 0, - }; - &ARGV[1 + i] - } else { - let i = match ARGV[0].eq("manpage") { - true => 1, - false => 0, - }; - &ARGV[i] - } - .to_string_lossy() - .into_owned() + let base_index = if get_utility_is_second_arg() { 1 } else { 0 }; + let is_man = if ARGV[base_index].eq("manpage") { 1 } else { 0 }; + let argv_index = base_index + is_man; + + ARGV[argv_index].to_string_lossy().into_owned() }); /// Derive the utility name.