Skip to content

wc: remove splice_exact #12316

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

Open
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −2
Open

wc: remove splice_exact #12316

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
8 changes: 6 additions & 2 deletions src/uu/wc/src/count_fast.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const FILE_ATTRIBUTE_NORMAL: u32 = 128;
#[cfg(any(target_os = "linux", target_os = "android"))]
use libc::S_IFIFO;
#[cfg(any(target_os = "linux", target_os = "android"))]
use uucore::pipes::{MAX_ROOTLESS_PIPE_SIZE, pipe, splice, splice_exact};
use uucore::pipes::{MAX_ROOTLESS_PIPE_SIZE, pipe, splice};

const BUF_SIZE: usize = 64 * 1024;

Expand Down Expand Up @@ -61,7 +61,11 @@ fn count_bytes_using_splice(fd: &impl AsFd) -> Result<usize, usize> {
Ok(0) => return Ok(byte_count),
Ok(res) => {
byte_count += res;
splice_exact(&pipe_rd, &null_file, res).map_err(|_| byte_count)?;
// pipe to null is not blocked. So this returns res at most cases
// next splice does not hang if we discarded 1+ pages
if splice(&pipe_rd, &null_file, res).map_err(|_| byte_count)? == 0 {
return Err(byte_count);
}
}
Err(_) => return Err(byte_count),
}
Expand Down
Loading