From 9fe17650b80a56c6783d3280ad02e18c4bbc2910 Mon Sep 17 00:00:00 2001 From: "ds.hiveon" Date: Sat, 18 Mar 2023 07:44:18 +0100 Subject: [PATCH] fix: use correct ENODATA value on different platforms --- fuse2.go | 4 ++-- fuse3.go | 4 ++-- fuse_darwin.go | 9 +++++++++ fuse_linux.go | 3 +++ fuse_windows.go | 3 +++ go.mod | 2 +- go.sum | 2 ++ 7 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 fuse_darwin.go create mode 100644 fuse_linux.go create mode 100644 fuse_windows.go diff --git a/fuse2.go b/fuse2.go index b7e3922..8338610 100644 --- a/fuse2.go +++ b/fuse2.go @@ -100,7 +100,7 @@ func (f fileNode2) ReadAll(ctx context.Context) ([]byte, error) { _, err := f.WriteTo(&buf) return buf.Bytes(), err } - return nil, fuse.ENODATA + return nil, ENODATA } func (f fileNode2) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error { @@ -112,7 +112,7 @@ func (f fileNode2) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.R } return nil } - return fuse.ENODATA + return ENODATA } func (f fileNode2) ReadDirAll(ctx context.Context) (out []fuse.Dirent, err error) { diff --git a/fuse3.go b/fuse3.go index 4b89c50..e0b8b28 100644 --- a/fuse3.go +++ b/fuse3.go @@ -98,7 +98,7 @@ func (f fileNode) ReadAll(ctx context.Context) ([]byte, error) { _, err := f.WriteTo(&buf) return buf.Bytes(), err } - return nil, fuse.ENODATA + return nil, ENODATA } func (f fileNode) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error { @@ -110,7 +110,7 @@ func (f fileNode) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.Re } return nil } - return fuse.ENODATA + return ENODATA } func (f fileNode) ReadDirAll(ctx context.Context) (out []fuse.Dirent, err error) { diff --git a/fuse_darwin.go b/fuse_darwin.go new file mode 100644 index 0000000..2807812 --- /dev/null +++ b/fuse_darwin.go @@ -0,0 +1,9 @@ +//go:build !linux + +package squashfs + +import ( + "golang.org/x/sys/unix" +) + +var ENODATA = unix.Errno(unix.ENODATA) diff --git a/fuse_linux.go b/fuse_linux.go new file mode 100644 index 0000000..93d1c6a --- /dev/null +++ b/fuse_linux.go @@ -0,0 +1,3 @@ +package squashfs + +var ENODATA = fuse.ENODATA diff --git a/fuse_windows.go b/fuse_windows.go new file mode 100644 index 0000000..c50a696 --- /dev/null +++ b/fuse_windows.go @@ -0,0 +1,3 @@ +package squashfs + +var ENODATA = windows.Errno(windows.ENODATA) diff --git a/go.mod b/go.mod index 9289296..b820a67 100644 --- a/go.mod +++ b/go.mod @@ -13,5 +13,5 @@ require ( require ( github.com/seaweedfs/fuse v1.2.2 - golang.org/x/sys v0.2.0 // indirect + golang.org/x/sys v0.6.0 // indirect ) diff --git a/go.sum b/go.sum index d642564..861dccc 100644 --- a/go.sum +++ b/go.sum @@ -14,3 +14,5 @@ github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=