alex/genode-world
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lwext4_fs + show_input: adjust to file system changes

Browse Source 
genodelabs/genode#3507

Fixes #194
This commit is contained in:
Sebastian Sumpf
2019-11-06 11:11:17 +01:00
committed by Christian Helmuth
parent 21cab2004a
commit 698efe230a
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/show_input/main.cc
View File

@@ -24,7 +24,6 @@
#include <nitpicker_gfx/box_painter.h>
/* gems includes */
#include <gems/vfs.h>
#include <gems/vfs_font.h>

8
src/server/lwext4_fs/directory.h
View File

@@ -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<char const*>(dentry->name), len);
strncpy(e->name.buf, reinterpret_cast<char const*>(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);

6
src/server/lwext4_fs/node.h
View File

@@ -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;