Merge branch 'main' into cksum-ln

Author: oech3

Cargo.toml

@@ -617,9 +617,12 @@ workspace = true
 # This is the linting configuration for all crates.
 # In order to use these, all crates have `[lints] workspace = true` section.
 [workspace.lints.rust]
-# Allow "fuzzing" as a "cfg" condition name
+# Allow "fuzzing" as a "cfg" condition name and "cygwin" as a value for "target_os"
 # https://doc.rust-lang.org/nightly/rustc/check-cfg/cargo-specifics.html
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+  'cfg(fuzzing)',
+  'cfg(target_os, values("cygwin"))',
+] }
 #unused_qualifications = "warn" // TODO: fix warnings in uucore, then re-enable this lint
 
 [workspace.lints.clippy]

src/uu/cksum/src/cksum.rs

@@ -101,6 +101,12 @@ fn maybe_sanitize_length(
 #[uucore::main]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let binary_name = uucore::util_name();
+    // Put --\nuntagged to make logic simpler
+    let mut args: Vec<OsString> = args.collect();
+    if !binary_name.ends_with("cksum") && !args.is_empty() {
+        args.insert(1, OsString::from("--\nuntagged"));
+    }
+    
     let matches = uucore::clap_localization::handle_clap_result(uu_app(), args)?;
 
     let check = matches.get_flag(options::CHECK);
@@ -180,7 +186,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     // --untagged is cksum specific. So we use this form...
     let is_cksum = binary_name.ends_with("cksum");
     // clap cannot overrides_with --binary by --tag unilaterally...
-    let tag = (!is_cksum && std::env::args().any(|a| a == "--tag" || a == "-t"))
+    let tag = (!is_cksum && std::env::args().any(|a| a == "--tag"))
         || (is_cksum && !matches.get_flag(options::UNTAGGED));
     let binary = matches.get_flag(options::BINARY);
 
@@ -225,8 +231,9 @@ pub fn uu_app() -> Command {
                 .long(options::TAG)
                 .help(translate!("cksum-help-tag"))
                 .action(ArgAction::SetTrue)
-                .overrides_with(options::BINARY)
-                .overrides_with(options::TEXT),
+                .overrides_with(options::TEXT)
+                .overrides_with(options::UNTAGGED)
+                .overrides_with(options::BINARY),
         )
         .arg(
             Arg::new(options::RAW)
@@ -262,13 +269,15 @@ pub fn uu_app() -> Command {
                 .long(options::TEXT)
                 .short('t')
                 .hide(true)
+                .requires(options::UNTAGGED)
                 .action(ArgAction::SetTrue),
         )
         .arg(
             Arg::new(options::BINARY)
                 .long(options::BINARY)
                 .short('b')
                 .hide(true)
+                .overrides_with(options::TEXT)
                 .action(ArgAction::SetTrue),
         )
         .arg(
@@ -327,7 +336,6 @@ pub fn uu_app() -> Command {
     }
     if binary_name.ends_with("cksum") {
         app = app
-            .mut_arg(options::TEXT, |a: Arg| a.requires(options::UNTAGGED))
             .arg(
                 Arg::new(options::ALGORITHM)
                     .long(options::ALGORITHM)
@@ -340,9 +348,15 @@ pub fn uu_app() -> Command {
                 Arg::new(options::UNTAGGED)
                     .long(options::UNTAGGED)
                     .help(translate!("cksum-help-untagged"))
-                    .action(ArgAction::SetTrue)
-                    .overrides_with(options::TAG),
+                    .action(ArgAction::SetTrue),
             );
+    } else {
+        app = app.arg(
+            Arg::new(options::UNTAGGED)
+                .long("\nuntagged")
+                .hide(true)
+                .action(ArgAction::SetTrue),
+        );
     }
     app.after_help(translate!("cksum-after-help"))
 }

src/uu/stdbuf/src/libstdbuf/Cargo.toml

@@ -10,6 +10,9 @@ keywords.workspace = true
 categories.workspace = true
 edition.workspace = true
 
+[lints]
+workspace = true
+
 [lib]
 name = "stdbuf"
 path = "src/libstdbuf.rs"