Skip to content

ls: some improvements after #9431 #10149

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

Merged
cakebaker merged 5 commits into from
Jan 10, 2026
Merged

ls: some improvements after #9431 #10149

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
224be49
ls: remove redundant HashMap lookup in append_raw_style_code_for_indi…
sylvestre Jan 8, 2026
71c3eb6
ls: replace magic numbers with named constants
sylvestre Jan 8, 2026
c463561
ls: refactor complex indicator_for_raw_code method into smaller helpers
sylvestre Jan 8, 2026
1f247d1
ls: optimize canonicalize_indicator_value to avoid unnecessary alloca…
sylvestre Jan 8, 2026
f07f5b9
ls: fix Windows compilation by properly handling platform-specific code
sylvestre Jan 9, 2026
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
217 changes: 133 additions & 84 deletions src/uu/ls/src/colors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// file that was distributed with this source code.
use super::PathData;
use lscolors::{Indicator, LsColors, Style};
use std::borrow::Cow;
use std::collections::HashMap;
use std::env;
use std::ffi::OsString;
Expand All @@ -18,6 +19,17 @@ const ANSI_RESET: &str = "\x1b[0m";
const ANSI_CLEAR_EOL: &str = "\x1b[K";
const EMPTY_STYLE: &str = "\x1b[m";

#[cfg(unix)]
mod mode {
// Unix file mode bits
pub const SETUID: u32 = 0o4000;
pub const SETGID: u32 = 0o2000;
pub const EXECUTABLE: u32 = 0o0111;
pub const STICKY_OTHER_WRITABLE: u32 = 0o1002;
pub const OTHER_WRITABLE: u32 = 0o0002;
pub const STICKY: u32 = 0o1000;
}

