Merge pull request #9 from jarxorg/fix-readdirfile

Fix readdirfile

memfs/memfs.go

@@ -330,15 +330,12 @@ func (f *MemFile) ReadDir(n int) ([]fs.DirEntry, error) {
 	}
 	max := len(f.dirEntries)
 	if f.dirIndex >= max {
-		if n == -1 {
+		if n <= 0 {
 			return nil, nil
 		}
 		return nil, io.EOF
 	}
-	if n == 0 {
-		return nil, nil
-	}
-	if n == -1 {
+	if n <= 0 {
 		n = max - f.dirIndex
 	}
 	end := f.dirIndex + n

memfs/memfs_test.go

@@ -513,26 +513,3 @@ func TestMemFile_ReadDir_Errors(t *testing.T) {
 		t.Fatalf(`Fatal ReadDir(1) returns no error`)
 	}
 }
-
-func TestMemFile_ReadDir0(t *testing.T) {
-	fsys := newMemFSTest(t)
-	dir := "dir0"
-
-	f, err := fsys.Open(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	memf, ok := f.(*MemFile)
-	if !ok {
-		t.Fatalf(`Fatal not MemFile: %#v`, f)
-	}
-
-	entries, err := memf.ReadDir(0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(entries) != 0 {
-		t.Errorf(`Error ReadDir(0) returns unknown entries %v`, entries)
-	}
-}

memfs/store.go

@@ -23,39 +23,39 @@ var (
 	_ fs.FileInfo = (*value)(nil)
 )
 
-func (e *value) Name() string {
-	return filepath.Base(e.name)
+func (v *value) Name() string {
+	return filepath.Base(v.name)
 }
 
-func (e *value) Size() int64 {
-	if e.isDir {
+func (v *value) Size() int64 {
+	if v.isDir {
 		return 0
 	}
-	return int64(len(e.data))
+	return int64(len(v.data))
 }
 
-func (e *value) Mode() fs.FileMode {
-	return e.mode
+func (v *value) Mode() fs.FileMode {
+	return v.mode
 }
 
-func (e *value) ModTime() time.Time {
-	return e.modTime
+func (v *value) ModTime() time.Time {
+	return v.modTime
 }
 
-func (e *value) IsDir() bool {
-	return e.isDir
+func (v *value) IsDir() bool {
+	return v.isDir
 }
 
-func (e *value) Sys() interface{} {
+func (v *value) Sys() interface{} {
 	return nil
 }
 
-func (e *value) Type() fs.FileMode {
-	return e.mode
+func (v *value) Type() fs.FileMode {
+	return v.mode
 }
 
-func (e *value) Info() (fs.FileInfo, error) {
-	return e, nil
+func (v *value) Info() (fs.FileInfo, error) {
+	return v, nil
 }
 
 // Store represents an in-memory key value store.