mirror/ dutree
1
0
Fork 0
mirror of https://github.com/nachoparker/dutree synced 2024-05-28 02:26:05 +02:00
Code Issues

Gracefully handle bad or invalid symlinks

This commit is contained in:
Isaac Parker 2019-11-09 19:49:02 -08:00
parent 72344f2780
commit e7ee15b832
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib.rs
View File

@ -481,15 +481,17 @@ fn get_bytes( path: &Path, usage_flag : bool ) -> u64 {
fn color_from_path<'a>( path : &Path, color_dict : &'a HashMap<String, String> ) -> Option<&'a str> { fn color_from_path<'a>( path : &Path, color_dict : &'a HashMap<String, String> ) -> Option<&'a str> {
if try_is_symlink( path ) { if try_is_symlink( path ) {
if path.read_link().unwrap().exists() { let path_link = path.read_link();
if let Some( col ) = color_dict.get( &"ln".to_string() ) { if path_link.is_ok() {
return Some( &col ); if path_link.unwrap().exists() {
} if let Some(col) = color_dict.get(&"ln".to_string()) {
} else { return Some(&col);
if let Some( col ) = color_dict.get( &"or".to_string() ) { }
return Some( &col );
} }
} }
if let Some( col ) = color_dict.get( &"or".to_string() ) {
return Some( &col );
}
} }
let metadata = path.symlink_metadata(); let metadata = path.symlink_metadata();
if metadata.is_ok() { if metadata.is_ok() {