Merge remote-tracking branch 'upstream/main' into truncate-move-help-strings-to-markdown-file

src/uu/comm/src/comm.rs

@@ -236,6 +236,7 @@ pub fn uu_app() -> Command {
             Arg::new(options::ZERO_TERMINATED)
                 .long(options::ZERO_TERMINATED)
                 .short('z')
+                .overrides_with(options::ZERO_TERMINATED)
                 .help("line delimiter is NUL, not newline")
                 .action(ArgAction::SetTrue),
         )

tests/by-util/test_comm.rs

@@ -105,6 +105,16 @@ fn zero_terminated() {
     }
 }
 
+#[test]
+fn zero_terminated_provided_multiple_times() {
+    for param in ["-z", "--zero-terminated"] {
+        new_ucmd!()
+            .args(&[param, param, param, "a_nul", "b_nul"])
+            .succeeds()
+            .stdout_only_fixture("ab_nul.expected");
+    }
+}
+
 #[test]
 fn zero_terminated_with_total() {
     for param in ["-z", "--zero-terminated"] {