Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-06 10:19:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

wc: comments

Browse source
This commit is contained in:
zhitkoff 2023-12-02 16:50:30 -05:00 committed by Yury Zhytkou
parent 54ac5a7e1a
commit b7f708b233
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/uu/wc/src/count_fast.rs
View file

@ -128,8 +128,9 @@ pub(crate) fn count_bytes_fast<T: WordCountable>(handle: &mut T) -> (usize, Opti
// Since the input stream from file is treated as continuous across both commands inside (). // Since the input stream from file is treated as continuous across both commands inside ().
// In cases like this, due to `<` redirect, the `stat.st_mode` would report input as a regular file // In cases like this, due to `<` redirect, the `stat.st_mode` would report input as a regular file
// and `stat.st_size` would report the size of file on disk // and `stat.st_size` would report the size of file on disk
// and NOT the remaining number of bytes in the input stream. The raw file descriptor // and NOT the remaining number of bytes in the input stream.
// in this situation would be equal to `0` for STDIN in both invocations. // However, the raw file descriptor in this situation would be equal to `0`
// for STDIN in both invocations.
// Therefore we cannot rely of `st_size` here and should fall back on full read. // Therefore we cannot rely of `st_size` here and should fall back on full read.
if fd > 0 && (stat.st_mode as libc::mode_t & S_IFREG) != 0 && stat.st_size > 0 { if fd > 0 && (stat.st_mode as libc::mode_t & S_IFREG) != 0 && stat.st_size > 0 {
let sys_page_size = unsafe { sysconf(_SC_PAGESIZE) as usize }; let sys_page_size = unsafe { sysconf(_SC_PAGESIZE) as usize };
@ -138,7 +139,7 @@ pub(crate) fn count_bytes_fast<T: WordCountable>(handle: &mut T) -> (usize, Opti
// with size that is NOT a multiple of system page size // with size that is NOT a multiple of system page size
return (stat.st_size as usize, None); return (stat.st_size as usize, None);
} else if let Some(file) = handle.inner_file() { } else if let Some(file) = handle.inner_file() {
// On some platforms `stat.st_blksize` and `st.st_size` // On some platforms `stat.st_blksize` and `stat.st_size`
// are of different types: i64 vs i32 // are of different types: i64 vs i32
// i.e. MacOS on Apple Silicon (aarch64-apple-darwin), // i.e. MacOS on Apple Silicon (aarch64-apple-darwin),
// Debian Linux on ARM (aarch64-unknown-linux-gnu), // Debian Linux on ARM (aarch64-unknown-linux-gnu),