stty: use ExtendedParser for hex/octal row/col parsing

Author: ChrisDryden

src/uu/stty/src/stty.rs

@@ -32,7 +32,7 @@ use std::os::unix::fs::OpenOptionsExt;
 use std::os::unix::io::{AsRawFd, RawFd};
 use uucore::error::{UError, UResult, USimpleError, UUsageError};
 use uucore::format_usage;
-use uucore::parser::parse_int::parse_u16_wrapped;
+use uucore::parser::num_parser::ExtendedParser;
 use uucore::translate;
 
 #[cfg(not(any(
@@ -324,7 +324,7 @@ fn stty(opts: &Options) -> UResult<()> {
                 },
                 "rows" => {
                     if let Some(rows) = args_iter.next() {
-                        if let Some(n) = parse_u16_wrapped(rows) {
+                        if let Some(n) = parse_rows_cols(rows) {
                             valid_args.push(ArgOptions::Special(SpecialSetting::Rows(n)));
                         } else {
                             return invalid_integer_arg(rows);
@@ -335,7 +335,7 @@ fn stty(opts: &Options) -> UResult<()> {
                 }
                 "columns" | "cols" => {
                     if let Some(cols) = args_iter.next() {
-                        if let Some(n) = parse_u16_wrapped(cols) {
+                        if let Some(n) = parse_rows_cols(cols) {
                             valid_args.push(ArgOptions::Special(SpecialSetting::Cols(n)));
                         } else {
                             return invalid_integer_arg(cols);
@@ -479,6 +479,17 @@ fn parse_u8_or_err(arg: &str) -> Result<u8, String> {
     })
 }
 
+/// Parse an integer with hex (0x/0X) and octal (0) prefix support, wrapping to u16.
+///
+/// GNU stty uses an unsigned 32-bit integer for row/col sizes, then wraps to 16 bits.
+/// Returns `None` if parsing fails or value exceeds u32::MAX.
+fn parse_rows_cols(arg: &str) -> Option<u16> {
+    u64::extended_parse(arg)
+        .ok()
+        .filter(|&n| u32::try_from(n).is_ok())
+        .map(|n| (n % (u16::MAX as u64 + 1)) as u16)
+}
+
 /// Parse a saved terminal state string in stty format.
 ///
 /// The format is colon-separated hexadecimal values:

src/uucore/src/lib/features/parser/mod.rs

@@ -8,8 +8,6 @@
 pub mod num_parser;
 #[cfg(any(feature = "parser", feature = "parser-glob"))]
 pub mod parse_glob;
-#[cfg(any(feature = "parser", feature = "parser-num"))]
-pub mod parse_int;
 #[cfg(any(feature = "parser", feature = "parser-size"))]
 pub mod parse_signed_num;
 #[cfg(any(feature = "parser", feature = "parser-size"))]