Robot/fd
1
0
Fork 0
mirror of https://github.com/sharkdp/fd.git synced 2024-11-18 09:50:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use .canonicalize() to check paths & Reword comments

Browse source
This commit is contained in:
J.W 2017-10-15 18:58:05 +08:00 committed by David Peter
parent e649c8fa79
commit 54d9dde0d4
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.rs
View file

@ -36,7 +36,8 @@ fn main() {
// Get the current working directory // Get the current working directory
let current_dir = Path::new("."); let current_dir = Path::new(".");
if !current_dir.is_dir() { // .is_dir() is not guarandteed to be intuitively correct for "." and ".."
if let Err(_) = current_dir.canonicalize() {
error("Error: could not get current directory."); error("Error: could not get current directory.");
} }
@ -45,7 +46,7 @@ fn main() {
Some(path) => PathBuf::from(path), Some(path) => PathBuf::from(path),
None => current_dir.to_path_buf(), None => current_dir.to_path_buf(),
}; };
if !root_dir_buf.is_dir() { if let Err(_) = root_dir_buf.canonicalize() {
error(&format!( error(&format!(
"Error: '{}' is not a directory.", "Error: '{}' is not a directory.",
root_dir_buf.to_string_lossy() root_dir_buf.to_string_lossy()
@ -125,7 +126,7 @@ fn main() {
// If base_dir is ROOT_DIR, then root_dir must be absolute. // If base_dir is ROOT_DIR, then root_dir must be absolute.
// Otherwise root_dir/entry cannot be turned into an existing relative path from base_dir. // Otherwise root_dir/entry cannot be turned into an existing relative path from base_dir.
// //
// We utilize ROOT_DIR to avoid resolving parent directories the root_dir. // We utilize ROOT_DIR to avoid resolving the components of root_dir.
let base_dir_buf = match config.path_display { let base_dir_buf = match config.path_display {
PathDisplay::Relative => current_dir.to_path_buf(), PathDisplay::Relative => current_dir.to_path_buf(),
PathDisplay::Absolute => PathBuf::from(ROOT_DIR), PathDisplay::Absolute => PathBuf::from(ROOT_DIR),