kernel/src/fs/VFS.h

@@ -57,7 +57,7 @@ namespace VFS
 
         virtual Result<SharedPtr<Inode>> create_file_inode() = 0;
 
-        virtual Result<SharedPtr<Inode>> create_dir_inode(SharedPtr<Inode> parent) = 0;
+        virtual Result<SharedPtr<Inode>> create_dir_inode() = 0;
 
         virtual ~FileSystem() = default;
     };

kernel/src/fs/tmpfs/FileSystem.cpp

@@ -1,6 +1,5 @@
 #include "fs/tmpfs/FileSystem.h"
 #include <luna/Alloc.h>
-#include <luna/CString.h>
 #include <luna/Ignore.h>
 
 namespace TmpFS
@@ -8,7 +7,7 @@ namespace TmpFS
     Result<SharedPtr<VFS::FileSystem>> FileSystem::create()
     {
         SharedPtr<FileSystem> fs = TRY(adopt_shared(new (std::nothrow) FileSystem()));
-        SharedPtr<VFS::Inode> root = TRY(fs->create_dir_inode({}));
+        SharedPtr<VFS::Inode> root = TRY(fs->create_dir_inode());
         fs->set_root(root);
         return (SharedPtr<VFS::FileSystem>)fs;
     }
@@ -23,11 +22,10 @@ namespace TmpFS
         return (SharedPtr<VFS::Inode>)inode;
     }
 
-    Result<SharedPtr<VFS::Inode>> FileSystem::create_dir_inode(SharedPtr<VFS::Inode> parent)
+    Result<SharedPtr<VFS::Inode>> FileSystem::create_dir_inode()
     {
         SharedPtr<DirInode> inode = TRY(make_shared<DirInode>());
         TRY(inode->add_entry(inode, "."));
-        TRY(inode->add_entry(parent ? parent : (SharedPtr<VFS::Inode>)inode, ".."));
 
         inode->set_fs(*this, {});
         inode->set_inode_number(m_next_inode_number, {});
@@ -45,7 +43,7 @@ namespace TmpFS
     {
         for (const auto& entry : m_entries)
         {
-            if (!strcmp(name, entry.name)) return entry.inode;
+            if (!strcmp(name, entry.name.chars())) return entry.inode;
         }
 
         return err(ENOENT);
@@ -53,9 +51,7 @@ namespace TmpFS
 
     Result<void> DirInode::add_entry(SharedPtr<VFS::Inode> inode, const char* name)
     {
-        Entry entry;
+        Entry entry = { inode, TRY(OwnedStringView::from_string_literal(name)) };
-        entry.inode = inode;
-        strlcpy(entry.name, name, sizeof(entry.name));
 
         TRY(m_entries.try_append(move(entry)));
 

kernel/src/fs/tmpfs/FileSystem.h

@@ -16,7 +16,7 @@ namespace TmpFS
         }
 
         Result<SharedPtr<VFS::Inode>> create_file_inode() override;
-        Result<SharedPtr<VFS::Inode>> create_dir_inode(SharedPtr<VFS::Inode> parent) override;
+        Result<SharedPtr<VFS::Inode>> create_dir_inode() override;
 
         static Result<SharedPtr<VFS::FileSystem>> create();
 
@@ -110,7 +110,7 @@ namespace TmpFS
         struct Entry
         {
             SharedPtr<VFS::Inode> inode;
-            char name[128];
+            OwnedStringView name;
         };
 
         Vector<Entry> m_entries;

kernel/src/main.cpp

@@ -61,11 +61,7 @@ Result<void> init()
     VFS::Inode& root_inode = VFS::root_inode();
     kinfoln("root inode number: %zu", root_inode.inode_number());
 
-    kinfoln("root inode's '.' entry inode number: %zu", TRY(root_inode.find("."))->inode_number());
-    kinfoln("root inode's '..' entry inode number: %zu", TRY(root_inode.find(".."))->inode_number());
-
     TRY(root_inode.create_file("usr"));
-
     kinfoln("root inode's 'usr' entry inode number: %zu", TRY(root_inode.find("usr"))->inode_number());
 
     TarStream::Entry entry;

luna/include/luna/CString.h

@@ -22,8 +22,6 @@ extern "C"
     // FIXME: Replace this invented function with strlcpy().
     void nullcpy(char* dest, const char* src, usize len);
 
-    usize strlcpy(char* dest, const char* src, usize len);
-
     [[deprecated]] char* strcpy(char* dst, const char* src);
     [[deprecated]] char* strcat(char* dst, const char* src);
 

luna/include/luna/Vector.h

@@ -78,7 +78,7 @@ template <typename T> class Vector
         resize(capacity).release_value();
     }
 
-    Result<void> try_append(T&& item)
+    Result<void> try_append(T item)
     {
         if (m_capacity == m_size) TRY(resize(m_capacity + 8));
 
@@ -89,11 +89,6 @@ template <typename T> class Vector
         return {};
     }
 
-    Result<void> try_append(const T& item)
-    {
-        return try_append(T(item));
-    }
-
     Option<T> try_pop()
     {
         if (m_size == 0) return {};

luna/src/CString.cpp

@@ -125,15 +125,4 @@ extern "C"
         if (*str) return const_cast<char*>(str);
         return NULL;
     }
-
-    usize strlcpy(char* dest, const char* src, usize len)
-    {
-        usize src_len = strlen(src);
-        usize copy_len = src_len;
-        if (len == 0) return src_len;
-        if (src_len >= (len - 1)) copy_len = len - 1;
-        memcpy(dest, src, copy_len);
-        dest[copy_len] = 0;
-        return src_len;
-    }
 }