Add support for OpenBSD in addition to FreeBSD

thaJeztah · thaJeztah · commit cb807b1e4cf0 · 2020-10-01T23:46:31.000+02:00
I am looking at using these modules in containerd, so that we can reduce the effort of maintaining "mountinfo" implementations. The containerd variant of this module currently supports OpenBSD in addition to FreeBSD. This patch bring in changes similar to the ones made in containerd in: containerd/containerd@0828b7a Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 PACKAGES ?= mountinfo mount
 BINDIR ?= _build/bin
 CROSS ?= linux/arm linux/arm64 linux/ppc64le linux/s390x \
-	freebsd/amd64 darwin/amd64 darwin/arm64 windows/amd64
+	freebsd/amd64 openbsd/amd64 darwin/amd64 darwin/arm64 windows/amd64
 
 .PHONY: all
 all: lint test cross
diff --git a/mount/flags_bsd.go b/mount/flags_bsd.go
@@ -1,4 +1,4 @@
-// +build freebsd
+// +build freebsd openbsd
 
 package mount
 
diff --git a/mount/mount_unix_test.go b/mount/mount_unix_test.go
@@ -1,4 +1,4 @@
-// +build !windows,!darwin
+// +build !darwin,!windows
 
 package mount
 
diff --git a/mount/mounter_bsd.go b/mount/mounter_bsd.go
@@ -1,4 +1,4 @@
-// +build freebsd cgo
+// +build freebsd,cgo openbsd,cgo
 
 package mount
 
diff --git a/mount/mounter_linux_test.go b/mount/mounter_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package mount
 
 import (
diff --git a/mount/mounter_unsupported.go b/mount/mounter_unsupported.go
@@ -1,7 +1,7 @@
-// +build freebsd,!cgo
+// +build !linux,!freebsd,!openbsd,!windows freebsd,!cgo openbsd,!cgo
 
 package mount
 
 func mount(device, target, mType string, flag uintptr, data string) error {
-	panic("cgo required on freebsd")
+	panic("cgo required on freebsd and openbsd")
 }
diff --git a/mount/sharedsubtree_linux_test.go b/mount/sharedsubtree_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package mount
 
 import (
diff --git a/mountinfo/doc.go b/mountinfo/doc.go
@@ -1,6 +1,6 @@
 // Package mountinfo provides a set of functions to retrieve information about OS mounts.
 //
-// Currently it supports Linux. For historical reasons, there is also some support for FreeBSD,
+// Currently it supports Linux. For historical reasons, there is also some support for FreeBSD and OpenBSD,
 // and a shallow implementation for Windows, but in general this is Linux-only package, so
 // the rest of the document only applies to Linux, unless explicitly specified otherwise.
 //
diff --git a/mountinfo/mounted_unix.go b/mountinfo/mounted_unix.go
@@ -1,4 +1,4 @@
-// +build linux freebsd,cgo
+// +build linux freebsd,cgo openbsd,cgo
 
 package mountinfo
 
diff --git a/mountinfo/mountinfo_bsd.go b/mountinfo/mountinfo_bsd.go
@@ -1,3 +1,5 @@
+// +build freebsd,cgo openbsd,cgo
+
 package mountinfo
 
 /*
@@ -54,7 +56,7 @@ func parseMountTable(filter FilterFunc) ([]*Info, error) {
 
 func mounted(path string) (bool, error) {
 	// Fast path: compare st.st_dev fields.
-	// This should always work for FreeBSD.
+	// This should always work for FreeBSD and OpenBSD.
 	mounted, err := mountedByStat(path)
 	if err == nil {
 		return mounted, nil
diff --git a/mountinfo/mountinfo_linux.go b/mountinfo/mountinfo_linux.go
@@ -1,5 +1,3 @@
-// +build go1.13
-
 package mountinfo
 
 import (
diff --git a/mountinfo/mountinfo_linux_test.go b/mountinfo/mountinfo_linux_test.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package mountinfo
 
 import (
diff --git a/mountinfo/mountinfo_unsupported.go b/mountinfo/mountinfo_unsupported.go
@@ -1,4 +1,4 @@
-// +build !windows,!linux,!freebsd freebsd,!cgo
+// +build !windows,!linux,!freebsd,!openbsd freebsd,!cgo openbsd,!cgo
 
 package mountinfo
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build freebsd`
	`1`	`+// +build freebsd openbsd`
`2`	`2`
`3`	`3`	`package mount`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !windows,!darwin`
	`1`	`+// +build !darwin,!windows`
`2`	`2`
`3`	`3`	`package mount`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build freebsd cgo`
	`1`	`+// +build freebsd,cgo openbsd,cgo`
`2`	`2`
`3`	`3`	`package mount`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build linux`
`2`		`-`
`3`	`1`	`package mount`
`4`	`2`
`5`	`3`	`import (`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-// +build freebsd,!cgo`
	`1`	`+// +build !linux,!freebsd,!openbsd,!windows freebsd,!cgo openbsd,!cgo`
`2`	`2`
`3`	`3`	`package mount`
`4`	`4`
`5`	`5`	`func mount(device, target, mType string, flag uintptr, data string) error {`
`6`		`- panic("cgo required on freebsd")`
	`6`	`+ panic("cgo required on freebsd and openbsd")`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build linux freebsd,cgo`
	`1`	`+// +build linux freebsd,cgo openbsd,cgo`
`2`	`2`
`3`	`3`	`package mountinfo`
`4`	`4`