Skip to content

ext4: Report all file types in directoryEntryInfo.Type() and Info() #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vvoland wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ext4: Report all file types in directoryEntryInfo.Type() and Info() #350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions filesystem/ext4/directoryentry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,32 +184,35 @@ type directoryEntryInfo struct {
}

func (de *directoryEntryInfo) Info() (iofs.FileInfo, error) {
mode := iofs.FileMode(0)
isDir := de.directoryEntry.fileType == dirFileTypeDirectory
if isDir {
mode |= iofs.ModeDir
}
if de.inode != nil && de.inode.fileType == fileTypeSymbolicLink {
mode |= iofs.ModeSymlink
}
mode := de.Type()
return &FileInfo{
modTime: de.modifyTime,
name: de.filename,
size: int64(de.size),
isDir: isDir,
isDir: de.directoryEntry.fileType == dirFileTypeDirectory,
mode: mode,
}, nil
}

func (de *directoryEntryInfo) Type() iofs.FileMode {
mode := iofs.FileMode(0)
if de.directoryEntry.fileType == dirFileTypeDirectory {
mode |= iofs.ModeDir
}
if de.inode != nil && de.inode.fileType == fileTypeSymbolicLink {
mode |= iofs.ModeSymlink
switch de.directoryEntry.fileType {
case dirFileTypeDirectory:
return iofs.ModeDir
case dirFileTypeSymlink:
return iofs.ModeSymlink
case dirFileTypeCharacter:
return iofs.ModeDevice | iofs.ModeCharDevice
case dirFileTypeBlock:
return iofs.ModeDevice
case dirFileTypeFifo:
return iofs.ModeNamedPipe
case dirFileTypeSocket:
return iofs.ModeSocket
case dirFileTypeUnknown, dirFileTypeRegular:
return 0
default:
return 0
}
return mode
}

func (de *directoryEntryInfo) IsDir() bool {
Expand Down