diff --git a/fuse2.go b/fuse2.go index 68dee34..ba342b2 100644 --- a/fuse2.go +++ b/fuse2.go @@ -114,11 +114,11 @@ func (f fileNode2) Readlink(ctx context.Context, req *fuse.ReadlinkRequest) (str } func (f fileNode2) Lookup(ctx context.Context, name string) (fs.Node, error) { - asFS, err := f.ToDir(f.r) + asFS, err := f.ToDir(*f.r) if err != nil { return nil, fuse.ENOTDIR } - ret, err := asFS.Open(f.r, name) + ret, err := asFS.Open(*f.r, name) if err != nil { return nil, fuse.ENOENT } @@ -156,7 +156,7 @@ func (f fileNode2) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.R } func (f fileNode2) ReadDirAll(ctx context.Context) (out []fuse.Dirent, err error) { - asFS, err := f.ToDir(f.r) + asFS, err := f.ToDir(*f.r) if err != nil { return nil, fuse.ENOTDIR } diff --git a/fuse3.go b/fuse3.go index 50455f8..dfbcc47 100644 --- a/fuse3.go +++ b/fuse3.go @@ -114,11 +114,11 @@ func (f fileNode) Readlink(ctx context.Context, req *fuse.ReadlinkRequest) (stri } func (f fileNode) Lookup(ctx context.Context, name string) (fs.Node, error) { - asFS, err := f.ToDir(f.r) + asFS, err := f.ToDir(*f.r) if err != nil { return nil, fuse.ENOTDIR } - ret, err := asFS.Open(f.r, name) + ret, err := asFS.Open(*f.r, name) if err != nil { return nil, fuse.ENOENT } diff --git a/go.mod b/go.mod index 4ab862f..be59723 100644 --- a/go.mod +++ b/go.mod @@ -1,17 +1,19 @@ module github.com/CalebQ42/squashfuse -go 1.22.5 +go 1.24.0 + +toolchain go1.24.3 require ( github.com/CalebQ42/fuse v0.1.0 - github.com/CalebQ42/squashfs v1.0.1 + github.com/CalebQ42/squashfs v1.3.0 github.com/seaweedfs/fuse v1.2.3 - golang.org/x/sys v0.22.0 + golang.org/x/sys v0.33.0 ) require ( - github.com/klauspost/compress v1.17.9 // indirect - github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e // indirect github.com/therootcompany/xz v1.0.1 // indirect github.com/ulikunitz/xz v0.5.12 // indirect diff --git a/go.sum b/go.sum index 76687c1..75bdd76 100644 --- a/go.sum +++ b/go.sum @@ -2,10 +2,16 @@ github.com/CalebQ42/fuse v0.1.0 h1:KLCNjun7zcd2kBNVFfH+SWJyhuwJdE0nhw5/q8K8HGQ= github.com/CalebQ42/fuse v0.1.0/go.mod h1:pJpoKG03HJKVhsp8o0YQYqmfbFsr3Eowt90yQGQVO+4= github.com/CalebQ42/squashfs v1.0.1 h1:5FonyiIDn0RMc16Lp+bfjYBmGCVHNhQWDE2bS28PV1A= github.com/CalebQ42/squashfs v1.0.1/go.mod h1:uhKIQfq2+dgJ+utqCkvVk0t7XuqaNhcotCrqSI0wUuI= +github.com/CalebQ42/squashfs v1.3.0 h1:KFDkyn46d3i0JO5EarhHKpO9Pm/Bv4bHvCreHdAit9Q= +github.com/CalebQ42/squashfs v1.3.0/go.mod h1:48nUwPN4mjeWhu3It2LJZAq4EkixbzY4pdyZ7gEfHb8= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e h1:dCWirM5F3wMY+cmRda/B1BiPsFtmzXqV9b0hLWtVBMs= github.com/rasky/go-lzo v0.0.0-20200203143853-96a758eda86e/go.mod h1:9leZcVcItj6m9/CfHY5Em/iBrCz7js8LcRQGTKEEv2M= github.com/seaweedfs/fuse v1.2.3 h1:VH4VF9D3yvuQBILqDbNttz7Whjgo3JBLfpZeecmYfm0= @@ -16,3 +22,5 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=