Kernel+FileSystem: Set '.' and '..' correctly

asynts · Apr 17, 2021 · c6c7d4c · c6c7d4c
1 parent 2143cac
commit c6c7d4c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/Kernel/FileSystem/FlashFileSystem.cpp b/Kernel/FileSystem/FlashFileSystem.cpp
@@ -23,11 +23,23 @@ namespace Kernel
         m_ino = info.st_ino;
         m_mode = info.st_mode;
 
+        m_entries.set(".", this);
+        m_entries.set("..", this);
+
         auto *begin = reinterpret_cast<const FlashDirectoryInfo*>(info.m_data);
         auto *end = reinterpret_cast<const FlashDirectoryInfo*>(info.m_data + info.st_size);
 
-        for(auto *entry = begin; entry != end; ++entry)
-            m_entries.set(entry->m_name, new FlashFile { *entry->m_info });
+        for(auto *entry = begin; entry != end; ++entry) {
+            if ((entry->m_info->st_mode & Kernel::ModeFlags::Format) == Kernel::ModeFlags::Directory) {
+                auto& new_directory = *new FlashDirectory { *entry->m_info };
+                new_directory.m_entries.set("..", this);
+
+                m_entries.set(entry->m_name, &new_directory);
+            } else {
+                VERIFY((entry->m_info->st_mode & Kernel::ModeFlags::Format) == Kernel::ModeFlags::Regular);
+                m_entries.set(entry->m_name, new FlashFile { *entry->m_info });
+            }
+        }
     }
 
     VirtualFileHandle& FlashDirectory::create_handle()

diff --git a/Kernel/FileSystem/MemoryFileSystem.cpp b/Kernel/FileSystem/MemoryFileSystem.cpp
@@ -14,10 +14,13 @@ namespace Kernel
         m_root->m_entries.set(".", m_root);
         m_root->m_entries.set("..", m_root);
 
-        auto& dev_file = *new MemoryDirectory;
+        auto& dev_directory = *new MemoryDirectory;
+        dev_directory.m_entries.set("..", m_root);
+        m_root->m_entries.set("dev", &dev_directory);
 
-        m_root->m_entries.set("dev", &dev_file);
-        m_root->m_entries.set("bin", &FlashFileSystem::the().root());
+        auto& bin_directory = dynamic_cast<VirtualDirectory&>(FlashFileSystem::the().root());
+        bin_directory.m_entries.set("..", m_root);
+        m_root->m_entries.set("bin", &bin_directory);
     }
 
     VirtualFileHandle& MemoryFile::create_handle()