Fix fat file search

mrgian · Jun 30, 2023 · 9de643b · 9de643b
1 parent c084655
commit 9de643b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/kernel/src/filesystem/fat.rs b/kernel/src/filesystem/fat.rs
@@ -241,10 +241,8 @@ impl FatDriver {
     }
 
     //search by filename, returns found root entry
-    pub fn search_file(&self, name: &[char]) -> Entry {
-        let mut result = NULL_ENTRY;
-
-        for entry in self.entries {
+    pub fn search_file(&self, name: &[char]) -> &Entry {
+        for entry in self.entries.iter() {
             let mut found = true;
             let mut i = 0;
 
@@ -263,10 +261,10 @@ impl FatDriver {
             }
 
             if found {
-                result = entry;
+                return entry;
             }
         }
 
-        result
+        &NULL_ENTRY
     }
 }
diff --git a/kernel/src/shell/shell.rs b/kernel/src/shell/shell.rs
@@ -164,7 +164,7 @@ impl Shell {
         let entry = FAT.search_file(&self.arg);
 
         if entry.name[0] != 0 {
-            FAT.read_file_to_buffer(&entry);
+            FAT.read_file_to_buffer(entry);
 
             for c in FAT.buffer {
                 if c != 0 {