updated vendor
This commit is contained in:
+9
-8
@@ -7,7 +7,6 @@ import (
|
||||
|
||||
"github.com/tetratelabs/wazero/experimental/sys"
|
||||
"github.com/tetratelabs/wazero/internal/descriptor"
|
||||
"github.com/tetratelabs/wazero/internal/fsapi"
|
||||
socketapi "github.com/tetratelabs/wazero/internal/sock"
|
||||
"github.com/tetratelabs/wazero/internal/sysfs"
|
||||
)
|
||||
@@ -51,7 +50,7 @@ type FileEntry struct {
|
||||
FS sys.FS
|
||||
|
||||
// File is always non-nil.
|
||||
File fsapi.File
|
||||
File sys.File
|
||||
|
||||
// direntCache is nil until DirentCache was called.
|
||||
direntCache *DirentCache
|
||||
@@ -272,7 +271,7 @@ func (c *FSContext) OpenFile(fs sys.FS, path string, flag sys.Oflag, perm fs.Fil
|
||||
if f, errno := fs.OpenFile(path, flag, perm); errno != 0 {
|
||||
return 0, errno
|
||||
} else {
|
||||
fe := &FileEntry{FS: fs, File: fsapi.Adapt(f)}
|
||||
fe := &FileEntry{FS: fs, File: f}
|
||||
if path == "/" || path == "." {
|
||||
fe.Name = ""
|
||||
} else {
|
||||
@@ -329,12 +328,14 @@ func (c *FSContext) SockAccept(sockFD int32, nonblock bool) (int32, sys.Errno) {
|
||||
return 0, errno
|
||||
}
|
||||
|
||||
fe := &FileEntry{File: fsapi.Adapt(conn)}
|
||||
fe := &FileEntry{File: conn}
|
||||
|
||||
if nonblock {
|
||||
if errno = fe.File.SetNonblock(true); errno != 0 {
|
||||
_ = conn.Close()
|
||||
return 0, errno
|
||||
if pf, ok := fe.File.(sys.PollableFile); ok {
|
||||
if errno = pf.SetNonblock(true); errno != 0 {
|
||||
_ = conn.Close()
|
||||
return 0, errno
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -412,7 +413,7 @@ func (c *Context) InitFSContext(
|
||||
}
|
||||
|
||||
for _, tl := range tcpListeners {
|
||||
c.fsc.openedFiles.Insert(&FileEntry{IsPreopen: true, File: fsapi.Adapt(sysfs.NewTCPListenerFile(tl))})
|
||||
c.fsc.openedFiles.Insert(&FileEntry{IsPreopen: true, File: sysfs.NewTCPListenerFile(tl)})
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user