feat: implement cd for user_shell

fix: path handling
Yttehs-HDX · Dec 3, 2024 · 7573b99 · 7573b99
1 parent d8187be
commit 7573b99
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/kernel/src/fs/path.rs b/kernel/src/fs/path.rs
@@ -65,7 +65,7 @@ impl PathUtil {
 
     pub fn parent(&self) -> String {
         let mut split = self.split();
-        if split.len() == 1 {
+        if split.len() == 1 || split.len() == 0 {
             return ROOT_DIR.to_string();
         }
         split.pop();
@@ -75,7 +75,7 @@ impl PathUtil {
     pub fn name(&self) -> String {
         let mut split = self.split();
         if split.len() == 0 {
-            return ROOT_DIR.to_string();
+            return "".to_string();
         }
         split.pop().unwrap().to_string()
     }

diff --git a/kernel/src/syscall/fs.rs b/kernel/src/syscall/fs.rs
@@ -1,7 +1,5 @@
 use crate::{
-    fs::{self, Inode, InodeType, OpenFlags, PathUtil},
-    syscall::translate_str,
-    task,
+    config::ROOT_DIR, fs::{self, Inode, InodeType, OpenFlags, PathUtil}, syscall::translate_str, task
 };
 use alloc::string::ToString;
 
@@ -28,6 +26,13 @@ pub fn sys_write(fd: usize, buffer: *const u8, len: usize) -> isize {
 pub fn sys_chdir(path_ptr: *const u8) -> isize {
     let path = translate_str(path_ptr);
     let path = PathUtil::from_user(path).to_string();
+
+    if path == ROOT_DIR {
+        // '/' could not be opened
+        task::get_processor().current().inner_mut().set_cwd(ROOT_DIR.to_string());
+        return 0;
+    }
+
     let inode = fs::open_file(&path, OpenFlags::RDONLY);
     if let Some(inode) = inode {
         if inode.get_type() == InodeType::Dir {

diff --git a/test/test.img b/test/test.img
diff --git a/user/src/bin/user_shell.rs b/user/src/bin/user_shell.rs
@@ -2,7 +2,7 @@
 #![no_main]
 
 use user_lib::{
-    alloc::string::String, exec, exit, fork, get_char, init_heap, print, println, waitpid,
+    alloc::string::String, chdir, exec, exit, fork, get_char, init_heap, print, println, waitpid
 };
 
 extern crate user_lib;
@@ -37,6 +37,12 @@ fn main() -> i32 {
                             print!("\x1b[H\x1b[2J");
                         }
                         "exit" => break,
+                        _ if input.starts_with("cd ") => {
+                            let path = input.strip_prefix("cd ").unwrap();
+                            if chdir(path) != 0 {
+                                println!("{}: cd: {}: No such file or directory", SHELL_NAME, path);
+                            }
+                        }
                         _ => {
                             // mark input as path
                             input.push('\0');
@@ -61,7 +67,7 @@ fn main() -> i32 {
                     }
                 }
                 print_prompt();
-                input.clear();
+                input = String::new();
             }
             BS | DL => {
                 if !input.is_empty() {