From 7f905a3b8d6d08c271d71b25dcba3d9559f83959 Mon Sep 17 00:00:00 2001
From: zhitkoff <zhitkoff@gmail.com>
Date: Tue, 29 Aug 2023 16:35:00 -0400
Subject: [PATCH] split: edge case for obs lines within combined shorts + test

---
 src/uu/split/src/split.rs   |  9 ++++++++-
 tests/by-util/test_split.rs | 21 +++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs
index dae24d36b..afe635456 100644
--- a/src/uu/split/src/split.rs
+++ b/src/uu/split/src/split.rs
@@ -88,13 +88,20 @@ fn handle_obsolete(args: &[String]) -> (Vec<String>, Option<String>) {
                 // that can have obsolete lines option value in it
                 // extract numeric part and filter it out
                 let mut obs_lines_extracted: Vec<char> = vec![];
+                let mut obs_lines_end_reached = false;
                 let filtered_slice: Vec<char> = slice
                     .chars()
                     .filter(|c| {
-                        if c.is_ascii_digit() {
+                        // To correctly process scenario like '-x200a4'
+                        // we need to stop extracting digits once alphabetic character is encountered
+                        // after we already have something in obs_lines_extracted
+                        if c.is_ascii_digit() && !obs_lines_end_reached {
                             obs_lines_extracted.push(*c);
                             false
                         } else {
+                            if !obs_lines_extracted.is_empty() {
+                                obs_lines_end_reached = true;
+                            }
                             true
                         }
                     })
diff --git a/tests/by-util/test_split.rs b/tests/by-util/test_split.rs
index 9fba2177e..3280fff67 100644
--- a/tests/by-util/test_split.rs
+++ b/tests/by-util/test_split.rs
@@ -170,7 +170,7 @@ fn test_split_str_prefixed_chunks_by_bytes() {
     assert_eq!(glob.collate(), at.read_bytes(name));
 }
 
-// Test short bytes option concatenated with value
+/// Test short bytes option concatenated with value
 #[test]
 fn test_split_by_bytes_short_concatenated_with_value() {
     let (at, mut ucmd) = at_and_ucmd!();
@@ -342,7 +342,7 @@ fn test_split_lines_number() {
         .stderr_only("split: invalid number of lines: 'file'\n");
 }
 
-// Test short lines option with value concatenated
+/// Test short lines option with value concatenated
 #[test]
 fn test_split_lines_short_concatenated_with_value() {
     let (at, mut ucmd) = at_and_ucmd!();
@@ -401,6 +401,19 @@ fn test_split_obs_lines_within_combined_shorts() {
     assert_eq!(glob.collate(), at.read_bytes(name))
 }
 
+/// Test for obsolete lines option as part of combined short options with tailing suffix length with value
+#[test]
+fn test_split_obs_lines_within_combined_shorts_tailing_suffix_length() {
+    let (at, mut ucmd) = at_and_ucmd!();
+    let name = "obs-lines-combined-shorts-tailing-suffix-length";
+    RandomFile::new(&at, name).add_lines(1000);
+    ucmd.args(&["-d200a4", name]).succeeds();
+
+    let glob = Glob::new(&at, ".", r"x\d\d\d\d$");
+    assert_eq!(glob.count(), 5);
+    assert_eq!(glob.collate(), at.read_bytes(name));
+}
+
 /// Test for obsolete lines option starts as part of combined short options
 #[test]
 fn test_split_obs_lines_starts_combined_shorts() {
@@ -721,7 +734,7 @@ fn test_invalid_suffix_length() {
         .stderr_contains("invalid suffix length: 'xyz'");
 }
 
-// Test short suffix length option with value concatenated
+/// Test short suffix length option with value concatenated
 #[test]
 fn test_split_suffix_length_short_concatenated_with_value() {
     let (at, mut ucmd) = at_and_ucmd!();
@@ -752,7 +765,7 @@ fn test_include_newlines() {
     assert_eq!(s, "5\n");
 }
 
-// Test short number of chunks option concatenated with value
+/// Test short number of chunks option concatenated with value
 #[test]
 fn test_split_number_chunks_short_concatenated_with_value() {
     let (at, mut ucmd) = at_and_ucmd!();