Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-09-27 20:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #168 from kballard/dot_filename

Browse Source 
Print . and .. components properly
This commit is contained in:
Benjamin Sago 2017-04-29 10:58:39 +01:00 committed by GitHub
commit 7d6c1eb724
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/fs/file.rs
View File

@ -102,8 +102,8 @@ impl<'dir> File<'dir> {
/// Create a new File object from the given metadata result, and other data.
pub fn with_metadata(metadata: fs::Metadata, path: &Path, parent: Option<&'dir Dir>) -> File<'dir> {
let filename = match path.file_name() {
Some(name) => name.to_string_lossy().to_string(),
let filename = match path.components().next_back() {
Some(comp) => comp.as_os_str().to_string_lossy().to_string(),
None => String::new(),
};
@ -174,8 +174,8 @@ impl<'dir> File<'dir> {
None => path
};
let filename = match target_path.file_name() {
Some(name) => name.to_string_lossy().to_string(),
let filename = match target_path.components().next_back() {
Some(comp) => comp.as_os_str().to_string_lossy().to_string(),
None => String::new(),
};