|
6 | 6 | use clap::{Arg, ArgAction, Command, builder::PossibleValue}; |
7 | 7 | use std::ffi::OsString; |
8 | 8 | 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}; |
10 | 10 | use std::path::PathBuf; |
11 | 11 | use uucore::display::Quotable; |
12 | 12 | use uucore::error::UResult; |
| 13 | +use uucore::format_usage; |
13 | 14 | use uucore::parser::shortcut_value_parser::ShortcutValueParser; |
14 | 15 | use uucore::translate; |
15 | | -use uucore::{format_usage, show_error}; |
16 | 16 |
|
17 | 17 | // spell-checker:ignore nopipe |
18 | 18 |
|
@@ -271,7 +271,7 @@ fn open( |
271 | 271 | name: name.clone(), |
272 | 272 | })), |
273 | 273 | Err(f) => { |
274 | | - show_error!("{}: {f}", name.maybe_quote()); |
| 274 | + let _ = writeln!(stderr(), "{}: {f}", name.maybe_quote()); |
275 | 275 | match output_error { |
276 | 276 | Some(OutputErrorMode::Exit | OutputErrorMode::ExitNoPipe) => Some(Err(f)), |
277 | 277 | _ => None, |
@@ -308,26 +308,26 @@ fn process_error( |
308 | 308 | ) -> Result<()> { |
309 | 309 | match mode { |
310 | 310 | Some(OutputErrorMode::Warn) => { |
311 | | - show_error!("{}: {f}", writer.name.maybe_quote()); |
| 311 | + let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote()); |
312 | 312 | *ignored_errors += 1; |
313 | 313 | Ok(()) |
314 | 314 | } |
315 | 315 | Some(OutputErrorMode::WarnNoPipe) | None => { |
316 | 316 | if f.kind() != ErrorKind::BrokenPipe { |
317 | | - show_error!("{}: {f}", writer.name.maybe_quote()); |
| 317 | + let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote()); |
318 | 318 | *ignored_errors += 1; |
319 | 319 | } |
320 | 320 | Ok(()) |
321 | 321 | } |
322 | 322 | Some(OutputErrorMode::Exit) => { |
323 | | - show_error!("{}: {f}", writer.name.maybe_quote()); |
| 323 | + let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote()); |
324 | 324 | Err(f) |
325 | 325 | } |
326 | 326 | Some(OutputErrorMode::ExitNoPipe) => { |
327 | 327 | if f.kind() == ErrorKind::BrokenPipe { |
328 | 328 | Ok(()) |
329 | 329 | } else { |
330 | | - show_error!("{}: {f}", writer.name.maybe_quote()); |
| 330 | + let _ = writeln!(stderr(), "{}: {f}", writer.name.maybe_quote()); |
331 | 331 | Err(f) |
332 | 332 | } |
333 | 333 | } |
@@ -416,7 +416,7 @@ impl Read for NamedReader { |
416 | 416 | fn read(&mut self, buf: &mut [u8]) -> Result<usize> { |
417 | 417 | match self.inner.read(buf) { |
418 | 418 | Err(f) => { |
419 | | - show_error!("{}", translate!("tee-error-stdin", "error" => f)); |
| 419 | + let _ = writeln!(stderr(), "{}", translate!("tee-error-stdin", "error" => f)); |
420 | 420 | Err(f) |
421 | 421 | } |
422 | 422 | okay => okay, |
|
0 commit comments