lib9p

commit 636881b7983578057ccfead299d54e4debbd6cef
parent 1a3299df70e83e31896210af3cb685ce9f0c5c8c
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Sun,  5 Nov 2023 07:48:45 +0900

update ReadDir

Diffstat:
M
diskfs/file.go
 | 
4
++--
M
iofs/file.go
 | 
13
+++----------

2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/diskfs/file.go b/diskfs/file.go
@@ -125,12 +125,12 @@ func (f *File) ReadAt(p []byte, off int64) (int, error) {
 // to the end of the directory), it returns the slice and a nil error.
 // If it encounters an error before the end of the directory,
 // ReadDir returns the DirEntry list read until that point and a non-nil error.
-func (f *File) ReadDir(n int) ([]*lib9p.DirEntry, error) {
+func (f *File) ReadDir(n int) ([]fs.DirEntry, error) {
 	osde, err := f.file.ReadDir(n)
 	if err != nil {
 		return nil, fmt.Errorf("readdir: %v", err)
 	}
-	de := make([]*lib9p.DirEntry, len(osde))
+	de := make([]fs.DirEntry, len(osde))
 	for i, e := range osde {
 		fi, err := e.Info()
 		if err != nil {
diff --git a/iofs/file.go b/iofs/file.go
@@ -2,7 +2,7 @@ package iofs
 
 import (
 	"fmt"
-	"io"
+//	"io"
 	"io/fs"
 	"path"
 
@@ -59,14 +59,7 @@ func (f *File) Read(b []byte) (int, error) {
 	return f.file.Read(b)
 }
 
-func (f *File) ReadAt(p []byte, off int64) (int, error) {
-	if reader, ok := f.file.(io.ReaderAt); ok {
-		return reader.ReadAt(p, off)
-	}
-	return f.file.Read(p) // TODO: seek??
-}
-
-func (f *File) ReadDir(n int) ([]*lib9p.DirEntry, error) {
+func (f *File) ReadDir(n int) ([]fs.DirEntry, error) {
 	dir, ok := f.file.(fs.ReadDirFile)
 	if !ok {
 		return nil, fmt.Errorf("not a directory")
@@ -75,7 +68,7 @@ func (f *File) ReadDir(n int) ([]*lib9p.DirEntry, error) {
 	if err != nil {
 		return nil, err
 	}
-	de := make([]*lib9p.DirEntry, len(fsde))
+	de := make([]fs.DirEntry, len(fsde))
 	for i, e := range fsde {
 		id := fileID(path.Join(f.path, e.Name()))
 		info, err := e.Info()