Skip to content

coreutils: strip errno #11484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

coreutils: strip errno #11484

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/bin/coreutils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use coreutils::validation;
use itertools::Itertools as _;
use std::cmp;
use std::ffi::OsString;
use std::io::{self, Write};
use std::io::{ErrorKind::BrokenPipe, Write, stderr, stdout};
use std::process;
use uucore::Args;
use uucore::{Args, error::strip_errno};

const VERSION: &str = env!("CARGO_PKG_VERSION");

Expand Down Expand Up @@ -41,10 +41,10 @@ Currently defined functions:

{indent_list}"
);
if let Err(e) = writeln!(io::stdout(), "{s}")
&& e.kind() != io::ErrorKind::BrokenPipe
if let Err(e) = writeln!(stdout(), "{s}")
&& e.kind() != BrokenPipe
{
let _ = writeln!(io::stderr(), "coreutils: {e}");
let _ = writeln!(stderr(), "coreutils: {}", strip_errno(&e));
process::exit(1);
}
}
Expand Down Expand Up @@ -90,22 +90,22 @@ fn main() {
usage(&utils, binary_as_util);
process::exit(0);
}
let mut out = io::stdout().lock();
let mut out = stdout().lock();
for util in utils.keys() {
if let Err(e) = writeln!(out, "{util}")
&& e.kind() != io::ErrorKind::BrokenPipe
&& e.kind() != BrokenPipe
{
let _ = writeln!(io::stderr(), "coreutils: {e}");
let _ = writeln!(stderr(), "coreutils: {}", strip_errno(&e));
process::exit(1);
}
}
process::exit(0);
}
"--version" | "-V" => {
if let Err(e) = writeln!(io::stdout(), "coreutils {VERSION} (multi-call binary)")
&& e.kind() != io::ErrorKind::BrokenPipe
if let Err(e) = writeln!(stdout(), "coreutils {VERSION} (multi-call binary)")
&& e.kind() != BrokenPipe
{
let _ = writeln!(io::stderr(), "coreutils: {e}");
let _ = writeln!(stderr(), "coreutils: {}", strip_errno(&e));
process::exit(1);
}
process::exit(0);
Expand Down Expand Up @@ -139,7 +139,7 @@ fn main() {
.into_iter()
.chain(args),
);
io::stdout().flush().expect("could not flush stdout");
stdout().flush().expect("could not flush stdout");
process::exit(code);
}
None => validation::not_found(&util_os),
Expand Down
Loading