Skip to content

Commit

Permalink
fix: skip non-directories
Browse files Browse the repository at this point in the history
  • Loading branch information
Stebalien committed Apr 10, 2020
1 parent 862f534 commit 6787bc7
Showing 1 changed file with 9 additions and 13 deletions.
22 changes: 9 additions & 13 deletions flatfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -728,16 +728,20 @@ func (fs *Datastore) Query(q query.Query) (query.Results, error) {
}

func (fs *Datastore) walkTopLevel(path string, result *query.ResultBuilder) error {
dir, err := open(path)
dir, err := os.Open(path)
if err != nil {
return err
}
defer dir.Close()
names, err := dir.Readdirnames(-1)
entries, err := dir.Readdir(-1)
if err != nil {
return err
}
for _, dir := range names {
for _, entry := range entries {
if !entry.IsDir() {
continue
}
dir := entry.Name()
if len(dir) == 0 || dir[0] == '.' {
continue
}
Expand Down Expand Up @@ -1053,8 +1057,9 @@ func (fs *Datastore) tempFile() (*os.File, error) {
return file, err
}

// only call this on directories.
func (fs *Datastore) walk(path string, qrb *query.ResultBuilder) error {
dir, err := open(path)
dir, err := os.Open(path)
if err != nil {
if os.IsNotExist(err) {
// not an error if the file disappeared
Expand All @@ -1064,15 +1069,6 @@ func (fs *Datastore) walk(path string, qrb *query.ResultBuilder) error {
}
defer dir.Close()

// ignore non-directories
fileInfo, err := dir.Stat()
if err != nil {
return err
}
if !fileInfo.IsDir() {
return nil
}

names, err := dir.Readdirnames(-1)
if err != nil {
return err
Expand Down

0 comments on commit 6787bc7

Please sign in to comment.