diff --git a/VirtualFileSystem/Ext2FileSystem.cpp b/VirtualFileSystem/Ext2FileSystem.cpp index 9505d79114..bd93233db6 100644 --- a/VirtualFileSystem/Ext2FileSystem.cpp +++ b/VirtualFileSystem/Ext2FileSystem.cpp @@ -390,8 +390,8 @@ bool Ext2FileSystem::enumerateDirectoryInode(InodeIdentifier inode, std::functio if (entry->inode != 0) { memcpy(namebuf, entry->name, entry->name_len); namebuf[entry->name_len] = 0; -#ifdef EXT2_DEBUG - printf("inode: %u, name_len: %u, rec_len: %u, name: %s\n", entry->inode, entry->name_len, entry->rec_len, namebuf); +#ifndef EXT2_DEBUG + printf("inode: %u, name_len: %u, rec_len: %u, file_type: %u, name: %s\n", entry->inode, entry->name_len, entry->rec_len, entry->file_type, namebuf); #endif if (!callback({ namebuf, { id(), entry->inode }, entry->file_type })) break; @@ -401,7 +401,7 @@ bool Ext2FileSystem::enumerateDirectoryInode(InodeIdentifier inode, std::functio return true; } -bool Ext2FileSystem::addInodeToDirectory(unsigned directoryInode, unsigned inode, const String& name) +bool Ext2FileSystem::addInodeToDirectory(unsigned directoryInode, unsigned inode, const String& name, byte fileType) { auto e2inodeForDirectory = lookupExt2Inode(directoryInode); ASSERT(e2inodeForDirectory); @@ -426,7 +426,7 @@ bool Ext2FileSystem::addInodeToDirectory(unsigned directoryInode, unsigned inode return false; } - entries.append({ name, { id(), inode } }); + entries.append({ name, { id(), inode }, fileType }); return writeDirectoryInode(directoryInode, std::move(entries)); } @@ -502,6 +502,7 @@ bool Ext2FileSystem::writeDirectoryInode(unsigned directoryInode, Vector void traverseInodeBitmap(unsigned groupIndex, F) const; - bool addInodeToDirectory(unsigned directoryInode, unsigned inode, const String& name); + bool addInodeToDirectory(unsigned directoryInode, unsigned inode, const String& name, byte fileType); bool writeDirectoryInode(unsigned directoryInode, Vector&&); bool setInodeAllocationState(unsigned inode, bool);