From 6f20672f0501f9c6ecd7c2cb4152b5b12cf67216 Mon Sep 17 00:00:00 2001 From: Caleb Gardner Date: Wed, 17 Jul 2024 09:34:36 -0500 Subject: [PATCH] Update libraries --- fuse2.go | 6 +++--- fuse3.go | 6 +++--- go.mod | 12 ++++++------ go.sum | 26 ++++++++++---------------- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/fuse2.go b/fuse2.go index 4140704..68dee34 100644 --- a/fuse2.go +++ b/fuse2.go @@ -20,7 +20,7 @@ type Fuse2Mount struct { } func NewFuse2Mount(r *squashfs.Reader) *Mount { - return NewMountFromLow(r.Low) + return NewMountFromLow(&r.Low) } func NewFuse2MountFromLow(r *squashfslow.Reader) *Mount { @@ -68,13 +68,13 @@ type squashFuse2 struct { func (s squashFuse2) Root() (fs.Node, error) { return fileNode2{ - FileBase: &s.r.Root.FileBase, + FileBase: s.r.Root.FileBase, r: s.r, }, nil } type fileNode2 struct { - *squashfslow.FileBase + squashfslow.FileBase r *squashfslow.Reader } diff --git a/fuse3.go b/fuse3.go index 3977d59..50455f8 100644 --- a/fuse3.go +++ b/fuse3.go @@ -20,7 +20,7 @@ type Mount struct { } func NewMount(r *squashfs.Reader) *Mount { - return NewMountFromLow(r.Low) + return NewMountFromLow(&r.Low) } func NewMountFromLow(r *squashfslow.Reader) *Mount { @@ -68,13 +68,13 @@ type squashFuse struct { func (s squashFuse) Root() (fs.Node, error) { return fileNode{ - FileBase: &s.r.Root.FileBase, + FileBase: s.r.Root.FileBase, r: s.r, }, nil } type fileNode struct { - *squashfslow.FileBase + squashfslow.FileBase r *squashfslow.Reader } diff --git a/go.mod b/go.mod index 8ef7cc3..4ab862f 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,18 @@ module github.com/CalebQ42/squashfuse -go 1.21.5 +go 1.22.5 require ( github.com/CalebQ42/fuse v0.1.0 - github.com/CalebQ42/squashfs v1.0.0 + github.com/CalebQ42/squashfs v1.0.1 github.com/seaweedfs/fuse v1.2.3 - golang.org/x/sys v0.15.0 + golang.org/x/sys v0.22.0 ) require ( - github.com/klauspost/compress v1.17.4 // indirect - github.com/pierrec/lz4/v4 v4.1.19 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // 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.11 // indirect + github.com/ulikunitz/xz v0.5.12 // indirect ) diff --git a/go.sum b/go.sum index 4851ff9..76687c1 100644 --- a/go.sum +++ b/go.sum @@ -1,24 +1,18 @@ 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 v0.8.4 h1:HnthgRKuLliiMwYsPTSE/ln2zECt7UelYcbsUc5p+PA= -github.com/CalebQ42/squashfs v0.8.4/go.mod h1:CmGHRknB7BlYJ49qSTGpW8wnFcGFdZW0l6+qHOvFr5c= -github.com/CalebQ42/squashfs v1.0.0 h1:ySUquFi/JBPlgHUOyPKWCiyN1QRMxKNZ7pvlcF0qwIw= -github.com/CalebQ42/squashfs v1.0.0/go.mod h1:Lhk1cmcuR2/AZLQ8dE99iCen1MC06wICfy9o3o5h8qM= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4= -github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +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/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +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/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= github.com/seaweedfs/fuse v1.2.3/go.mod h1:iwbDQv5BZACY54r6AO/6xsLNuMaYcBKSkLTZVfmK594= github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw= github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY= -github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= -github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +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=