Refactor

shellgei · Dec 31, 2023 · 11fbf60 · 11fbf60
1 parent 58766c4
commit 11fbf60
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/builtins/cd.rs b/src/core/builtins/cd.rs
@@ -50,7 +50,7 @@ fn set_oldpwd(core: &mut ShellCore) {
 }
 
 fn change_directory(core: &mut ShellCore, args: &mut Vec<String>) -> i32 {
-    let path = utils::make_canonical_path(utils::make_absolute_path(core, &args[1]));
+    let path = utils::make_canonical_path(core, &args[1]);
     if core.set_current_directory(&path).is_ok() {
         core.vars.insert("PWD".to_string(), path.display().to_string());
         0

diff --git a/src/core/builtins/utils.rs b/src/core/builtins/utils.rs
@@ -30,7 +30,8 @@ pub fn make_absolute_path(core: &mut ShellCore, path_str: &str) -> PathBuf {
     absolute
 }
 
-pub fn make_canonical_path(path: PathBuf) -> PathBuf {
+pub fn make_canonical_path(core: &mut ShellCore, path_str: &str) -> PathBuf {
+    let path = make_absolute_path(core, path_str);
     let mut canonical = PathBuf::new();
     for component in path.components() {
         match component {