RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-08-01 21:47:46 +00:00
Code Issues Activity

ls: remove path strip

Browse source
This commit is contained in:
Terts Diepraam 2021-04-26 09:53:13 +02:00
parent 322478d9a2
commit e4c0069493
1 changed files with 14 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1135,7 +1135,7 @@ fn list(locs: Vec<String>, config: Config) -> i32 {
} }
} }
sort_entries(&mut files, &config); sort_entries(&mut files, &config);
display_items(&files, None, &config, &mut out); display_items(&files, &config, &mut out);
sort_entries(&mut dirs, &config); sort_entries(&mut dirs, &config);
for dir in dirs { for dir in dirs {
@ -1227,7 +1227,7 @@ fn enter_directory(dir: &PathData, config: &Config, out: &mut BufWriter<Stdout>)
entries.append(&mut temp); entries.append(&mut temp);
display_items(&entries, Some(&dir.p_buf), config, out); display_items(&entries, config, out);
if config.recursive { if config.recursive {
for e in entries for e in entries
@ -1264,12 +1264,7 @@ fn pad_left(string: String, count: usize) -> String {
format!("{:>width$}", string, width = count) format!("{:>width$}", string, width = count)
} }
fn display_items( fn display_items(items: &[PathData], config: &Config, out: &mut BufWriter<Stdout>) {
items: &[PathData],
strip: Option<&Path>,
config: &Config,
out: &mut BufWriter<Stdout>,
) {
if config.format == Format::Long { if config.format == Format::Long {
let (mut max_links, mut max_size) = (1, 1); let (mut max_links, mut max_size) = (1, 1);
for item in items { for item in items {
@ -1278,12 +1273,10 @@ fn display_items(
max_size = size.max(max_size); max_size = size.max(max_size);
} }
for item in items { for item in items {
display_item_long(item, strip, max_links, max_size, config, out); display_item_long(item, max_links, max_size, config, out);
} }
} else { } else {
let names = items let names = items.iter().filter_map(|i| display_file_name(&i, config));
.iter()
.filter_map(|i| display_file_name(&i, strip, config));
match (&config.format, config.width) { match (&config.format, config.width) {
(Format::Columns, Some(width)) => { (Format::Columns, Some(width)) => {
@ -1355,7 +1348,6 @@ use uucore::fs::display_permissions;
fn display_item_long( fn display_item_long(
item: &PathData, item: &PathData,
strip: Option<&Path>,
max_links: usize, max_links: usize,
max_size: usize, max_size: usize,
config: &Config, config: &Config,
@ -1363,7 +1355,7 @@ fn display_item_long(
) { ) {
let md = match item.md() { let md = match item.md() {
None => { None => {
let filename = get_file_name(&item.p_buf, strip); let filename = get_file_name(&item.p_buf);
show_error!("could not show file: {}", filename); show_error!("could not show file: {}", filename);
return; return;
} }
@ -1407,7 +1399,7 @@ fn display_item_long(
// unwrap is fine because it fails when metadata is not available // unwrap is fine because it fails when metadata is not available
// but we already know that it is because it's checked at the // but we already know that it is because it's checked at the
// start of the function. // start of the function.
display_file_name(&item, strip, config).unwrap().contents, display_file_name(&item, config).unwrap().contents,
); );
} }
@ -1558,15 +1550,11 @@ fn display_file_type(file_type: FileType) -> char {
} }
} }
fn get_file_name(name: &Path, strip: Option<&Path>) -> String { fn get_file_name(name: &Path) -> String {
let mut name = match strip { name.file_name()
Some(prefix) => name.strip_prefix(prefix).unwrap_or(name), .unwrap_or(name.iter().last().unwrap())
None => name, .to_string_lossy()
}; .into()
if name.as_os_str().is_empty() {
name = Path::new(".");
}
name.to_string_lossy().into_owned()
} }
#[cfg(unix)] #[cfg(unix)]
@ -1605,8 +1593,8 @@ fn classify_file(path: &PathData) -> Option<char> {
} }
} }
fn display_file_name(path: &PathData, strip: Option<&Path>, config: &Config) -> Option<Cell> { fn display_file_name(path: &PathData, config: &Config) -> Option<Cell> {
let mut name = escape_name(get_file_name(&path.p_buf, strip), &config.quoting_style); let mut name = escape_name(get_file_name(&path.p_buf), &config.quoting_style);
#[cfg(unix)] #[cfg(unix)]
{ {