Merge branch 'fmorgner/develop/kstd-system-error' into 'develop'

kstd: implement system_error infrastructure

See merge request teachos/kernel!54

1 files changed, 24 insertions, 44 deletions

diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index 68b51c97..efde1336 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -4,73 +4,53 @@
 #include <kernel/filesystem/open_file_table.hpp>
 #include <kernel/filesystem/vfs.hpp>
 
-#include <kstd/memory>
-#include <kstd/unikstd.h>
+#include <kstd/memory.hpp>
+#include <kstd/system_error.hpp>
 
 #include <cstddef>
+#include <expected>
 #include <string_view>
 
 namespace kapi::filesystem
 {
-  auto mount(std::string_view source, std::string_view target) -> kstd::ssize_t
+  auto mount(std::string_view source, std::string_view target) -> std::expected<void, kstd::error_code>
   {
-    if (kernel::filesystem::vfs::get().do_mount(source, target) == kernel::filesystem::vfs::operation_result::success)
-    {
-      return 0;
-    }
-    return -1;
+    return kernel::filesystem::vfs::get().mount(source, target);
   }
 
-  auto umount(std::string_view target) -> kstd::ssize_t
+  auto umount(std::string_view target) -> std::expected<void, kstd::error_code>
   {
-    if (kernel::filesystem::vfs::get().unmount(target) == kernel::filesystem::vfs::operation_result::success)
-    {
-      return 0;
-    }
-    return -1;
+    return kernel::filesystem::vfs::get().unmount(target);
   }
 
-  auto open(std::string_view path) -> kstd::ssize_t
+  auto open(std::string_view path) -> std::expected<std::size_t, kstd::error_code>
   {
-    if (auto dentry = kernel::filesystem::vfs::get().open(path))
-    {
+    return kernel::filesystem::vfs::get().open(path).and_then([](auto dentry) {
       auto open_file_descriptor = kstd::make_shared<kernel::filesystem::open_file_descriptor>(dentry);
       return kernel::filesystem::open_file_table::get().add_file(open_file_descriptor);
-    }
-
-    return -1;
+    });
   }
 
-  auto close(size_t file_descriptor) -> kstd::ssize_t
+  auto close(size_t file_descriptor) -> std::expected<void, kstd::error_code>
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
-    {
-      if (kernel::filesystem::vfs::get().close(open_file_descriptor->get_dentry()->absolute_path()) ==
-          kernel::filesystem::vfs::operation_result::success)
-      {
-        return kernel::filesystem::open_file_table::get().remove_file(file_descriptor);
-      }
-    }
-    return -1;
+    return kernel::filesystem::open_file_table::get()
+        .file(file_descriptor)
+        .transform([](auto file) { return file->get_dentry()->absolute_path(); })
+        .and_then([](auto path) { return kernel::filesystem::vfs::get().close(path); })
+        .and_then([=]() { return kernel::filesystem::open_file_table::get().remove_file(file_descriptor); });
   }
 
-  auto read(size_t file_descriptor, void * buffer, size_t size) -> kstd::ssize_t
+  auto read(size_t file_descriptor, void * buffer, size_t size) -> std::expected<std::size_t, kstd::error_code>
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
-    {
-      return open_file_descriptor->read(buffer, size);
-    }
-
-    return -1;
+    return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
+      return descriptor->read(buffer, size);
+    });
   }
 
-  auto write(size_t file_descriptor, void const * buffer, size_t size) -> kstd::ssize_t
+  auto write(size_t file_descriptor, void const * buffer, size_t size) -> std::expected<std::size_t, kstd::error_code>
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
-    {
-      return open_file_descriptor->write(buffer, size);
-    }
-
-    return -1;
+    return kernel::filesystem::open_file_table::get().file(file_descriptor).and_then([=](auto descriptor) {
+      return descriptor->write(buffer, size);
+    });
   }
 }  // namespace kapi::filesystem
\ No newline at end of file