Skip to content

Commit eb20e67

Browse files
authored
Merge pull request #137 from tryggvil/master
Implementing default getOSFileInfo implementation
2 parents 7a961c1 + 3326b41 commit eb20e67

File tree

4 files changed

+40
-3
lines changed

4 files changed

+40
-3
lines changed

file/file_other.go

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//go:build !windows && !darwin && !dragonfly && !freebsd && !linux && !nacl && !netbsd && !openbsd && !solaris && !wasm
2+
3+
package file
4+
5+
import (
6+
"os"
7+
)
8+
9+
func getOSFileInfo(_ os.FileInfo) *FileInfo {
10+
return nil
11+
}

file/file_wasm.go

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//go:build wasm
2+
3+
package file
4+
5+
import (
6+
"os"
7+
"syscall"
8+
)
9+
10+
func getOSFileInfo(info os.FileInfo) *FileInfo {
11+
fi := &FileInfo{}
12+
if s, ok := info.Sys().(*syscall.Stat_t); ok {
13+
fi.Nlink = uint32(s.Nlink)
14+
fi.UID = s.Uid
15+
fi.GID = s.Gid
16+
fi.Fileid = s.Ino
17+
return fi
18+
}
19+
return nil
20+
}

go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ module github.com/willscott/go-nfs
33
go 1.19
44

55
require (
6-
github.com/go-git/go-billy/v5 v5.5.0
6+
github.com/go-git/go-billy/v5 v5.6.0
77
github.com/google/uuid v1.6.0
88
github.com/hashicorp/golang-lru/v2 v2.0.7
99
github.com/rasky/go-xdr v0.0.0-20170124162913-1a41d1a06c93
1010
github.com/willscott/go-nfs-client v0.0.0-20240104095149-b44639837b00
1111
github.com/willscott/memphis v0.0.0-20210922141505-529d4987ab7e
12-
golang.org/x/sys v0.16.0
12+
golang.org/x/sys v0.24.0
1313
)
1414

1515
require (
16-
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
16+
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
1717
github.com/polydawn/go-timeless-api v0.0.0-20220821201550-b93919e12c56 // indirect
1818
github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e // indirect
1919
github.com/polydawn/rio v0.0.0-20220823181337-7c31ad9831a4 // indirect

go.sum

+6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
22
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
33
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
4+
github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
5+
github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
46
github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
57
github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
68
github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
9+
github.com/go-git/go-billy/v5 v5.6.0 h1:w2hPNtoehvJIxR00Vb4xX94qHQi/ApZfX+nBE2Cjio8=
10+
github.com/go-git/go-billy/v5 v5.6.0/go.mod h1:sFDq7xD3fn3E0GOwUSZqHo9lrkmx8xJhA0ZrfvjBRGM=
711
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
812
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
913
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -51,6 +55,8 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
5155
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5256
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
5357
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
58+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
59+
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
5460
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5561
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
5662
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=

0 commit comments

Comments
 (0)