Skip to content
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

fix(ext4): replaced filepath.Separator with "/" #3

Merged
merged 1 commit into from
Feb 23, 2023
Merged

fix(ext4): replaced filepath.Separator with "/" #3

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
13 changes: 7 additions & 6 deletions ext4/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ package ext4
import (
"bytes"
"encoding/binary"
"github.com/lunixbochs/struc"
"golang.org/x/xerrors"
"io"
"io/fs"
"path"
"path/filepath"
"strings"

"github.com/lunixbochs/struc"
"golang.org/x/xerrors"
)

var (
Expand Down Expand Up @@ -104,7 +105,7 @@ func (ext4 *FileSystem) readDirEntry(name string) ([]fs.DirEntry, error) {
}

var currentIno int64
dirs := strings.Split(strings.Trim(filepath.Clean(name), string(filepath.Separator)), string(filepath.Separator))
dirs := strings.Split(strings.Trim(filepath.Clean(name), "/"), "/")
if len(dirs) == 1 && dirs[0] == "." || dirs[0] == "" {
var dirEntries []fs.DirEntry
for _, fileInfo := range fileInfos {
Expand Down Expand Up @@ -257,14 +258,14 @@ func (ext4 *FileSystem) ReadDirInfo(name string) (fs.FileInfo, error) {
mode: fs.FileMode(inode.Mode),
}, nil
}
name = strings.TrimRight(name, string(filepath.Separator))
name = strings.TrimRight(name, "/")
dirs, dir := path.Split(name)
dirEntries, err := ext4.readDirEntry(dirs)
if err != nil {
return nil, xerrors.Errorf("failed to read dir entry: %w", err)
}
for _, entry := range dirEntries {
if entry.Name() == strings.Trim(dir, string(filepath.Separator)) {
if entry.Name() == strings.Trim(dir, "/") {
return entry.Info()
}
}
Expand All @@ -274,7 +275,7 @@ func (ext4 *FileSystem) ReadDirInfo(name string) (fs.FileInfo, error) {
func (ext4 *FileSystem) Open(name string) (fs.File, error) {
const op = "open"

name = strings.TrimPrefix(name, string(filepath.Separator))
name = strings.TrimPrefix(name, "/")
if !fs.ValidPath(name) {
return nil, ext4.wrapError(op, name, fs.ErrInvalid)
}
Expand Down