From 1fa0b032e55cacd3f864eeb4f5e5869f25a5ee7c Mon Sep 17 00:00:00 2001
From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
Date: Sat, 23 Mar 2024 19:28:14 +0100
Subject: [PATCH] comm: permit and test separators that contain a hyphen

---
 src/uu/comm/src/comm.rs                          |  1 +
 tests/by-util/test_comm.rs                       | 16 ++++++++++++++++
 .../comm/ab_delimiter_hyphen_help.expected       |  3 +++
 .../comm/ab_delimiter_hyphen_one.expected        |  3 +++
 4 files changed, 23 insertions(+)
 create mode 100644 tests/fixtures/comm/ab_delimiter_hyphen_help.expected
 create mode 100644 tests/fixtures/comm/ab_delimiter_hyphen_one.expected

diff --git a/src/uu/comm/src/comm.rs b/src/uu/comm/src/comm.rs
index dd49ef53b..d6366e4e5 100644
--- a/src/uu/comm/src/comm.rs
+++ b/src/uu/comm/src/comm.rs
@@ -186,6 +186,7 @@ pub fn uu_app() -> Command {
                 .help("separate columns with STR")
                 .value_name("STR")
                 .default_value(options::DELIMITER_DEFAULT)
+                .allow_hyphen_values(true)
                 .hide_default_value(true),
         )
         .arg(
diff --git a/tests/by-util/test_comm.rs b/tests/by-util/test_comm.rs
index e2bcc1c44..f6608c7eb 100644
--- a/tests/by-util/test_comm.rs
+++ b/tests/by-util/test_comm.rs
@@ -91,6 +91,22 @@ fn output_delimiter() {
         .stdout_only_fixture("ab_delimiter_word.expected");
 }
 
+#[test]
+fn output_delimiter_hyphen_one() {
+    new_ucmd!()
+        .args(&["--output-delimiter", "-1", "a", "b"])
+        .succeeds()
+        .stdout_only_fixture("ab_delimiter_hyphen_one.expected");
+}
+
+#[test]
+fn output_delimiter_hyphen_help() {
+    new_ucmd!()
+        .args(&["--output-delimiter", "--help", "a", "b"])
+        .succeeds()
+        .stdout_only_fixture("ab_delimiter_hyphen_help.expected");
+}
+
 #[test]
 fn output_delimiter_nul() {
     new_ucmd!()
diff --git a/tests/fixtures/comm/ab_delimiter_hyphen_help.expected b/tests/fixtures/comm/ab_delimiter_hyphen_help.expected
new file mode 100644
index 000000000..c245aa27f
--- /dev/null
+++ b/tests/fixtures/comm/ab_delimiter_hyphen_help.expected
@@ -0,0 +1,3 @@
+a
+--helpb
+--help--helpz
diff --git a/tests/fixtures/comm/ab_delimiter_hyphen_one.expected b/tests/fixtures/comm/ab_delimiter_hyphen_one.expected
new file mode 100644
index 000000000..458f98dd4
--- /dev/null
+++ b/tests/fixtures/comm/ab_delimiter_hyphen_one.expected
@@ -0,0 +1,3 @@
+a
+-1b
+-1-1z