enum RawIndicatorStyle {
Empty,
Code(Indicator),
Expand Down Expand Up @@ -129,14 +141,11 @@ impl<'a> StyleManager<'a> {
indicator: Indicator,
style_code: &mut String,
) {
if !self.indicator_codes.contains_key(&indicator) {
return;
}
style_code.push_str(self.reset(!self.initial_reset_is_done));
style_code.push_str(ANSI_CSI);
if let Some(raw) = self.indicator_codes.get(&indicator) {
if let Some(raw) = self.indicator_codes.get(&indicator).cloned() {
debug_assert!(!raw.is_empty());
style_code.push_str(raw);
style_code.push_str(self.reset(!self.initial_reset_is_done));
style_code.push_str(ANSI_CSI);
style_code.push_str(&raw);
style_code.push_str(ANSI_SGR_END);
}
}
Expand Down Expand Up @@ -355,98 +364,138 @@ impl<'a> StyleManager<'a> {
};

if file_type.is_symlink() {
let orphan_enabled = self.has_indicator_style(Indicator::OrphanedSymbolicLink);
let missing_enabled = self.has_indicator_style(Indicator::MissingFile);
let needs_target_state = self.ln_color_from_target || orphan_enabled;
let target_missing = needs_target_state && !entry_exists();

if target_missing {
let orphan_raw = self.indicator_codes.get(&Indicator::OrphanedSymbolicLink);
let orphan_raw_is_empty = orphan_raw.is_some_and(|value| value.is_empty());
if orphan_enabled && (!orphan_raw_is_empty || self.ln_color_from_target) {
return Some(Indicator::OrphanedSymbolicLink);
}
if self.ln_color_from_target && missing_enabled {
return Some(Indicator::MissingFile);
}
}
if self.has_indicator_style(Indicator::SymbolicLink) {
return Some(Indicator::SymbolicLink);
}
return None;
return self.indicator_for_symlink(&mut entry_exists);
}

if self.has_indicator_style(Indicator::MissingFile) && !entry_exists() {
return Some(Indicator::MissingFile);
}

if file_type.is_file() {
#[cfg(unix)]
if self.needs_file_metadata() {
if let Some(metadata) = path.metadata() {
let mode = metadata.mode();
if self.has_indicator_style(Indicator::Setuid) && mode & 0o4000 != 0 {
return Some(Indicator::Setuid);
}
if self.has_indicator_style(Indicator::Setgid) && mode & 0o2000 != 0 {
return Some(Indicator::Setgid);
}
if self.has_indicator_style(Indicator::ExecutableFile) && mode & 0o0111 != 0 {
return Some(Indicator::ExecutableFile);
}
if self.has_indicator_style(Indicator::MultipleHardLinks)
&& metadata.nlink() > 1
{
return Some(Indicator::MultipleHardLinks);
}
}
}
self.indicator_for_file(path)
} else if file_type.is_dir() {
self.indicator_for_directory(path)
} else {
self.indicator_for_special_file(file_type)
}
}

if self.has_indicator_style(Indicator::RegularFile) {
return Some(Indicator::RegularFile);
fn indicator_for_symlink(&self, entry_exists: &mut dyn FnMut() -> bool) -> Option<Indicator> {
let orphan_enabled = self.has_indicator_style(Indicator::OrphanedSymbolicLink);
let missing_enabled = self.has_indicator_style(Indicator::MissingFile);
let needs_target_state = self.ln_color_from_target || orphan_enabled;
let target_missing = needs_target_state && !entry_exists();

if target_missing {
let orphan_raw = self.indicator_codes.get(&Indicator::OrphanedSymbolicLink);
let orphan_raw_is_empty = orphan_raw.is_some_and(|value| value.is_empty());
if orphan_enabled && (!orphan_raw_is_empty || self.ln_color_from_target) {
return Some(Indicator::OrphanedSymbolicLink);
}
} else if file_type.is_dir() {
#[cfg(unix)]
if self.needs_dir_metadata() {
if let Some(metadata) = path.metadata() {
let mode = metadata.mode();
if self.has_indicator_style(Indicator::StickyAndOtherWritable)
&& mode & 0o1002 == 0o1002
{
return Some(Indicator::StickyAndOtherWritable);
}
if self.has_indicator_style(Indicator::OtherWritable) && mode & 0o0002 != 0 {
return Some(Indicator::OtherWritable);
}
if self.has_indicator_style(Indicator::Sticky) && mode & 0o1000 != 0 {
return Some(Indicator::Sticky);
}
}
if self.ln_color_from_target && missing_enabled {
return Some(Indicator::MissingFile);
}
}
if self.has_indicator_style(Indicator::SymbolicLink) {
return Some(Indicator::SymbolicLink);
}
None
}

if self.has_indicator_style(Indicator::Directory) {
return Some(Indicator::Directory);
}
} else {
#[cfg(unix)]
{
if file_type.is_fifo() && self.has_indicator_style(Indicator::FIFO) {
return Some(Indicator::FIFO);
#[cfg(unix)]
fn indicator_for_file(&self, path: &PathData) -> Option<Indicator> {
if self.needs_file_metadata() {
if let Some(metadata) = path.metadata() {
let mode = metadata.mode();
if self.has_indicator_style(Indicator::Setuid) && mode & mode::SETUID != 0 {
return Some(Indicator::Setuid);
}
if self.has_indicator_style(Indicator::Setgid) && mode & mode::SETGID != 0 {
return Some(Indicator::Setgid);
}
if self.has_indicator_style(Indicator::ExecutableFile)
&& mode & mode::EXECUTABLE != 0
{
return Some(Indicator::ExecutableFile);
}
if file_type.is_socket() && self.has_indicator_style(Indicator::Socket) {
return Some(Indicator::Socket);
if self.has_indicator_style(Indicator::MultipleHardLinks) && metadata.nlink() > 1 {
return Some(Indicator::MultipleHardLinks);
}
if file_type.is_block_device() && self.has_indicator_style(Indicator::BlockDevice) {
return Some(Indicator::BlockDevice);
}
}

if self.has_indicator_style(Indicator::RegularFile) {
Some(Indicator::RegularFile)
} else {
None
}
}

#[cfg(not(unix))]
fn indicator_for_file(&self, _path: &PathData) -> Option<Indicator> {
if self.has_indicator_style(Indicator::RegularFile) {
Some(Indicator::RegularFile)
} else {
None
}
}

#[cfg(unix)]
fn indicator_for_directory(&self, path: &PathData) -> Option<Indicator> {
if self.needs_dir_metadata() {
if let Some(metadata) = path.metadata() {
let mode = metadata.mode();
if self.has_indicator_style(Indicator::StickyAndOtherWritable)
&& mode & mode::STICKY_OTHER_WRITABLE == mode::STICKY_OTHER_WRITABLE
{
return Some(Indicator::StickyAndOtherWritable);
}
if file_type.is_char_device()
&& self.has_indicator_style(Indicator::CharacterDevice)
if self.has_indicator_style(Indicator::OtherWritable)
&& mode & mode::OTHER_WRITABLE != 0
{
return Some(Indicator::CharacterDevice);
return Some(Indicator::OtherWritable);
}
if self.has_indicator_style(Indicator::Sticky) && mode & mode::STICKY != 0 {
return Some(Indicator::Sticky);
}
}
}

if self.has_indicator_style(Indicator::Directory) {
Some(Indicator::Directory)
} else {
None
}
}

#[cfg(not(unix))]
fn indicator_for_directory(&self, _path: &PathData) -> Option<Indicator> {
if self.has_indicator_style(Indicator::Directory) {
Some(Indicator::Directory)
} else {
None
}
}

#[cfg(unix)]
fn indicator_for_special_file(&self, file_type: &std::fs::FileType) -> Option<Indicator> {
if file_type.is_fifo() && self.has_indicator_style(Indicator::FIFO) {
return Some(Indicator::FIFO);
}
if file_type.is_socket() && self.has_indicator_style(Indicator::Socket) {
return Some(Indicator::Socket);
}
if file_type.is_block_device() && self.has_indicator_style(Indicator::BlockDevice) {
return Some(Indicator::BlockDevice);
}
if file_type.is_char_device() && self.has_indicator_style(Indicator::CharacterDevice) {
return Some(Indicator::CharacterDevice);
}
None
}

#[cfg(not(unix))]
fn indicator_for_special_file(&self, _file_type: &std::fs::FileType) -> Option<Indicator> {
None
}

Expand Down Expand Up @@ -730,22 +779,22 @@ fn parse_indicator_codes() -> (HashMap<Indicator, String>, bool) {
}
continue;
}
indicator_codes.insert(indicator, canonicalize_indicator_value(value));
indicator_codes.insert(indicator, canonicalize_indicator_value(value).into_owned());
}
}
}

(indicator_codes, ln_color_from_target)
}

fn canonicalize_indicator_value(value: &str) -> String {
fn canonicalize_indicator_value(value: &str) -> Cow<'_, str> {
if value.len() == 1 && value.chars().all(|c| c.is_ascii_digit()) {
let mut canonical = String::with_capacity(2);
canonical.push('0');
canonical.push_str(value);
canonical
Cow::Owned(canonical)
} else {
value.to_string()
Cow::Borrowed(value)
}
}

Expand Down
Loading