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

ls: remove unused arg check_for_deref

Browse source
This commit is contained in:
Sylvestre Ledru 2023-12-24 15:03:34 +01:00
parent 18035a5f82
commit c5217b3136
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3070,7 +3070,7 @@ fn display_item_name(
} }
if let Some(ls_colors) = &config.color { if let Some(ls_colors) = &config.color {
name = color_name(name, path, ls_colors, style_manager, out, false, None); name = color_name(name, path, ls_colors, style_manager, out, None);
} }
if config.format != Format::Long && !more_info.is_empty() { if config.format != Format::Long && !more_info.is_empty() {
@ -3151,7 +3151,6 @@ fn display_item_name(
ls_colors, ls_colors,
style_manager, style_manager,
out, out,
true,
Some(&target_data), Some(&target_data),
)); ));
} }
@ -3272,7 +3271,6 @@ fn color_name(
ls_colors: &LsColors, ls_colors: &LsColors,
style_manager: &mut StyleManager, style_manager: &mut StyleManager,
out: &mut BufWriter<Stdout>, out: &mut BufWriter<Stdout>,
check_for_deref: bool,
target_symlink: Option<&PathData>, target_symlink: Option<&PathData>,
) -> String { ) -> String {
if !path.must_dereference { if !path.must_dereference {
@ -3286,11 +3284,10 @@ fn color_name(
} }
} }
if check_for_deref { if let Some(target) = target_symlink {
// use the optional target_symlink // use the optional target_symlink
// Use fn get_metadata_with_deref_opt instead of get_metadata() here because ls // Use fn get_metadata_with_deref_opt instead of get_metadata() here because ls
// should not exit with an err, if we are unable to obtain the target_metadata // should not exit with an err, if we are unable to obtain the target_metadata
let target = target_symlink.unwrap_or(path);
let md = get_metadata_with_deref_opt(target.p_buf.as_path(), path.must_dereference) let md = get_metadata_with_deref_opt(target.p_buf.as_path(), path.must_dereference)
.unwrap_or_else(|_| target.get_metadata(out).unwrap().clone()); .unwrap_or_else(|_| target.get_metadata(out).unwrap().clone());