Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-22 09:55:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

ls: add command_line bool to error for exit code 2

Browse source
This commit is contained in:
Niyaz Nigmatullin 2022-07-10 23:12:05 +03:00
parent 6c8dab38b8
commit 4e0b238748
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/uu/ls/src/ls.rs
View file

@ -153,7 +153,7 @@ const DEFAULT_BLOCK_SIZE: u64 = 1024;
enum LsError { enum LsError {
InvalidLineWidth(String), InvalidLineWidth(String),
IOError(std::io::Error), IOError(std::io::Error),
IOErrorContext(std::io::Error, PathBuf), IOErrorContext(std::io::Error, PathBuf, bool),
BlockSizeParseError(String), BlockSizeParseError(String),
AlreadyListedError(PathBuf), AlreadyListedError(PathBuf),
} }
@ -163,7 +163,8 @@ impl UError for LsError {
match self { match self {
Self::InvalidLineWidth(_) => 2, Self::InvalidLineWidth(_) => 2,
Self::IOError(_) => 1, Self::IOError(_) => 1,
Self::IOErrorContext(_, _) => 1, Self::IOErrorContext(_, _, false) => 1,
Self::IOErrorContext(_, _, true) => 2,
Self::BlockSizeParseError(_) => 1, Self::BlockSizeParseError(_) => 1,
Self::AlreadyListedError(_) => 2, Self::AlreadyListedError(_) => 2,
} }
@ -180,7 +181,7 @@ impl Display for LsError {
} }
Self::InvalidLineWidth(s) => write!(f, "invalid line width: {}", s.quote()), Self::InvalidLineWidth(s) => write!(f, "invalid line width: {}", s.quote()),
Self::IOError(e) => write!(f, "general io error: {}", e), Self::IOError(e) => write!(f, "general io error: {}", e),
Self::IOErrorContext(e, p) => { Self::IOErrorContext(e, p, _) => {
let error_kind = e.kind(); let error_kind = e.kind();
let errno = e.raw_os_error().unwrap_or(1i32); let errno = e.raw_os_error().unwrap_or(1i32);
@ -1566,6 +1567,7 @@ struct PathData {
p_buf: PathBuf, p_buf: PathBuf,
must_dereference: bool, must_dereference: bool,
security_context: String, security_context: String,
command_line: bool,
} }
impl PathData { impl PathData {
@ -1649,6 +1651,7 @@ impl PathData {
p_buf, p_buf,
must_dereference, must_dereference,
security_context, security_context,
command_line,
} }
} }
@ -1677,7 +1680,11 @@ impl PathData {
return dir_entry.metadata().ok(); return dir_entry.metadata().ok();
} }
} }
show!(LsError::IOErrorContext(err, self.p_buf.clone(),)); show!(LsError::IOErrorContext(
err,
self.p_buf.clone(),
self.command_line
));
None None
} }
Ok(md) => Some(md), Ok(md) => Some(md),
@ -1739,7 +1746,11 @@ pub fn list(locs: Vec<&Path>, config: &Config) -> UResult<()> {
Err(err) => { Err(err) => {
// flush stdout buffer before the error to preserve formatting and order // flush stdout buffer before the error to preserve formatting and order
out.flush()?; out.flush()?;
show!(LsError::IOErrorContext(err, path_data.p_buf.clone())); show!(LsError::IOErrorContext(
err,
path_data.p_buf.clone(),
path_data.command_line
));
continue; continue;
} }
Ok(rd) => rd, Ok(rd) => rd,
@ -1916,7 +1927,11 @@ fn enter_directory(
match fs::read_dir(&e.p_buf) { match fs::read_dir(&e.p_buf) {
Err(err) => { Err(err) => {
out.flush()?; out.flush()?;
show!(LsError::IOErrorContext(err, e.p_buf.clone())); show!(LsError::IOErrorContext(
err,
e.p_buf.clone(),
e.command_line
));
continue; continue;
} }
Ok(rd) => { Ok(rd) => {