From d2ff8dd28325566b32e4afbd709424052d7732e0 Mon Sep 17 00:00:00 2001 From: Terakomari Date: Tue, 18 Mar 2025 16:48:43 +0800 Subject: [PATCH 1/6] base32/base64/basenc: add -D flag --- src/uu/base32/src/base_common.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/uu/base32/src/base_common.rs b/src/uu/base32/src/base_common.rs index 0515b52f30f..67bd723e192 100644 --- a/src/uu/base32/src/base_common.rs +++ b/src/uu/base32/src/base_common.rs @@ -112,6 +112,7 @@ pub fn base_app(about: &'static str, usage: &str) -> Command { .arg( Arg::new(options::DECODE) .short('d') + .visible_short_alias('D') .long(options::DECODE) .help("decode data") .action(ArgAction::SetTrue) From 3894082c62ee9233785c8f051499a0c7049284b0 Mon Sep 17 00:00:00 2001 From: Terakomari Date: Tue, 18 Mar 2025 17:22:36 +0800 Subject: [PATCH 2/6] base32/base64/basenc: add test for -D flag --- tests/by-util/test_base32.rs | 2 +- tests/by-util/test_base64.rs | 2 +- tests/by-util/test_basenc.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/by-util/test_base32.rs b/tests/by-util/test_base32.rs index 785db388be2..eb75a4ddf28 100644 --- a/tests/by-util/test_base32.rs +++ b/tests/by-util/test_base32.rs @@ -52,7 +52,7 @@ fn test_base32_encode_file() { #[test] fn test_decode() { - for decode_param in ["-d", "--decode", "--dec"] { + for decode_param in ["-d", "--decode", "--dec", "-D"] { let input = "JBSWY3DPFQQFO33SNRSCC===\n"; // spell-checker:disable-line new_ucmd!() .arg(decode_param) diff --git a/tests/by-util/test_base64.rs b/tests/by-util/test_base64.rs index de6cb48f90b..937e2b073ac 100644 --- a/tests/by-util/test_base64.rs +++ b/tests/by-util/test_base64.rs @@ -72,7 +72,7 @@ fn test_base64_encode_file() { #[test] fn test_decode() { - for decode_param in ["-d", "--decode", "--dec"] { + for decode_param in ["-d", "--decode", "--dec", "-D"] { let input = "aGVsbG8sIHdvcmxkIQ=="; // spell-checker:disable-line new_ucmd!() .arg(decode_param) diff --git a/tests/by-util/test_basenc.rs b/tests/by-util/test_basenc.rs index c0f40cd1d25..3228e664e12 100644 --- a/tests/by-util/test_basenc.rs +++ b/tests/by-util/test_basenc.rs @@ -52,7 +52,7 @@ fn test_base64() { #[test] fn test_base64_decode() { new_ucmd!() - .args(&["--base64", "-d"]) + .args(&["--base64", "-d", "-D"]) .pipe_in("dG8+YmU/") .succeeds() .stdout_only("to>be?"); From 4d10d9c29fa9ccef7f80a87d6697c3b53187e741 Mon Sep 17 00:00:00 2001 From: Terakomari Date: Tue, 18 Mar 2025 17:25:17 +0800 Subject: [PATCH 3/6] update extensions.md --- docs/src/extensions.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/src/extensions.md b/docs/src/extensions.md index fb91f7d543c..21d2ab49a05 100644 --- a/docs/src/extensions.md +++ b/docs/src/extensions.md @@ -93,3 +93,15 @@ also provides a `-v`/`--verbose` flag. ## `uptime` Similar to the proc-ps implementation and unlike GNU/Coreutils, `uptime` provides `-s`/`--since` to show since when the system is up. + +## `base32` + +`base32` provides `-D` to decode data. + +## `base64` + +`base64` provides `-D` to decode data. + +## `basenc` + +`basenc` provides `-D` to decode data. From 09c0a9ffd29b9517a0c98124332da4e87e2c3ecb Mon Sep 17 00:00:00 2001 From: Terakomari Date: Tue, 18 Mar 2025 17:29:28 +0800 Subject: [PATCH 4/6] remove redundant parameters --- tests/by-util/test_basenc.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/by-util/test_basenc.rs b/tests/by-util/test_basenc.rs index 3228e664e12..c0f40cd1d25 100644 --- a/tests/by-util/test_basenc.rs +++ b/tests/by-util/test_basenc.rs @@ -52,7 +52,7 @@ fn test_base64() { #[test] fn test_base64_decode() { new_ucmd!() - .args(&["--base64", "-d", "-D"]) + .args(&["--base64", "-d"]) .pipe_in("dG8+YmU/") .succeeds() .stdout_only("to>be?"); From 8b777f6536af114fd9dcc4f78a9de2781f37ddbd Mon Sep 17 00:00:00 2001 From: Terakomari Date: Tue, 18 Mar 2025 17:38:21 +0800 Subject: [PATCH 5/6] merge into a single category --- docs/src/extensions.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docs/src/extensions.md b/docs/src/extensions.md index 21d2ab49a05..a36c9ebbf08 100644 --- a/docs/src/extensions.md +++ b/docs/src/extensions.md @@ -94,14 +94,6 @@ also provides a `-v`/`--verbose` flag. Similar to the proc-ps implementation and unlike GNU/Coreutils, `uptime` provides `-s`/`--since` to show since when the system is up. -## `base32` +## `base32/base64/basenc` -`base32` provides `-D` to decode data. - -## `base64` - -`base64` provides `-D` to decode data. - -## `basenc` - -`basenc` provides `-D` to decode data. +`base32/base64/basenc` provides `-D` to decode data. From f4ff3d3db14ed142d97a1660ce0287d2d5b94e24 Mon Sep 17 00:00:00 2001 From: Terakomari Date: Tue, 18 Mar 2025 17:42:20 +0800 Subject: [PATCH 6/6] Update docs/src/extensions.md Co-authored-by: Sylvestre Ledru --- docs/src/extensions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/extensions.md b/docs/src/extensions.md index a36c9ebbf08..3c051a1faa6 100644 --- a/docs/src/extensions.md +++ b/docs/src/extensions.md @@ -96,4 +96,4 @@ Similar to the proc-ps implementation and unlike GNU/Coreutils, `uptime` provide ## `base32/base64/basenc` -`base32/base64/basenc` provides `-D` to decode data. +Just like on macOS, `base32/base64/basenc` provides `-D` to decode data.