RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 19:17:43 +00:00
Code Issues Activity

cat: adapt to type change of unistd::write()

Browse source 
nix 0.28 changed "write(fd: RawFd, buf: &[u8]) -> Result<usize>" to "write<Fd: AsFd>(fd: Fd, buf: &[u8]) -> Result<usize>"
This commit is contained in:
Daniel Hofstetter 2024-03-12 08:26:50 +01:00
parent 6fd37da3e2
commit 14ac1e160f
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/uu/cat/src/splice.rs
View file

@ -5,7 +5,10 @@
use super::{CatResult, FdReadable, InputHandle}; use super::{CatResult, FdReadable, InputHandle};
use nix::unistd; use nix::unistd;
use std::os::unix::io::{AsRawFd, RawFd}; use std::os::{
fd::AsFd,
unix::io::{AsRawFd, RawFd},
};
use uucore::pipes::{pipe, splice, splice_exact}; use uucore::pipes::{pipe, splice, splice_exact};
@ -20,9 +23,9 @@ const BUF_SIZE: usize = 1024 * 16;
/// The `bool` in the result value indicates if we need to fall back to normal /// The `bool` in the result value indicates if we need to fall back to normal
/// copying or not. False means we don't have to. /// copying or not. False means we don't have to.
#[inline] #[inline]
pub(super) fn write_fast_using_splice<R: FdReadable>( pub(super) fn write_fast_using_splice<R: FdReadable, S: AsRawFd + AsFd>(
handle: &InputHandle<R>, handle: &InputHandle<R>,
write_fd: &impl AsRawFd, write_fd: &S,
) -> CatResult<bool> { ) -> CatResult<bool> {
let (pipe_rd, pipe_wr) = pipe()?; let (pipe_rd, pipe_wr) = pipe()?;
@ -38,7 +41,7 @@ pub(super) fn write_fast_using_splice<R: FdReadable>(
// we can recover by copying the data that we have from the // we can recover by copying the data that we have from the
// intermediate pipe to stdout using normal read/write. Then // intermediate pipe to stdout using normal read/write. Then
// we tell the caller to fall back. // we tell the caller to fall back.
copy_exact(pipe_rd.as_raw_fd(), write_fd.as_raw_fd(), n)?; copy_exact(pipe_rd.as_raw_fd(), write_fd, n)?;
return Ok(true); return Ok(true);
} }
} }
@ -52,7 +55,7 @@ pub(super) fn write_fast_using_splice<R: FdReadable>(
/// Move exactly `num_bytes` bytes from `read_fd` to `write_fd`. /// Move exactly `num_bytes` bytes from `read_fd` to `write_fd`.
/// ///
/// Panics if not enough bytes can be read. /// Panics if not enough bytes can be read.
fn copy_exact(read_fd: RawFd, write_fd: RawFd, num_bytes: usize) -> nix::Result<()> { fn copy_exact(read_fd: RawFd, write_fd: &impl AsFd, num_bytes: usize) -> nix::Result<()> {
let mut left = num_bytes; let mut left = num_bytes;
let mut buf = [0; BUF_SIZE]; let mut buf = [0; BUF_SIZE];
while left > 0 { while left > 0 {