Mirrors/coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils synced 2025-01-19 00:24:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Windows lints/build errors

Browse source
This commit is contained in:
electricboogie 2022-01-16 11:07:22 -06:00
parent e1bffea595
commit e6ce049d2c
1 changed files with 59 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1573,15 +1573,31 @@ fn enter_directory(
// metadata returned from a DirEntry matches GNU metadata for // metadata returned from a DirEntry matches GNU metadata for
// non-dereferenced files, and is *different* from the // non-dereferenced files, and is *different* from the
// metadata call on the path, see, for example, bad fds, // metadata call on the path, see, for example, bad fds,
// so we use here when we will need metadata later anyway // so we use dir_entry metadata here when we know we
if !res.must_dereference // will need metadata later anyway
&& ((config.format == Format::Long) #[cfg(unix)]
|| (config.sort == Sort::Name)
|| (config.sort == Sort::None)
|| config.inode)
{ {
if let Ok(md) = dir_entry.metadata() { if !res.must_dereference
res.set_md(md) && ((config.format == Format::Long)
|| (config.sort == Sort::Name)
|| (config.sort == Sort::None)
|| config.inode)
{
if let Ok(md) = dir_entry.metadata() {
res.set_md(md)
}
}
}
#[cfg(not(unix))]
{
if !res.must_dereference
&& ((config.format == Format::Long)
|| (config.sort == Sort::Name)
|| (config.sort == Sort::None))
{
if let Ok(md) = dir_entry.metadata() {
res.set_md(md)
}
} }
} }
res res
@ -2045,26 +2061,45 @@ fn display_item_long(
} }
} }
#[cfg(unix)]
let leading_char = {
if item.ft.get().is_some() && item.ft.get().unwrap().is_some() {
if item.ft.get().unwrap().unwrap().is_char_device() {
"c"
} else if item.ft.get().unwrap().unwrap().is_block_device() {
"b"
} else if item.ft.get().unwrap().unwrap().is_symlink() {
"l"
} else if item.ft.get().unwrap().unwrap().is_dir() {
"d"
} else {
"-"
}
} else {
"-"
}
};
#[cfg(not(unix))]
let leading_char = {
if item.ft.get().is_some() && item.ft.get().unwrap().is_some() {
if item.ft.get().unwrap().unwrap().is_symlink() {
"l"
} else if item.ft.get().unwrap().unwrap().is_dir() {
"d"
} else {
"-"
}
} else {
"-"
}
};
let _ = write!( let _ = write!(
out, out,
"{}{} {}", "{}{} {}",
format_args!( format_args!(
"{}?????????", "{}?????????", leading_char
if item.ft.get().is_some() && item.ft.get().unwrap().is_some() {
if item.ft.get().unwrap().unwrap().is_char_device() {
"c"
} else if item.ft.get().unwrap().unwrap().is_block_device() {
"b"
} else if item.ft.get().unwrap().unwrap().is_symlink() {
"l"
} else if item.ft.get().unwrap().unwrap().is_dir() {
"d"
} else {
"-"
}
} else {
"-"
},
), ),
if item.security_context.len() > 1 { if item.security_context.len() > 1 {
// GNU `ls` uses a "." character to indicate a file with a security context, // GNU `ls` uses a "." character to indicate a file with a security context,