Fix FreeBSD build with latest x/sys/unix

There was a breaking change in upstream golang.org/x/sys/unix which
changed the type of some Statvfs members, see #853. As it looks like
this change won't be reverted, adjust gopsutil to work with it and allow
to build against the latest version of x/sys/unix.
pull/895/head
Tobias Klauser 5 years ago
parent b806400ff0
commit d5eecd689d

6
Gopkg.lock generated

@ -48,16 +48,18 @@
version = "v1.6.0" version = "v1.6.0"
[[projects]] [[projects]]
digest = "1:63d8236278940f9c63816950fb4ed7fa389307c0b6367484b748f5b08dee9299" branch = "master"
digest = "1:c33af8636b2c5128b62b5bacd6fbdf6bf65a76e95b5b0111bfa134cb8ad5676d"
name = "golang.org/x/sys" name = "golang.org/x/sys"
packages = [ packages = [
"internal/unsafeheader",
"unix", "unix",
"windows", "windows",
"windows/svc", "windows/svc",
"windows/svc/mgr", "windows/svc/mgr",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "a7d97aace0b03bedead413ec782269d62e032341" revision = "ed371f2e16b4b305ee99df548828de367527b76b"
[[projects]] [[projects]]
branch = "v3" branch = "v3"

@ -34,8 +34,8 @@
version = "1.2.2" version = "1.2.2"
[[constraint]] [[constraint]]
branch = "master"
name = "golang.org/x/sys" name = "golang.org/x/sys"
revision = "a7d97aace0b03bedead413ec782269d62e032341"
[prune] [prune]
go-tests = true go-tests = true

@ -84,9 +84,9 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
} }
d := PartitionStat{ d := PartitionStat{
Device: common.IntToString(stat.Mntfromname[:]), Device: common.ByteToString(stat.Mntfromname[:]),
Mountpoint: common.IntToString(stat.Mntonname[:]), Mountpoint: common.ByteToString(stat.Mntonname[:]),
Fstype: common.IntToString(stat.Fstypename[:]), Fstype: common.ByteToString(stat.Fstypename[:]),
Opts: opts, Opts: opts,
} }
if all == false { if all == false {
@ -170,5 +170,5 @@ func parseDevstat(buf []byte) (Devstat, error) {
} }
func getFsType(stat unix.Statfs_t) string { func getFsType(stat unix.Statfs_t) string {
return common.IntToString(stat.Fstypename[:]) return common.ByteToString(stat.Fstypename[:])
} }

Loading…
Cancel
Save