Merge pull request #10041 from oech3/hashsum-windows

hashsum, cksum: Move --check confliction to clap

Author: sylvestre

src/uu/cksum/src/cksum.rs

@@ -132,14 +132,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             return Err(ChecksumError::AlgorithmNotSupportedWithCheck.into());
         }
 
-        let text_flag = matches.get_flag(options::TEXT);
-        let binary_flag = matches.get_flag(options::BINARY);
-        let tag = matches.get_flag(options::TAG);
-
-        if tag || binary_flag || text_flag {
-            return Err(ChecksumError::BinaryTextConflict.into());
-        }
-
         // Execute the checksum validation based on the presence of files or the use of stdin
 
         let verbose = ChecksumVerbose::new(status, quiet, warn);
@@ -251,6 +243,9 @@ pub fn uu_app() -> Command {
                 .short('c')
                 .long(options::CHECK)
                 .help(translate!("cksum-help-check"))
+                .conflicts_with(options::TAG)
+                .conflicts_with(options::BINARY)
+                .conflicts_with(options::TEXT)
                 .action(ArgAction::SetTrue),
         )
         .arg(

src/uu/hashsum/src/hashsum.rs

@@ -170,18 +170,7 @@ pub fn uumain(mut args: impl uucore::Args) -> UResult<()> {
         .map(|s| s.as_os_str());
 
     if check {
-        // on Windows, allow --binary/--text to be used with --check
-        // and keep the behavior of defaulting to binary
-        #[cfg(not(windows))]
-        {
-            let text_flag = matches.get_flag("text");
-            let binary_flag = matches.get_flag("binary");
-
-            if binary_flag || text_flag {
-                return Err(ChecksumError::BinaryTextConflict.into());
-            }
-        }
-
+        // No reason to allow --check with --binary/--text on Cygwin. It want to be same with Linux and --text was broken for a long time.
         let verbose = ChecksumVerbose::new(status, quiet, warn);
 
         let opts = ChecksumValidateOptions {
@@ -231,6 +220,10 @@ mod options {
 }
 
 pub fn uu_app_common() -> Command {
+    // --text --arg-deps-check should be error by Arg::new(options::CHECK)...conflicts_with(options::TEXT)
+    // https://github.com/clap-rs/clap/issues/4520 ?
+    // Let --{warn,strict,quiet,status,ignore-missing} reject --text and remove them later.
+    // Bad error message, but not a lie...
     Command::new(uucore::util_name())
         .version(uucore::crate_version!())
         .help_template(uucore::localized_help_template(uucore::util_name()))
@@ -260,7 +253,9 @@ pub fn uu_app_common() -> Command {
                 .long("check")
                 .help(translate!("hashsum-help-check"))
                 .action(ArgAction::SetTrue)
-                .conflicts_with("tag"),
+                .conflicts_with(options::BINARY)
+                .conflicts_with(options::TEXT)
+                .conflicts_with(options::TAG),
         )
         .arg(
             Arg::new(options::TAG)
@@ -293,6 +288,7 @@ pub fn uu_app_common() -> Command {
                 .help(translate!("hashsum-help-quiet"))
                 .action(ArgAction::SetTrue)
                 .overrides_with_all([options::STATUS, options::WARN])
+                .conflicts_with("text")
                 .requires(options::CHECK),
         )
         .arg(
@@ -302,20 +298,23 @@ pub fn uu_app_common() -> Command {
                 .help(translate!("hashsum-help-status"))
                 .action(ArgAction::SetTrue)
                 .overrides_with_all([options::QUIET, options::WARN])
+                .conflicts_with("text")
                 .requires(options::CHECK),
         )
         .arg(
             Arg::new(options::STRICT)
                 .long("strict")
                 .help(translate!("hashsum-help-strict"))
                 .action(ArgAction::SetTrue)
+                .conflicts_with("text")
                 .requires(options::CHECK),
         )
         .arg(
             Arg::new("ignore-missing")
                 .long("ignore-missing")
                 .help(translate!("hashsum-help-ignore-missing"))
                 .action(ArgAction::SetTrue)
+                .conflicts_with("text")
                 .requires(options::CHECK),
         )
         .arg(
@@ -325,6 +324,7 @@ pub fn uu_app_common() -> Command {
                 .help(translate!("hashsum-help-warn"))
                 .action(ArgAction::SetTrue)
                 .overrides_with_all([options::QUIET, options::STATUS])
+                .conflicts_with("text")
                 .requires(options::CHECK),
         )
         .arg(

src/uucore/src/lib/features/checksum/mod.rs

@@ -390,8 +390,6 @@ pub enum ChecksumError {
     #[error("--length is only supported with --algorithm blake2b, sha2, or sha3")]
     LengthOnlyForBlake2bSha2Sha3,
 
-    #[error("the --binary and --text options are meaningless when verifying checksums")]
-    BinaryTextConflict,
     #[error("--text mode is only supported with --untagged")]
     TextWithoutUntagged,
     #[error("--check is not supported with --algorithm={{bsd,sysv,crc,crc32b}}")]

tests/by-util/test_cksum.rs

@@ -1216,7 +1216,7 @@ fn test_conflicting_options() {
         .fails_with_code(1)
         .no_stdout()
         .stderr_contains(
-            "cksum: the --binary and --text options are meaningless when verifying checksums",
+            "cannot be used with", //clap generated error
         );
 
     scene
@@ -1228,7 +1228,7 @@ fn test_conflicting_options() {
         .fails_with_code(1)
         .no_stdout()
         .stderr_contains(
-            "cksum: the --binary and --text options are meaningless when verifying checksums",
+            "cannot be used with", //clap generated error
         );
 }