Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-12-27 10:22:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug where xattr '@' characters weren't shown

Browse Source 
The `--long` flag should show the '@' character in the permissions list if that feature has been compiled in, but only the `--extended` flag should actually show their keys, rather than just their presence.
This commit is contained in:
Benjamin Sago 2016-01-16 12:19:00 -10:00
parent 7f980935c5
commit 4c3266310d
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/output/details.rs
View File

@ -214,6 +214,7 @@ impl Details {
use num_cpus; use num_cpus;
use scoped_threadpool::Pool; use scoped_threadpool::Pool;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use feature::xattr;
let mut pool = Pool::new(num_cpus::get() as u32); let mut pool = Pool::new(num_cpus::get() as u32);
let mut file_eggs = Vec::new(); let mut file_eggs = Vec::new();
@ -236,25 +237,21 @@ impl Details {
scoped.execute(move || { scoped.execute(move || {
let mut errors = Vec::new(); let mut errors = Vec::new();
let mut xattrs = Vec::new(); let mut xattrs = Vec::new();
if xattr::ENABLED {
match file.path.attributes() { match file.path.attributes() {
Ok(xs) => { Ok(xs) => xattrs.extend(xs),
if self.xattr { Err(e) => errors.push((e, None)),
for xattr in xs {
xattrs.push(xattr);
}
}
},
Err(e) => {
if self.xattr {
errors.push((e, None));
}
},
}; };
}
let cells = table.cells_for_file(&file, !xattrs.is_empty()); let cells = table.cells_for_file(&file, !xattrs.is_empty());
if !table.opts.xattr {
xattrs.clear();
}
let mut dir = None; let mut dir = None;
if let Some(r) = self.recurse { if let Some(r) = self.recurse {