Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2024-11-16 09:48:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2853 from kimono-koans/ls_fix_first_newline

Browse source 
ls: Fix newline when only dirs in base directory
This commit is contained in:
Sylvestre Ledru 2022-01-07 23:10:44 +01:00 committed by GitHub
commit 9922e48ba6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1366,8 +1366,16 @@ fn list(locs: Vec<&Path>, config: Config) -> UResult<()> {
display_items(&files, &config, &mut out);
for dir in &dirs {
enter_directory(dir, &config, initial_locs_len, &mut out);
for (pos, dir) in dirs.iter().enumerate() {
// Print dir heading - name... 'total' comes after error display
if initial_locs_len > 1 || config.recursive {
if pos.eq(&0usize) && files.is_empty() {
let _ = writeln!(out, "{}:", dir.p_buf.display());
} else {
let _ = writeln!(out, "\n{}:", dir.p_buf.display());
}
}
enter_directory(dir, &config, &mut out);
}
Ok(())
@ -1437,12 +1445,7 @@ fn should_display(entry: &DirEntry, config: &Config) -> bool {
true
}
fn enter_directory(
dir: &PathData,
config: &Config,
initial_locs_len: usize,
out: &mut BufWriter<Stdout>,
) {
fn enter_directory(dir: &PathData, config: &Config, out: &mut BufWriter<Stdout>) {
// Create vec of entries with initial dot files
let mut entries: Vec<PathData> = if config.files == Files::All {
vec![
@ -1508,10 +1511,6 @@ fn enter_directory(
sort_entries(&mut vec_path_data, config);
entries.append(&mut vec_path_data);
// Print dir heading - name...
if initial_locs_len > 1 || config.recursive {
let _ = writeln!(out, "\n{}:", dir.p_buf.display());
}
// ...and total
if config.format == Format::Long {
display_total(&entries, config, out);
@ -1525,7 +1524,8 @@ fn enter_directory(
.skip(if config.files == Files::All { 2 } else { 0 })
.filter(|p| p.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
{
enter_directory(e, config, 0, out);
let _ = writeln!(out, "\n{}:", e.p_buf.display());
enter_directory(e, config, out);
}
}
}

22
tests/by-util/test_ls.rs
View file

@ -107,6 +107,28 @@ fn test_ls_io_errors() {
.stdout_contains("some-dir4");
}
#[test]
fn test_ls_only_dirs_formatting() {
let scene = TestScenario::new(util_name!());
let at = &scene.fixtures;
at.mkdir("some-dir1");
at.mkdir("some-dir2");
at.mkdir("some-dir3");
#[cfg(unix)]
{
scene.ucmd().arg("-1").arg("-R").succeeds().stdout_only(
".:\nsome-dir1\nsome-dir2\nsome-dir3\n\n./some-dir1:\n\n./some-dir2:\n\n./some-dir3:\n",
);
}
#[cfg(windows)]
{
scene.ucmd().arg("-1").arg("-R").succeeds().stdout_only(
".:\nsome-dir1\nsome-dir2\nsome-dir3\n\n.\\some-dir1:\n\n.\\some-dir2:\n\n.\\some-dir3:\n",
);
}
}
#[test]
fn test_ls_walk_glob() {
let scene = TestScenario::new(util_name!());