RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 18:05:07 +00:00
Code Issues Activity Actions

FileSystem: Convert file types to DT_* types at a later stage

Browse source 
A change introduced in 5e01234 made it the resposibility of each
filesystem to have the file types returned from
'traverse_as_directory' match up with the DT_* types.
However, this caused corruption of the Ext2FS file format because
the Ext2FS uses 'traverse_as_directory' internally when manipulating
 the file system. The result was a mixture between EXT2_FT_* and DT_*
file types in the internal Ext2FS structures.

Starting with this commit, the conversion from internal filesystem file
types to the user facing DT_* types happens at a later stage,
in the 'FileDescription::get_dir_entries' function which is directly
used by sys$get_dir_entries.
This commit is contained in:
Itamar 2020-08-29 21:25:01 +03:00 • committed by Andreas Kling
parent e68b158a52
commit 33138900de
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Kernel/FileSystem/Ext2FileSystem.cpp
View file

@ -855,7 +855,7 @@ ssize_t Ext2FSInode::write_bytes(off_t offset, ssize_t count, const u8* data, Fi
return nwritten;
}
u8 Ext2FSInode::file_type_for_directory_entry(const ext2_dir_entry_2& entry)
u8 Ext2FS::internal_file_type_to_directory_entry_type(const DirectoryEntryView& entry) const
{
switch (entry.file_type) {
case EXT2_FT_REG_FILE:
@ -869,7 +869,7 @@ u8 Ext2FSInode::file_type_for_directory_entry(const ext2_dir_entry_2& entry)
case EXT2_FT_FIFO:
return DT_FIFO;
case EXT2_FT_SOCK:
return EXT2_FT_SOCK;
return DT_SOCK;
case EXT2_FT_SYMLINK:
return DT_LNK;
default:
@ -899,7 +899,7 @@ KResult Ext2FSInode::traverse_as_directory(Function<bool(const FS::DirectoryEntr
#ifdef EXT2_DEBUG
dbg() << "Ext2Inode::traverse_as_directory: " << entry->inode << ", name_len: " << entry->name_len << ", rec_len: " << entry->rec_len << ", file_type: " << entry->file_type << ", name: " << String(entry->name, entry->name_len);
#endif
if (!callback({ { entry->name, entry->name_len }, { fsid(), entry->inode }, file_type_for_directory_entry(*entry) }))
if (!callback({ { entry->name, entry->name_len }, { fsid(), entry->inode }, entry->file_type }))
break;
}
entry = (ext2_dir_entry_2*)((char*)entry + entry->rec_len);