mirrors/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2025-12-23 08:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tr: use an unbuffered stdout

Browse source 
Our stdin that we transform already is buffered (using 8192 byte
buffers in the previous commit), so avoid buffering our output
needlessly.

This effectively changes the code to write complete lines
immediately, for example, in

`( echo a; sleep 1 ) | tr a b`

we receive

    read(0, "a\n", 8192)                    = 2
    write(1, "b\n", 2)                      = 2
    read(0, "", 8192)                       = 0

instead of

    read(0, "a\n", 8192)                    = 2
    read(0, "", 8192)                       = 0
    write(1, "b\n", 2)                      = 2

which matches the GNU coreutils behavior.
This commit is contained in:
Julian Andres Klode 2025-08-05 16:02:51 +02:00 • committed by Nicolas Boichat
parent ef40c472a3
commit c93b9ed6be
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/uu/tr/src/tr.rs
View file

@ -12,7 +12,7 @@ use operation::{
translate_input,
};
use std::ffi::OsString;
use std::io::{BufWriter, Write, stdin, stdout};
use std::io::{Write, stdin, stdout};
use uucore::display::Quotable;
use uucore::error::{FromIo, UResult, USimpleError, UUsageError};
use uucore::fs::is_stdin_directory;
@ -107,7 +107,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let stdin = stdin();
let mut locked_stdin = stdin.lock();
let mut buffered_stdout = BufWriter::new(stdout().lock());
let mut locked_stdout = stdout().lock();
// According to the man page: translating only happens if deleting or if a second set is given
let translating = !delete_flag && sets.len() > 1;
@ -131,34 +131,34 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
let delete_op = DeleteOperation::new(set1);
let squeeze_op = SqueezeOperation::new(set2);
let op = delete_op.chain(squeeze_op);
translate_input(&mut locked_stdin, &mut buffered_stdout, op)?;
translate_input(&mut locked_stdin, &mut locked_stdout, op)?;
} else {
let op = DeleteOperation::new(set1);
translate_input(&mut locked_stdin, &mut buffered_stdout, op)?;
translate_input(&mut locked_stdin, &mut locked_stdout, op)?;
}
} else if squeeze_flag {
if sets_len == 1 {
let op = SqueezeOperation::new(set1);
translate_input(&mut locked_stdin, &mut buffered_stdout, op)?;
translate_input(&mut locked_stdin, &mut locked_stdout, op)?;
} else {
let translate_op = TranslateOperation::new(set1, set2.clone())?;
let squeeze_op = SqueezeOperation::new(set2);
let op = translate_op.chain(squeeze_op);
translate_input(&mut locked_stdin, &mut buffered_stdout, op)?;
translate_input(&mut locked_stdin, &mut locked_stdout, op)?;
}
} else {
let op = TranslateOperation::new(set1, set2)?;
translate_input(&mut locked_stdin, &mut buffered_stdout, op)?;
translate_input(&mut locked_stdin, &mut locked_stdout, op)?;
}
#[cfg(not(target_os = "windows"))]
buffered_stdout
locked_stdout
.flush()
.map_err_context(|| translate!("tr-error-write-error"))?;
// SIGPIPE is not available on Windows.
#[cfg(target_os = "windows")]
match buffered_stdout.flush() {
match locked_stdout.flush() {
Ok(()) => {}
Err(err) if err.kind() == std::io::ErrorKind::BrokenPipe => std::process::exit(13),
Err(err) => return Err(err.map_err_context(|| translate!("tr-error-write-error"))),