baseNM: protect names against argv[0] (#11373)

Author: oech3

src/uu/base32/src/base32.rs

@@ -16,5 +16,5 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> Command {
-    base_common::base_app(translate!("base32-about"), translate!("base32-usage"))
+    base_common::base_app(translate!("base32-about"), translate!("base32-usage")).name("base32")
 }

src/uu/base32/src/base_common.rs

@@ -104,7 +104,7 @@ pub fn parse_base_cmd_args(args: impl uucore::Args, command: Command) -> UResult
 }
 
 pub fn base_app(about: String, usage: String) -> Command {
-    let cmd = Command::new(uucore::util_name())
+    let cmd = Command::new("")
         .version(uucore::crate_version!())
         .about(about)
         .override_usage(format_usage(&usage))

src/uu/base64/src/base64.rs

@@ -16,5 +16,5 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> Command {
-    base_common::base_app(translate!("base64-about"), translate!("base64-usage"))
+    base_common::base_app(translate!("base64-about"), translate!("base64-usage")).name("base64")
 }

src/uu/basenc/src/basenc.rs

@@ -45,7 +45,8 @@ fn get_encodings() -> Vec<(&'static str, Format, String)> {
 
 pub fn uu_app() -> Command {
     let encodings = get_encodings();
-    let mut command = base_common::base_app(translate!("basenc-about"), translate!("basenc-usage"));
+    let mut command = base_common::base_app(translate!("basenc-about"), translate!("basenc-usage"))
+        .name("basenc");
 
     for encoding in &encodings {
         let raw_arg = Arg::new(encoding.0)

tests/by-util/test_base32.rs

@@ -6,6 +6,15 @@
 
 use uutests::new_ucmd;
 
+#[test]
+fn test_version() {
+    new_ucmd!()
+        .arg("--version")
+        .succeeds()
+        .no_stderr()
+        .stdout_is(format!("base32 {}\n", uucore::crate_version!()));
+}
+
 #[test]
 fn test_encode() {
     let input = "Hello, World!";

tests/by-util/test_base64.rs

@@ -9,6 +9,15 @@
 use uutests::at_and_ucmd;
 use uutests::new_ucmd;
 
+#[test]
+fn test_version() {
+    new_ucmd!()
+        .arg("--version")
+        .succeeds()
+        .no_stderr()
+        .stdout_is(format!("base64 {}\n", uucore::crate_version!()));
+}
+
 #[test]
 #[cfg(target_os = "linux")]
 fn test_base64_non_utf8_paths() {

tests/by-util/test_basenc.rs

@@ -8,6 +8,15 @@
 
 use uutests::{at_and_ucmd, new_ucmd};
 
+#[test]
+fn test_version() {
+    new_ucmd!()
+        .arg("--version")
+        .succeeds()
+        .no_stderr()
+        .stdout_is(format!("basenc {}\n", uucore::crate_version!()));
+}
+
 #[test]
 fn test_z85_not_padded_decode() {
     // The z85 crate deviates from the standard in some cases; we have to catch those