shuf: report every malformed -i range the way GNU does

src/uu/shuf/locales/en-US.ftl

@@ -23,7 +23,6 @@ shuf-error-read-error = read error
 shuf-error-read-random-bytes = reading random bytes failed
 shuf-error-end-of-random-bytes = end of random source
 shuf-error-no-lines-to-repeat = no lines to repeat
-shuf-error-start-exceeds-end = start exceeds end
-shuf-error-missing-dash = missing '-'
+shuf-error-invalid-input-range = invalid input range: { $range }
 shuf-error-write-failed = write failed
 shuf-error-memory-exhausted = memory exhausted

src/uu/shuf/src/shuf.rs

@@ -78,8 +78,13 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                 .cloned()
                 .collect(),
         )
-    } else if let Some(range) = matches.get_one(options::INPUT_RANGE).cloned() {
-        Mode::InputRange(range)
+    } else if let Some(range) = matches.get_one::<String>(options::INPUT_RANGE) {
+        Mode::InputRange(parse_range(range).map_err(|_| {
+            USimpleError::new(
+                1,
+                translate!("shuf-error-invalid-input-range", "range" => range.quote()),
+            )
+        })?)
     } else {
         let mut operands = matches
             .get_many::<OsString>(options::FILE_OR_ARGS)
@@ -197,7 +202,11 @@ pub fn uu_app() -> Command {
                 .long(options::INPUT_RANGE)
                 .value_name("LO-HI")
                 .help(translate!("shuf-help-input-range"))
-                .value_parser(parse_range)
+                // GNU reports every malformed range the same way, so the range
+                // is taken verbatim here and checked in `uumain`. Parsing it as
+                // a clap value would wrap the reason in clap's own wording, and
+                // a range like `-1-5` would not even reach us.
+                .allow_hyphen_values(true)
                 .conflicts_with(options::FILE_OR_ARGS),
         )
         .arg(
@@ -445,17 +454,17 @@ fn shuf_exec(
     Ok(())
 }
 
-fn parse_range(input_range: &str) -> Result<RangeInclusive<u64>, String> {
+fn parse_range(input_range: &str) -> Result<RangeInclusive<u64>, ()> {
     if let Some((from, to)) = input_range.split_once('-') {
-        let begin = from.parse::<u64>().map_err(|e| e.to_string())?;
-        let end = to.parse::<u64>().map_err(|e| e.to_string())?;
+        let begin = from.parse::<u64>().map_err(|_| ())?;
+        let end = to.parse::<u64>().map_err(|_| ())?;
         if begin <= end || begin == end + 1 {
             Ok(begin..=end)
         } else {
-            Err(translate!("shuf-error-start-exceeds-end"))
+            Err(())
         }
     } else {
-        Err(translate!("shuf-error-missing-dash"))
+        Err(())
     }
 }
 

tests/by-util/test_shuf.rs

@@ -745,21 +745,23 @@ fn test_shuf_invalid_input_range_one() {
     new_ucmd!()
         .args(&["-i", "0"])
         .fails()
-        .stderr_contains("invalid value '0' for '--input-range <LO-HI>': missing '-'");
+        .stderr_contains("invalid input range: '0'");
 }
 
 #[test]
 fn test_shuf_invalid_input_range_two() {
-    new_ucmd!().args(&["-i", "a-9"]).fails().stderr_contains(
-        "invalid value 'a-9' for '--input-range <LO-HI>': invalid digit found in string",
-    );
+    new_ucmd!()
+        .args(&["-i", "a-9"])
+        .fails()
+        .stderr_contains("invalid input range: 'a-9'");
 }
 
 #[test]
 fn test_shuf_invalid_input_range_three() {
-    new_ucmd!().args(&["-i", "0-b"]).fails().stderr_contains(
-        "invalid value '0-b' for '--input-range <LO-HI>': invalid digit found in string",
-    );
+    new_ucmd!()
+        .args(&["-i", "0-b"])
+        .fails()
+        .stderr_contains("invalid input range: '0-b'");
 }
 
 #[test]
@@ -867,7 +869,7 @@ fn test_range_empty_minus_one() {
         .arg("-i5-3")
         .fails()
         .no_stdout()
-        .stderr_contains("invalid value '5-3' for '--input-range <LO-HI>': start exceeds end\n");
+        .stderr_contains("invalid input range: '5-3'");
 }
 
 #[test]
@@ -897,7 +899,7 @@ fn test_range_repeat_empty_minus_one() {
         .arg("-ri5-3")
         .fails()
         .no_stdout()
-        .stderr_contains("invalid value '5-3' for '--input-range <LO-HI>': start exceeds end\n");
+        .stderr_contains("invalid input range: '5-3'");
 }
 
 // This test fails if we forget to flush the `BufWriter`.
@@ -1163,3 +1165,14 @@ fn test_seed_long_range_no_repeat() {
 fn test_empty_range_no_repeat() {
     new_ucmd!().arg("-i4-3").succeeds().no_output();
 }
+
+#[test]
+fn test_shuf_invalid_input_range_leading_hyphen() {
+    // A range starting with a hyphen never reached the range check at all;
+    // clap rejected it as an unknown option first. GNU reports it like any
+    // other malformed range.
+    new_ucmd!()
+        .args(&["-i", "-1-5"])
+        .fails()
+        .stderr_contains("invalid input range: '-1-5'");
+}