uniq: added support for deprecated -N option (#4228)

src/uu/uniq/src/uniq.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use clap::{builder::ValueParser, crate_version, Arg, ArgAction, ArgMatches, Command};
+use clap::{builder::ValueParser, crate_version, Arg, ArgAction, ArgGroup, ArgMatches, Command};
 use std::ffi::{OsStr, OsString};
 use std::fs::File;
 use std::io::{self, stdin, stdout, BufRead, BufReader, BufWriter, Write};
@@ -23,6 +23,7 @@ pub mod options {
     pub static IGNORE_CASE: &str = "ignore-case";
     pub static REPEATED: &str = "repeated";
     pub static SKIP_FIELDS: &str = "skip-fields";
+    pub static OBSOLETE_SKIP_FIELDS: &str = "obsolete_skip_field";
     pub static SKIP_CHARS: &str = "skip-chars";
     pub static UNIQUE: &str = "unique";
     pub static ZERO_TERMINATED: &str = "zero-terminated";
@@ -53,6 +54,8 @@ struct Uniq {
     zero_terminated: bool,
 }
 
+const OBSOLETE_SKIP_FIELDS_DIGITS: [&str; 10] = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
+
 macro_rules! write_line_terminator {
     ($writer:expr, $line_terminator:expr) => {
         $writer
@@ -236,6 +239,41 @@ fn opt_parsed<T: FromStr>(opt_name: &str, matches: &ArgMatches) -> UResult<Optio
     })
 }
 
+/// Gets number of fields to be skipped from the shorthand option `-N`
+///
+/// ```bash
+/// uniq -12345
+/// ```
+/// the first digit isn't interpreted by clap as part of the value
+/// so `get_one()` would return `2345`, then to get the actual value
+/// we loop over every possible first digit, only one of which can be
+/// found in the command line because they conflict with each other,
+/// append the value to it and parse the resulting string as usize,
+/// an error at this point means that a character that isn't a digit was given
+fn obsolete_skip_field(matches: &ArgMatches) -> UResult<Option<usize>> {
+    for opt_text in OBSOLETE_SKIP_FIELDS_DIGITS {
+        let argument = matches.get_one::<String>(opt_text);
+        if matches.contains_id(opt_text) {
+            let mut full = opt_text.to_owned();
+            if let Some(ar) = argument {
+                full.push_str(ar);
+            }
+            let value = full.parse::<usize>();
+
+            if let Ok(val) = value {
+                return Ok(Some(val));
+            } else {
+                return Err(USimpleError {
+                    code: 1,
+                    message: format!("Invalid argument for skip-fields: {}", full),
+                }
+                .into());
+            }
+        }
+    }
+    Ok(None)
+}
+
 #[uucore::main]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
     let matches = uu_app().after_help(AFTER_HELP).try_get_matches_from(args)?;
@@ -247,6 +285,10 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
         .map(|mut fi| (fi.next(), fi.next()))
         .unwrap_or_default();
 
+    let skip_fields_modern: Option<usize> = opt_parsed(options::SKIP_FIELDS, &matches)?;
+
+    let skip_fields_old: Option<usize> = obsolete_skip_field(&matches)?;
+
     let uniq = Uniq {
         repeats_only: matches.get_flag(options::REPEATED)
             || matches.contains_id(options::ALL_REPEATED),
@@ -255,7 +297,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             || matches.contains_id(options::GROUP),
         delimiters: get_delimiter(&matches),
         show_counts: matches.get_flag(options::COUNT),
-        skip_fields: opt_parsed(options::SKIP_FIELDS, &matches)?,
+        skip_fields: skip_fields_modern.or(skip_fields_old),
         slice_start: opt_parsed(options::SKIP_CHARS, &matches)?,
         slice_stop: opt_parsed(options::CHECK_CHARS, &matches)?,
         ignore_case: matches.get_flag(options::IGNORE_CASE),
@@ -276,7 +318,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 }
 
 pub fn uu_app() -> Command {
-    Command::new(uucore::util_name())
+    let mut cmd = Command::new(uucore::util_name())
         .version(crate_version!())
         .about(ABOUT)
         .override_usage(format_usage(USAGE))
@@ -355,6 +397,7 @@ pub fn uu_app() -> Command {
             Arg::new(options::SKIP_FIELDS)
                 .short('f')
                 .long(options::SKIP_FIELDS)
+                .overrides_with_all(OBSOLETE_SKIP_FIELDS_DIGITS)
                 .help("avoid comparing the first N fields")
                 .value_name("N"),
         )
@@ -372,13 +415,42 @@ pub fn uu_app() -> Command {
                 .help("end lines with 0 byte, not newline")
                 .action(ArgAction::SetTrue),
         )
+        .group(
+            // in GNU `uniq` every every digit of these arguments
+            // would be interpreted as a simple flag,
+            // these flags then are concatenated to get
+            // the number of fields to skip.
+            // in this way `uniq -1 -z -2` would be
+            // equal to `uniq -12 -q`, since this behavior
+            // is counterintuitive and it's hard to do in clap
+            // we handle it more like GNU `fold`: we have a flag
+            // for each possible initial digit, that takes the
+            // rest of the value as argument.
+            // we disallow explicitly multiple occurrences
+            // because then it would have a different behavior
+            // from GNU
+            ArgGroup::new(options::OBSOLETE_SKIP_FIELDS)
+                .multiple(false)
+                .args(OBSOLETE_SKIP_FIELDS_DIGITS)
+        )
         .arg(
             Arg::new(ARG_FILES)
                 .action(ArgAction::Append)
                 .value_parser(ValueParser::os_string())
                 .num_args(0..=2)
                 .value_hint(clap::ValueHint::FilePath),
-        )
+        );
+
+    for i in OBSOLETE_SKIP_FIELDS_DIGITS {
+        cmd = cmd.arg(
+            Arg::new(i)
+                .short(i.chars().next().unwrap())
+                .num_args(0..=1)
+                .hide(true),
+        );
+    }
+
+    cmd
 }
 
 fn get_delimiter(matches: &ArgMatches) -> Delimiters {

tests/by-util/test_uniq.rs

@@ -80,7 +80,7 @@ fn test_stdin_skip_and_check_2_chars() {
 }
 
 #[test]
-fn test_stdin_skip_1_field() {
+fn test_stdin_skip_2_fields() {
     new_ucmd!()
         .args(&["-f2"])
         .pipe_in_fixture(SKIP_FIELDS)
@@ -88,6 +88,42 @@ fn test_stdin_skip_1_field() {
         .stdout_is_fixture("skip-2-fields.expected");
 }
 
+#[test]
+fn test_stdin_skip_2_fields_obsolete() {
+    new_ucmd!()
+        .args(&["-2"])
+        .pipe_in_fixture(SKIP_FIELDS)
+        .run()
+        .stdout_is_fixture("skip-2-fields.expected");
+}
+
+#[test]
+fn test_stdin_skip_21_fields() {
+    new_ucmd!()
+        .args(&["-f21"])
+        .pipe_in_fixture(SKIP_FIELDS)
+        .run()
+        .stdout_is_fixture("skip-21-fields.expected");
+}
+
+#[test]
+fn test_stdin_skip_21_fields_obsolete() {
+    new_ucmd!()
+        .args(&["-21"])
+        .pipe_in_fixture(SKIP_FIELDS)
+        .run()
+        .stdout_is_fixture("skip-21-fields.expected");
+}
+
+#[test]
+fn test_stdin_skip_invalid_fields_obsolete() {
+    new_ucmd!()
+        .args(&["-5deadbeef"])
+        .run()
+        .failure()
+        .stderr_only("uniq: Invalid argument for skip-fields: 5deadbeef\n");
+}
+
 #[test]
 fn test_stdin_all_repeated() {
     new_ucmd!()
@@ -436,15 +472,15 @@ fn gnu_tests() {
             stderr: None,
             exit: None,
         },
-        // // Obsolete syntax for "-f 1"
+        // Obsolete syntax for "-f 1"
-        // TestCase {
+        TestCase {
-        //     name: "obs30",
+            name: "obs30",
-        //     args: &["-1"],
+            args: &["-1"],
-        //     input: "a a\nb a\n",
+            input: "a a\nb a\n",
-        //     stdout: Some("a a\n"),
+            stdout: Some("a a\n"),
-        //     stderr: None,
+            stderr: None,
-        //     exit: None,
+            exit: None,
-        // },
+        },
         TestCase {
             name: "31",
             args: &["-f", "1"],
@@ -518,23 +554,25 @@ fn gnu_tests() {
             stderr: None,
             exit: None,
         },
-        // // Obsolete syntax for "-s 1"
+        /*
-        // TestCase {
+        // Obsolete syntax for "-s 1"
-        //     name: "obs-plus44",
+        TestCase {
-        //     args: &["+1", "--"],
+            name: "obs-plus44",
-        //     input: "aaa\naaa\n",
+            args: &["+1", "--"],
-        //     stdout: Some("aaa\n"),
+            input: "aaa\naaa\n",
-        //     stderr: None,
+            stdout: Some("aaa\n"),
-        //     exit: None,
+            stderr: None,
-        // },
+            exit: None,
-        // TestCase {
+        },
-        //     name: "obs-plus45",
+        TestCase {
-        //     args: &["+1", "--"],
+            name: "obs-plus45",
-        //     input: "baa\naaa\n",
+            args: &["+1", "--"],
-        //     stdout: Some("baa\n"),
+            input: "baa\naaa\n",
-        //     stderr: None,
+            stdout: Some("baa\n"),
-        //     exit: None,
+            stderr: None,
-        // },
+            exit: None,
+        },
+        */
         TestCase {
             name: "50",
             args: &["-f", "1", "-s", "1"],

tests/fixtures/uniq/skip-2-fields.expected

@@ -1,2 +1,5 @@
 	  aaa  ⟪⟫  a
 aa  a
+a a a a a a a a a a a a a a a a a a a b a a a
+a a a a a a a a a a a a a a a a a a a a b a a
+a a a a a a a a a a a a a a a a a a a a a b a

tests/fixtures/uniq/skip-21-fields.expected

@@ -0,0 +1,3 @@
+	  aaa  ⟪⟫  a
+a a a a a a a a a a a a a a a a a a a b a a a
+a a a a a a a a a a a a a a a a a a a a a b a

tests/fixtures/uniq/skip-fields.txt

@@ -6,3 +6,6 @@ ZZZ     aa  a
 aa  a
 a
 
+a a a a a a a a a a a a a a a a a a a b a a a
+a a a a a a a a a a a a a a a a a a a a b a a
+a a a a a a a a a a a a a a a a a a a a a b a