From 698efe230a1885d34fcde80c357158a27d809edd Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Wed, 6 Nov 2019 11:11:17 +0100 Subject: [PATCH] lwext4_fs + show_input: adjust to file system changes genodelabs/genode#3507 Fixes #194 --- src/app/show_input/main.cc | 1 - src/server/lwext4_fs/directory.h | 8 ++++---- src/server/lwext4_fs/node.h | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/app/show_input/main.cc b/src/app/show_input/main.cc index 62f17db..94102d5 100644 --- a/src/app/show_input/main.cc +++ b/src/app/show_input/main.cc @@ -24,7 +24,6 @@ #include /* gems includes */ -#include #include diff --git a/src/server/lwext4_fs/directory.h b/src/server/lwext4_fs/directory.h index cd70aed..c419a9d 100644 --- a/src/server/lwext4_fs/directory.h +++ b/src/server/lwext4_fs/directory.h @@ -103,7 +103,7 @@ class Lwext4_fs::Directory : public Node size_t const len = (size_t)(dentry->name_length + 1) > sizeof(e->name) ? sizeof(e->name) : dentry->name_length + 1; - strncpy(e->name, reinterpret_cast(dentry->name), len); + strncpy(e->name.buf, reinterpret_cast(dentry->name), len); e->inode = dentry->inode; break; @@ -114,9 +114,9 @@ class Lwext4_fs::Directory : public Node _prev_index = index; switch (dentry->inode_type) { - case EXT4_DE_DIR: e->type = Directory_entry::TYPE_DIRECTORY; break; - case EXT4_DE_SYMLINK: e->type = Directory_entry::TYPE_SYMLINK; break; - default: e->type = Directory_entry::TYPE_FILE; break; + case EXT4_DE_DIR: e->type = Node_type::DIRECTORY; break; + case EXT4_DE_SYMLINK: e->type = Node_type::SYMLINK; break; + default: e->type = Node_type::CONTINUOUS_FILE; break; } return sizeof(Directory_entry); diff --git a/src/server/lwext4_fs/node.h b/src/server/lwext4_fs/node.h index 9cb41e2..3d13861 100644 --- a/src/server/lwext4_fs/node.h +++ b/src/server/lwext4_fs/node.h @@ -79,10 +79,10 @@ class Lwext4_fs::Node : public Node_base unsigned int const v = ext4_inode_get_mode(sb, &_inode) & 0xf000; switch (v) { - case EXT4_INODE_MODE_DIRECTORY: status.mode = Status::MODE_DIRECTORY; break; - case EXT4_INODE_MODE_SOFTLINK: status.mode = Status::MODE_SYMLINK; break; + case EXT4_INODE_MODE_DIRECTORY: status.type = Node_type::DIRECTORY; break; + case EXT4_INODE_MODE_SOFTLINK: status.type = Node_type::SYMLINK; break; case EXT4_INODE_MODE_FILE: - default: status.mode = Status::MODE_FILE; break; + default: status.type = Node_type::CONTINUOUS_FILE; break; } return status;