numfmt: fix clippy errors, remove ---debug alias, rename write_line to format_and_write

Author: sylvestre

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

@@ -77,3 +77,9 @@ numfmt-error-invalid-format-width-overflow = invalid format '{ $format }' (width
 numfmt-error-invalid-precision = invalid precision in format '{ $format }'
 numfmt-error-format-too-many-percent = format '{ $format }' has too many % directives
 numfmt-error-unknown-invalid-mode = Unknown invalid mode: { $mode }
+
+# Debug messages
+numfmt-debug-no-conversion = no conversion option specified
+numfmt-debug-grouping-no-effect = grouping has no effect in this locale
+numfmt-debug-failed-to-convert = failed to convert some of the input numbers
+numfmt-debug-header-ignored = --header ignored with command-line input

src/uu/numfmt/locales/fr-FR.ftl

@@ -36,6 +36,7 @@ numfmt-after-help = Options d'UNITÉ :
   Une précision optionnelle (%.1f) remplacera la précision déterminée par l'entrée.
 
 # Messages d'aide
+numfmt-help-debug = afficher des avertissements sur les entrées invalides
 numfmt-help-delimiter = utiliser X au lieu d'espaces pour le délimiteur de champ
 numfmt-help-field = remplacer les nombres dans ces champs d'entrée ; voir FIELDS ci-dessous
 numfmt-help-format = utiliser le FORMAT à virgule flottante de style printf ; voir FORMAT ci-dessous pour les détails
@@ -75,3 +76,9 @@ numfmt-error-invalid-format-width-overflow = format invalide '{ $format }' (déb
 numfmt-error-invalid-precision = précision invalide dans le format '{ $format }'
 numfmt-error-format-too-many-percent = le format '{ $format }' a trop de directives %
 numfmt-error-unknown-invalid-mode = Mode invalide inconnu : { $mode }
+
+# Messages de débogage
+numfmt-debug-no-conversion = aucune option de conversion spécifiée
+numfmt-debug-grouping-no-effect = le groupement n'a aucun effet dans cette locale
+numfmt-debug-failed-to-convert = échec de conversion d'une partie des nombres en entrée
+numfmt-debug-header-ignored = --header ignoré avec une entrée en ligne de commande

src/uu/numfmt/src/format.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore powf
+// spell-checker:ignore powf seps
 
 use uucore::display::Quotable;
 use uucore::i18n::decimal::locale_grouping_separator;

src/uu/numfmt/src/numfmt.rs

@@ -64,19 +64,20 @@ fn format_and_write<W: std::io::Write>(
         }
     };
 
-    if let Err(error_message) = handled_line {
+    if let Err(msg) = result {
         match options.invalid {
             InvalidModes::Abort => {
-                return Err(Box::new(NumfmtError::FormattingError(error_message)));
+                return Err(Box::new(NumfmtError::FormattingError(msg)));
             }
             InvalidModes::Fail => {
-                show!(NumfmtError::FormattingError(error_message));
+                show!(NumfmtError::FormattingError(msg));
             }
             InvalidModes::Warn => {
-                let _ = writeln!(stderr(), "numfmt: {error_message}");
+                let _ = writeln!(stderr(), "numfmt: {msg}");
             }
             InvalidModes::Ignore => {}
         }
+        // On error, echo the original line unchanged.
         writer.write_all(input_line)?;
         if let Some(eol) = eol {
             writer.write_all(&[eol])?;
@@ -90,6 +91,64 @@ fn format_and_write<W: std::io::Write>(
     Ok(false)
 }
 
+/// Process command-line number arguments.
+///
+/// Returns `true` if any line contained invalid input.
+fn handle_args<'a>(args: impl Iterator<Item = &'a [u8]>, options: &NumfmtOptions) -> UResult<bool> {
+    let mut stdout = std::io::stdout().lock();
+    let terminator = if options.zero_terminated { 0u8 } else { b'\n' };
+    let mut saw_invalid = false;
+    for l in args {
+        saw_invalid |= format_and_write(&mut stdout, l, options, Some(terminator))?;
+    }
+    Ok(saw_invalid)
+}
+
+/// Process lines read from stdin.
+///
+/// Returns `true` if any line contained invalid input.
+fn handle_buffer<R: BufRead>(mut input: R, options: &NumfmtOptions) -> UResult<bool> {
+    let terminator = if options.zero_terminated { 0u8 } else { b'\n' };
+    let mut stdout = std::io::stdout().lock();
+    let mut buf = Vec::new();
+    let mut line_idx = 0;
+    let mut saw_invalid = false;
+
+    loop {
+        buf.clear();
+        let n = input
+            .read_until(terminator, &mut buf)
+            .map_err(|e| NumfmtError::IoError(e.to_string()))?;
+        if n == 0 {
+            break;
+        }
+
+        let has_terminator = buf.last() == Some(&terminator);
+        let line = if has_terminator {
+            &buf[..buf.len() - 1]
+        } else {
+            &buf[..]
+        };
+        // Emit the terminator only when the input line had one (preserve
+        // missing final newline).
+        let eol = has_terminator.then_some(terminator);
+
+        if line_idx < options.header {
+            // Pass header lines through unchanged.
+            stdout.write_all(line)?;
+            if let Some(t) = eol {
+                stdout.write_all(&[t])?;
+            }
+        } else {
+            saw_invalid |= format_and_write(&mut stdout, line, options, eol)?;
+        }
+
+        line_idx += 1;
+    }
+
+    Ok(saw_invalid)
+}
+
 fn parse_unit(s: &str) -> Result<Unit> {
     match s {
         "auto" => Ok(Unit::Auto),
@@ -285,6 +344,34 @@ fn parse_options(args: &ArgMatches) -> Result<NumfmtOptions> {
     })
 }
 
+fn print_debug_warnings(options: &NumfmtOptions, matches: &ArgMatches) {
+    fn print_warning(msg_key: &str) {
+        let _ = writeln!(stderr(), "numfmt: {}", translate!(msg_key));
+    }
+
+    // Warn if no conversion option is specified
+    // 2>/dev/full does not abort
+    if options.transform.from == Unit::None
+        && options.transform.to == Unit::None
+        && options.padding == 0
+        && !options.grouping
+    {
+        print_warning("numfmt-debug-no-conversion");
+    }
+
+    if options.grouping && locale_grouping_separator().is_empty() {
+        print_warning("numfmt-debug-grouping-no-effect");
+    }
+
+    // Warn if --header is used with command-line input
+    if options.header > 0 && matches.get_many::<OsString>(NUMBER).is_some() {
+        print_warning("numfmt-debug-header-ignored");
+    }
+}
+
+#[uucore::main]
+pub fn uumain(args: impl uucore::Args) -> UResult<()> {
+    let matches = uucore::clap_localization::handle_clap_result(uu_app(), args)?;
     let options = parse_options(&matches).map_err(NumfmtError::IllegalArgument)?;
 
     if options.debug {
@@ -296,10 +383,17 @@ fn parse_options(args: &ArgMatches) -> Result<NumfmtOptions> {
             .map(|s| os_str_as_bytes(s).map_err(|e| e.to_string()))
             .collect::<std::result::Result<Vec<_>, _>>()
             .map_err(NumfmtError::IllegalArgument)?;
+        handle_args(byte_args.into_iter(), &options)
+    } else {
+        let stdin = std::io::stdin();
+        handle_buffer(stdin.lock(), &options)
+    };
 
     match result {
         Err(e) => {
-            std::io::stdout().flush().expect("error flushing stdout");
+            // Flush stdout before returning the error so any partial output is
+            // visible (matches GNU behaviour).
+            let _ = std::io::stdout().flush();
             Err(e)
         }
         Ok(saw_invalid) => {