Skip to content

cat: don't lock stdout before splice() #11643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sylvestre merged 1 commit into from
Apr 5, 2026
Merged

cat: don't lock stdout before splice() #11643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/uu/cat/src/cat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,17 +478,17 @@ fn get_input_type(path: &OsString) -> CatResult<InputType> {
/// simple memory copy.
fn write_fast<R: FdReadable>(handle: &mut InputHandle<R>) -> CatResult<()> {
let stdout = io::stdout();
let mut stdout_lock = stdout.lock();
#[cfg(any(target_os = "linux", target_os = "android"))]
{
// If we're on Linux or Android, try to use the splice() system call
// for faster writing. If it works, we're done.
if !splice::write_fast_using_splice(handle, &stdout_lock)? {
if !splice::write_fast_using_splice(handle, &stdout)? {
return Ok(());
}
}
// If we're not on Linux or Android, or the splice() call failed,
// fall back on slower writing.
let mut stdout_lock = stdout.lock();
let mut buf = [0; 1024 * 64];
loop {
match handle.reader.read(&mut buf) {
Expand Down
Loading