Skip to content

Commit 565202e

Browse files
committed
tee: fix < . message and strip errno
1 parent e0f0318 commit 565202e

3 files changed

Lines changed: 4 additions & 10 deletions

File tree

src/uu/tee/locales/en-US.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,5 @@ tee-help-output-error-warn-nopipe = produce warnings for errors that are not pip
1313
tee-help-output-error-exit = exit on write errors to any output
1414
tee-help-output-error-exit-nopipe = exit on write errors to any output that are not pipe errors (equivalent to exit on non-unix platforms)
1515
16-
# Error messages
17-
tee-error-stdin = stdin: { $error }
18-
1916
# Other messages
2017
tee-standard-output = 'standard output'

src/uu/tee/locales/fr-FR.ftl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,5 @@ tee-help-output-error-warn-nopipe = produire des avertissements pour les erreurs
1313
tee-help-output-error-exit = quitter en cas d'erreurs d'écriture vers toute sortie
1414
tee-help-output-error-exit-nopipe = quitter en cas d'erreurs d'écriture vers toute sortie qui ne sont pas des erreurs de tube (équivalent à exit sur les plateformes non-unix)
1515
16-
# Messages d'erreur
17-
tee-error-stdin = stdin : { $error }
18-
1916
# Autres messages
2017
tee-standard-output = 'sortie standard'

src/uu/tee/src/tee.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::fs::OpenOptions;
99
use std::io::{Error, ErrorKind, Read, Result, Write, stderr, stdin, stdout};
1010
use std::path::PathBuf;
1111
use uucore::display::Quotable;
12-
use uucore::error::UResult;
12+
use uucore::error::{UResult, strip_errno};
1313
use uucore::format_usage;
1414
use uucore::parser::shortcut_value_parser::ShortcutValueParser;
1515
use uucore::translate;
@@ -411,9 +411,9 @@ struct NamedReader {
411411
impl Read for NamedReader {
412412
fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
413413
match self.inner.read(buf) {
414-
Err(f) => {
415-
let _ = writeln!(stderr(), "{}", translate!("tee-error-stdin", "error" => f));
416-
Err(f)
414+
Err(e) => {
415+
let _ = writeln!(stderr(), "tee: read error: {}", strip_errno(&e));
416+
Err(e)
417417
}
418418
okay => okay,
419419
}

0 commit comments

Comments
 (0)