Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/uu/numfmt/src/numfmt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
use crate::units::{Result, Unit};
use clap::{Arg, ArgAction, ArgMatches, Command, builder::ValueParser, parser::ValueSource};
use std::ffi::OsString;
use std::io::{BufRead, Error, Write, stderr};

Check failure on line 17 in src/uu/numfmt/src/numfmt.rs

View workflow job for this annotation

GitHub Actions / Style and Lint (ubuntu-24.04, unix)

ERROR: `cargo clippy`: unused import: `Error` (file:'src/uu/numfmt/src/numfmt.rs', line:17)

Check failure on line 17 in src/uu/numfmt/src/numfmt.rs

View workflow job for this annotation

GitHub Actions / Style and Lint (unix)

ERROR: `cargo clippy`: unused import: `Error` (file:'src/uu/numfmt/src/numfmt.rs', line:17)
use std::result::Result as StdResult;

Check failure on line 18 in src/uu/numfmt/src/numfmt.rs

View workflow job for this annotation

GitHub Actions / Style and Lint (ubuntu-24.04, unix)

ERROR: `cargo clippy`: unused import: `std::result::Result as StdResult` (file:'src/uu/numfmt/src/numfmt.rs', line:18)

Check failure on line 18 in src/uu/numfmt/src/numfmt.rs

View workflow job for this annotation

GitHub Actions / Style and Lint (unix)

ERROR: `cargo clippy`: unused import: `std::result::Result as StdResult` (file:'src/uu/numfmt/src/numfmt.rs', line:18)
use std::str::FromStr;

use units::{IEC_BASES, SI_BASES};
Expand All @@ -38,29 +38,36 @@
Ok(())
}

fn handle_buffer<R>(input: R, options: &NumfmtOptions) -> UResult<()>
fn handle_buffer<R>(mut input: R, options: &NumfmtOptions) -> UResult<()>
where
R: BufRead,
{
let terminator = if options.zero_terminated { 0u8 } else { b'\n' };
handle_buffer_iterator(input.split(terminator), options, terminator)
}

fn handle_buffer_iterator(
iter: impl Iterator<Item = StdResult<Vec<u8>, Error>>,
options: &NumfmtOptions,
terminator: u8,
) -> UResult<()> {
for (idx, line_result) in iter.enumerate() {
match line_result {
Ok(line) if idx < options.header => {
std::io::stdout().write_all(&line)?;
let mut buf = Vec::new();
let mut idx = 0;

loop {
match input.read_until(terminator, &mut buf) {
Ok(0) => break,
Ok(_) if idx < options.header => {
if buf.last() == Some(&terminator) {
buf.pop();
}
std::io::stdout().write_all(&buf)?;
std::io::stdout().write_all(&[terminator])?;
Ok(())
}
Ok(line) => format_and_handle_validation(&line, options),
Ok(_) => {
if buf.last() == Some(&terminator) {
buf.pop();
}
format_and_handle_validation(&buf, options)
}
Err(err) => return Err(Box::new(NumfmtError::IoError(err.to_string()))),
}?;

buf.clear();
idx += 1;
}
Ok(())
}
Expand Down
Loading