format: parse as many characters as possible in numbers

uutils · Jan 4, 2024 · a7897d5 · a7897d5
1 parent 15ae059
commit a7897d5
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 30 deletions.
diff --git a/src/uucore/src/lib/features/format/argument.rs b/src/uucore/src/lib/features/format/argument.rs
@@ -3,9 +3,12 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use os_display::Quotable;
-
-use crate::{error::set_exit_code, show_warning};
+use crate::{
+    error::set_exit_code,
+    quoting_style::{escape_name, Quotes, QuotingStyle},
+    show_error,
+};
+use std::{ffi::OsStr, ops::ControlFlow, str::FromStr};
 
 /// An argument for formatting
 ///
@@ -40,9 +43,7 @@ impl<'a, T: Iterator<Item = &'a FormatArgument>> ArgumentIter<'a> for T {
         };
         match next {
             FormatArgument::Char(c) => *c,
-            FormatArgument::Unparsed(s) => {
-                s.chars().next().unwrap_or('\0')
-            }
+            FormatArgument::Unparsed(s) => s.chars().next().unwrap_or('\0'),
             _ => '\0',
         }
     }
@@ -63,14 +64,7 @@ impl<'a, T: Iterator<Item = &'a FormatArgument>> ArgumentIter<'a> for T {
                 } else {
                     s.parse().ok()
                 };
-                match opt {
-                    Some(n) => n,
-                    None => {
-                        show_warning!("{}: expected a numeric value", s.quote());
-                        set_exit_code(1);
-                        0
-                    }
-                }
+                num_or_partial(opt, s)
             }
             _ => 0,
         }
@@ -96,14 +90,7 @@ impl<'a, T: Iterator<Item = &'a FormatArgument>> ArgumentIter<'a> for T {
                 } else {
                     s.parse().ok()
                 };
-                match opt {
-                    Some(n) => n,
-                    None => {
-                        show_warning!("{}: expected a numeric value", s.quote());
-                        set_exit_code(1);
-                        0
-                    }
-                }
+                num_or_partial(opt, s)
             }
             _ => 0,
         }
@@ -123,14 +110,7 @@ impl<'a, T: Iterator<Item = &'a FormatArgument>> ArgumentIter<'a> for T {
                 } else {
                     s.parse().ok()
                 };
-                match opt {
-                    Some(n) => n,
-                    None => {
-                        show_warning!("{}: expected a numeric value", s.quote());
-                        set_exit_code(1);
-                        0.0
-                    }
-                }
+                num_or_partial(opt, s)
             }
             _ => 0.0,
         }
@@ -143,3 +123,36 @@ impl<'a, T: Iterator<Item = &'a FormatArgument>> ArgumentIter<'a> for T {
         }
     }
 }
+
+/// Return the previously `parsed` argument, or in the case of `None` try to do a partial
+/// parsing and return the value after showing an error.
+fn num_or_partial<T: FromStr + Default>(parsed: Option<T>, arg: &str) -> T {
+    if let Some(parsed) = parsed {
+        parsed
+    } else {
+        set_exit_code(1);
+        let m = arg
+            .char_indices()
+            .try_fold(None, |a, (i, _)| match (a, arg[..i].parse()) {
+                (_, Ok(v)) => ControlFlow::Continue(Some(v)),
+                (Some(v), Err(_)) => ControlFlow::Break(v),
+                (None, Err(_)) => ControlFlow::Continue(None),
+            });
+        let escaped = escape_name(
+            &OsStr::new(arg),
+            &QuotingStyle::C {
+                quotes: Quotes::None,
+            },
+        );
+        match m {
+            ControlFlow::Continue(Some(v)) | ControlFlow::Break(v) => {
+                show_error!("‘{escaped}’: value not completely converted");
+                v
+            }
+            ControlFlow::Continue(None) => {
+                show_error!("‘{escaped}’: expected a numeric value");
+                Default::default()
+            }
+        }
+    }
+}
diff --git a/tests/by-util/test_printf.rs b/tests/by-util/test_printf.rs
@@ -599,3 +599,23 @@ fn sub_general_round_float_leading_zeroes() {
         .succeeds()
         .stdout_only("1.00001");
 }
+
+#[test]
+fn partial_float() {
+    new_ucmd!()
+        .args(&["%.2f is %s", "42.03x", "a lot"])
+        .fails()
+        .code_is(1)
+        .stdout_is("42.03 is a lot")
+        .stderr_is("printf: '42.03x': value not completely converted\n");
+}
+
+#[test]
+fn partial_integer() {
+    new_ucmd!()
+        .args(&["%d is %s", "42x23", "a lot"])
+        .fails()
+        .code_is(1)
+        .stdout_is("42 is a lot")
+        .stderr_is("printf: '42x23': value not completely converted\n");
+}