Bump x/sys/unix

A newer version of x/sys/unix updates the OpenBSD bindings which makes the `int8SliceToString` helper function obsolete. This change updates the x/sys/unix version
moby · Jun 5, 2022 · c875a63 · c875a63
1 parent ad57f78
commit c875a63
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 37 deletions.
diff --git a/mountinfo/go.mod b/mountinfo/go.mod
@@ -2,4 +2,4 @@ module github.com/moby/sys/mountinfo
 
 go 1.16
 
-require golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
+require golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
diff --git a/mountinfo/go.sum b/mountinfo/go.sum
@@ -1,2 +1,4 @@
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
 golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/mountinfo/mountinfo_bsd.go b/mountinfo/mountinfo_bsd.go
@@ -54,3 +54,11 @@ func mounted(path string) (bool, error) {
 	// Fallback to parsing mountinfo
 	return mountedByMountinfo(path)
 }
+
+func getMountinfo(entry *unix.Statfs_t) *Info {
+	var mountinfo Info
+	mountinfo.Mountpoint = unix.ByteSliceToString(entry.Mntonname[:])
+	mountinfo.FSType = unix.ByteSliceToString(entry.Fstypename[:])
+	mountinfo.Source = unix.ByteSliceToString(entry.Mntfromname[:])
+	return &mountinfo
+}
diff --git a/mountinfo/mountinfo_freebsdlike.go b/mountinfo/mountinfo_freebsdlike.go
diff --git a/mountinfo/mountinfo_openbsd.go b/mountinfo/mountinfo_openbsd.go