kapi/fs: implement read_directory

This change also replaces the kernel internal directory_listing_cursor
and directory_listing_entry with the kapi types directory_cursor and
directory_entry.

2 files changed, 4 insertions, 6 deletions

diff --git a/kapi/kapi/filesystem.hpp b/kapi/kapi/filesystem.hpp
index 9da18c11..cd687c45 100644
--- a/kapi/kapi/filesystem.hpp
+++ b/kapi/kapi/filesystem.hpp
@@ -110,11 +110,9 @@ namespace kapi::filesystem
   //! List the contents of a directory.
   //!
   //! @param file_descriptor A file descriptor pointing to an open directory.
-  //! @param position The starting position of the listing.
   //! @param buffer A buffer to write the directory entries into.
-  //! @return The number of entries read and the next read position on success, an error otherwise.
-  auto read_directory(std::size_t file_descriptor, directory_cursor position, std::span<directory_entry> buffer)
-      -> kstd::result<std::pair<std::size_t, directory_cursor>>;
+  //! @return The number of entries read on success, an error otherwise.
+  auto read_directory(std::size_t file_descriptor, std::span<directory_entry> buffer) -> kstd::result<std::size_t>;
 
   //! @}
 }  // namespace kapi::filesystem
diff --git a/kapi/kapi/filesystem/directory_entry.hpp b/kapi/kapi/filesystem/directory_entry.hpp
index e881e415..6519f7df 100644
--- a/kapi/kapi/filesystem/directory_entry.hpp
+++ b/kapi/kapi/filesystem/directory_entry.hpp
@@ -14,9 +14,9 @@ namespace kapi::filesystem
 
   struct directory_entry
   {
-    std::uint64_t inode_number{};
-    file_type type{};
     kstd::string name{};
+    file_type type{};
+    std::uint64_t inode_number{};
   };
 
 }  // namespace kapi::filesystem