RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

Merge pull request #2877 from jfinkels/head-use-uucore-error-handling

Browse source 
head: use uucore error handling instead of custom
This commit is contained in:
Sylvestre Ledru 2022-01-29 10:53:48 +01:00 • committed by GitHub
commit 196a7a921c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/uu/head/src/head.rs
View file

@ -10,8 +10,8 @@ use std::convert::{TryFrom, TryInto};
use std::ffi::OsString;
use std::io::{self, BufWriter, ErrorKind, Read, Seek, SeekFrom, Write};
use uucore::display::Quotable;
use uucore::error::{UResult, USimpleError};
use uucore::show_error_custom_description;
use uucore::error::{FromIo, UError, UResult, USimpleError};
use uucore::show;
const BUF_SIZE: usize = 65536;
@ -416,7 +416,6 @@ fn head_file(input: &mut std::fs::File, options: &HeadOptions) -> std::io::Resul
}
fn uu_head(options: &HeadOptions) -> UResult<()> {
let mut error_count = 0;
let mut first = true;
for file in &options.files {
let res = match file.as_str() {
@ -450,19 +449,10 @@ fn uu_head(options: &HeadOptions) -> UResult<()> {
let mut file = match std::fs::File::open(name) {
Ok(f) => f,
Err(err) => {
let prefix = format!("cannot open {} for reading", name.quote());
match err.kind() {
ErrorKind::NotFound => {
show_error_custom_description!(prefix, "No such file or directory");
}
ErrorKind::PermissionDenied => {
show_error_custom_description!(prefix, "Permission denied");
}
_ => {
show_error_custom_description!(prefix, "{}", err);
}
}
error_count += 1;
show!(err.map_err_context(|| format!(
"cannot open {} for reading",
name.quote()
)));
continue;
}
};
@ -481,17 +471,18 @@ fn uu_head(options: &HeadOptions) -> UResult<()> {
} else {
file
};
let prefix = format!("error reading {}", name);
show_error_custom_description!(prefix, "Input/output error");
error_count += 1;
show!(USimpleError::new(
1,
format!("error reading {}: Input/output error", name)
));
}
first = false;
}
if error_count > 0 {
Err(USimpleError::new(1, ""))
} else {
Ok(())
}
// Even though this is returning `Ok`, it is possible that a call
// to `show!()` and thus a call to `set_exit_code()` has been
// called above. If that happens, then this process will exit with
// a non-zero exit code.
Ok(())
}
#[uucore_procs::gen_uumain]