uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

tee: merge logic of flush into write

Browse Source 
Co-authored-by: oech3 <79379754+oech3@users.noreply.github.com>
This commit is contained in:
xtqqczze
2026-04-20 22:22:52 +02:00
committed by Sylvestre Ledru
co-authored by oech3
parent 5aa6c642d2
commit a78f017cc4
1 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/tee/src/tee.rs
+25 -34
View File
@@ -164,7 +164,6 @@ impl MultiWriter {
Ok(0) => return Ok(()), // end of file
Ok(received) => {
self.write_all(&buffer[..received])?;
self.flush()?; // avoid buffering
}
Err(e) if e.kind() != ErrorKind::Interrupted => return Err(e),
_ => {}
@@ -177,8 +176,6 @@ impl MultiWriter {
Ok(0) => return Ok(()), // end of file
Ok(received) => {
self.write_all(&buffer[..received])?;
// avoid buffering
self.flush()?;
}
Err(e) if e.kind() != ErrorKind::Interrupted => return Err(e),
_ => {}
@@ -228,42 +225,36 @@ impl Write for MultiWriter {
let mode = self.output_error_mode.clone();
let mut errors = 0;
self.writers.retain_mut(|writer| {
writer
.write_all(buf)
.map_err(|f| {
let _ = process_error(mode.as_ref(), f, writer, &mut errors)
.map_err(|e| aborted.get_or_insert(e));
})
.is_ok()
let res = (|| {
writer.write_all(buf)?;
writer.flush()
})();
match res {
Ok(()) => true,
Err(e) => {
if let Err(e) = process_error(mode.as_ref(), e, writer, &mut errors) {
aborted.get_or_insert(e);
}
false
}
}
});
self.ignored_errors += errors;
if let Some(e) = aborted {
Err(e)
} else if self.writers.is_empty() {
// This error kind will never be raised by the standard
// library, so we can use it for early termination of
// `copy`
Err(Error::from(ErrorKind::Other))
} else {
Ok(buf.len())
}
aborted.map_or(
if self.writers.is_empty() {
// This error kind will never be raised by the standard
// library, so we can use it for early termination of
// `copy`
Err(Error::from(ErrorKind::Other))
} else {
Ok(buf.len())
},
Err,
)
}
fn flush(&mut self) -> Result<()> {
let mut aborted = None;
let mode = self.output_error_mode.clone();
let mut errors = 0;
self.writers.retain_mut(|writer| {
writer
.flush()
.map_err(|e| {
let _ = process_error(mode.as_ref(), e, writer, &mut errors)
.map_err(|e| aborted.get_or_insert(e));
})
.is_ok()
});
self.ignored_errors += errors;
aborted.map_or(Ok(()), Err)
Ok(())
}
}