mount: remove Windows stubs

thaJeztah · thaJeztah · commit 7a521626bc89 · 2020-10-01T18:34:43.000+02:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/mount/doc.go b/mount/doc.go
@@ -0,0 +1,5 @@
+// Package mount provides a set of functions to mount and unmount mounts.
+//
+// Currently it supports Linux. For historical reasons, there is also some support for FreeBSD.
+
+package mount
diff --git a/mount/flags_unix.go b/mount/flags_unix.go
@@ -1,3 +1,5 @@
+// +build !darwin,!windows
+
 package mount
 
 import (
diff --git a/mount/flags_unsupported.go b/mount/flags_unsupported.go
diff --git a/mount/mount.go b/mount/mount.go
diff --git a/mount/mount_unix.go b/mount/mount_unix.go
@@ -1,4 +1,4 @@
-// +build !windows
+// +build !darwin,!windows
 
 package mount
 
@@ -10,7 +10,37 @@ import (
 	"golang.org/x/sys/unix"
 )
 
-func recursiveUnmount(target string) error {
+// Mount will mount filesystem according to the specified configuration.
+// Options must be specified like the mount or fstab unix commands:
+// "opt1=val1,opt2=val2". See flags.go for supported option flags.
+func Mount(device, target, mType, options string) error {
+	flag, data := parseOptions(options)
+	return mount(device, target, mType, uintptr(flag), data)
+}
+
+// Unmount lazily unmounts a filesystem on supported platforms, otherwise does
+// a normal unmount. If target is not a mount point, no error is returned.
+func Unmount(target string) error {
+	err := unix.Unmount(target, mntDetach)
+	if err == nil || err == unix.EINVAL {
+		// Ignore "not mounted" error here. Note the same error
+		// can be returned if flags are invalid, so this code
+		// assumes that the flags value is always correct.
+		return nil
+	}
+
+	return &mountError{
+		op:     "umount",
+		target: target,
+		flags:  uintptr(mntDetach),
+		err:    err,
+	}
+}
+
+// RecursiveUnmount unmounts the target and all mounts underneath, starting
+// with the deepest mount first. The argument does not have to be a mount
+// point itself.
+func RecursiveUnmount(target string) error {
 	// Fast path, works if target is a mount point that can be unmounted.
 	// On Linux, mntDetach flag ensures a recursive unmount.  For other
 	// platforms, if there are submounts, we'll get EBUSY (and fall back
@@ -33,7 +63,7 @@ func recursiveUnmount(target string) error {
 
 	var suberr error
 	for i, m := range mounts {
-		err = unmount(m.Mountpoint, mntDetach)
+		err = Unmount(m.Mountpoint)
 		if err != nil {
 			if i == len(mounts)-1 { // last mount
 				return fmt.Errorf("%w (possible cause: %s)", err, suberr)
@@ -49,20 +79,3 @@ func recursiveUnmount(target string) error {
 	}
 	return nil
 }
-
-func unmount(target string, flags int) error {
-	err := unix.Unmount(target, flags)
-	if err == nil || err == unix.EINVAL {
-		// Ignore "not mounted" error here. Note the same error
-		// can be returned if flags are invalid, so this code
-		// assumes that the flags value is always correct.
-		return nil
-	}
-
-	return &mountError{
-		op:     "umount",
-		target: target,
-		flags:  uintptr(flags),
-		err:    err,
-	}
-}
diff --git a/mount/mounter_freebsd.go b/mount/mounter_freebsd.go
@@ -1,3 +1,5 @@
+// +build freebsd cgo
+
 package mount
 
 /*
diff --git a/mount/mounter_unsupported.go b/mount/mounter_unsupported.go
@@ -1,7 +1,7 @@
-// +build !linux,!freebsd freebsd,!cgo
+// +build freebsd,!cgo
 
 package mount
 
 func mount(device, target, mType string, flag uintptr, data string) error {
-	panic("Not implemented")
+	panic("cgo required on freebsd")
 }
diff --git a/mount/sharedsubtree_linux_test.go b/mount/sharedsubtree_linux_test.go
@@ -1,4 +1,4 @@
-// +build linux,go1.13
+// +build linux
 
 package mount
 
diff --git a/mount/unmount_unsupported.go b/mount/unmount_unsupported.go

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