uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

readlink: eliminate duplicate code

Browse Source
This commit is contained in:
Jeffrey Finkelstein
2021-12-29 14:42:00 -05:00
parent 4ae838a8b2
commit 2a7831bd94
1 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/readlink/src/readlink.rs
+10 -17
View File
@@ -78,25 +78,18 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
for f in &files {
let p = PathBuf::from(f);
if res_mode == ResolveMode::None {
match fs::read_link(&p) {
Ok(path) => show(&path, no_newline, use_zero),
Err(err) => {
if verbose {
show_error!("{}: errno {}", f.maybe_quote(), err.raw_os_error().unwrap());
}
return 1;
}
}
let path_result = if res_mode == ResolveMode::None {
fs::read_link(&p)
} else {
match canonicalize(&p, can_mode, res_mode) {
Ok(path) => show(&path, no_newline, use_zero),
Err(err) => {
if verbose {
show_error!("{}: errno {}", f.maybe_quote(), err.raw_os_error().unwrap());
}
return 1;
canonicalize(&p, can_mode, res_mode)
};
match path_result {
Ok(path) => show(&path, no_newline, use_zero),
Err(err) => {
if verbose {
show_error!("{}: errno {}", f.maybe_quote(), err.raw_os_error().unwrap());
}
return 1;
}
}
}