Skip to content

Commit 507a524

Browse files
authored
tee miss/ing 2>/dev/full should not abort (#10637)
1 parent 2a8811d commit 507a524

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

src/uu/tee/src/tee.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
use clap::{Arg, ArgAction, Command, builder::PossibleValue};
77
use std::ffi::OsString;
88
use std::fs::OpenOptions;
9-
use std::io::{Error, ErrorKind, Read, Result, Write, stdin, stdout};
9+
use std::io::{Error, ErrorKind, Read, Result, Write, stderr, stdin, stdout};
1010
use std::path::PathBuf;
1111
use uucore::display::Quotable;
1212
use uucore::error::UResult;
13+
use uucore::format_usage;
1314
use uucore::parser::shortcut_value_parser::ShortcutValueParser;
1415
use uucore::translate;
15-
use uucore::{format_usage, show_error};
1616

1717
// spell-checker:ignore nopipe
1818

@@ -271,7 +271,7 @@ fn open(
271271
name: name.clone(),
272272
})),
273273
Err(f) => {
274-
show_error!("{}: {f}", name.maybe_quote());
274+
let _ = writeln!(stderr(), "{}: {f}", name.maybe_quote());
275275
match output_error {
276276
Some(OutputErrorMode::Exit | OutputErrorMode::ExitNoPipe) => Some(Err(f)),
277277
_ => None,
@@ -308,26 +308,26 @@ fn process_error(
308308
) -> Result<()> {
309309
match mode {
310310
Some(OutputErrorMode::Warn) => {
311-
show_error!("{}: {f}", writer.name.maybe_quote());
311+
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
312312
*ignored_errors += 1;
313313
Ok(())
314314
}
315315
Some(OutputErrorMode::WarnNoPipe) | None => {
316316
if f.kind() != ErrorKind::BrokenPipe {
317-
show_error!("{}: {f}", writer.name.maybe_quote());
317+
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
318318
*ignored_errors += 1;
319319
}
320320
Ok(())
321321
}
322322
Some(OutputErrorMode::Exit) => {
323-
show_error!("{}: {f}", writer.name.maybe_quote());
323+
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
324324
Err(f)
325325
}
326326
Some(OutputErrorMode::ExitNoPipe) => {
327327
if f.kind() == ErrorKind::BrokenPipe {
328328
Ok(())
329329
} else {
330-
show_error!("{}: {f}", writer.name.maybe_quote());
330+
let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote());
331331
Err(f)
332332
}
333333
}
@@ -416,7 +416,7 @@ impl Read for NamedReader {
416416
fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
417417
match self.inner.read(buf) {
418418
Err(f) => {
419-
show_error!("{}", translate!("tee-error-stdin", "error" => f));
419+
let _ = writeln!(stderr(), "{}", translate!("tee-error-stdin", "error" => f));
420420
Err(f)
421421
}
422422
okay => okay,

0 commit comments

Comments
 (0)