more

Signed-off-by: Adrian Cole <adrian@tetrate.io>

internal/fsapi/oflag.go

@@ -8,7 +8,7 @@ package fsapi
 //     flags can coexist bitwise.
 //   - This is like `flag` in os.OpenFile and `oflag` in POSIX. See
 //     https://pubs.opengroup.org/onlinepubs/9699919799/functions/open.html
-type Oflag uint16
+type Oflag uint32
 
 // This is a subset of oflags to reduce implementation burden. `wasip` splits
 // these across `oflags` and `fdflags`. We can't rely on the Go `os` package,

internal/sysfs/oflag_test.go

@@ -8,6 +8,9 @@ import (
 	"github.com/tetratelabs/wazero/internal/testing/require"
 )
 
+// Test_toOsOpenFlag doesn't use subtests to reduce volume of verbose output,
+// and in recognition we have tens of thousands of tests, which can hit IDE
+// limits.
 func Test_toOsOpenFlag(t *testing.T) {
 	tests := []struct {
 		name     string
@@ -27,11 +30,8 @@ func Test_toOsOpenFlag(t *testing.T) {
 		{name: "undefined", flag: 1 << 15, expected: os.O_RDONLY},
 	}
 
-	for _, tt := range tests {
-		tc := tt
-		t.Run(tc.name, func(t *testing.T) {
-			require.Equal(t, tc.expected, toOsOpenFlag(tc.flag))
-		})
+	for _, tc := range tests {
+		require.Equal(t, tc.expected, toOsOpenFlag(tc.flag), tc.name)
 	}
 
 	// Tests any supported syscall flags
@@ -45,9 +45,11 @@ func Test_toOsOpenFlag(t *testing.T) {
 		if supportedSyscallOflag&f == 0 {
 			continue
 		}
-		f := f
-		t.Run(n, func(t *testing.T) {
-			require.NotEqual(t, 0, toOsOpenFlag(f))
-		})
+		require.NotEqual(t, 0, toOsOpenFlag(f), n)
 	}
+
+	// Example of a flag that can be or'd into O_RDONLY even if not
+	// currently supported in WASI or GOOS=js
+	const O_NOATIME = fsapi.Oflag(0x40000)
+	require.Zero(t, 0, toOsOpenFlag(O_NOATIME))
 }

internal/sysfs/open_file_freebsd.go

@@ -0,0 +1,24 @@
+package sysfs
+
+import (
+	"syscall"
+
+	"github.com/tetratelabs/wazero/internal/fsapi"
+)
+
+const supportedSyscallOflag = fsapi.O_DIRECTORY | fsapi.O_NOFOLLOW | fsapi.O_NONBLOCK
+
+func withSyscallOflag(oflag fsapi.Oflag, flag int) int {
+	if oflag&fsapi.O_DIRECTORY != 0 {
+		flag |= syscall.O_DIRECTORY
+	}
+	// syscall.O_DSYNC not defined on darwin
+	if oflag&fsapi.O_NOFOLLOW != 0 {
+		flag |= syscall.O_NOFOLLOW
+	}
+	if oflag&fsapi.O_NONBLOCK != 0 {
+		flag |= syscall.O_NONBLOCK
+	}
+	// syscall.O_RSYNC not defined on darwin
+	return flag
+}

internal/sysfs/open_file_unix.go → internal/sysfs/open_file_linux.go

@@ -1,5 +1,3 @@
-//go:build linux || freebsd
-
 package sysfs
 
 import (

internal/sysfs/open_file_notwindows.go

@@ -1,4 +1,4 @@
-//go:build !windows && !js && !illumos && !solaris
+//go:build !windows
 
 package sysfs
 

internal/sysfs/open_file_unsupported.go

@@ -1,4 +1,4 @@
-//go:build !darwin && !linux && !windows && !illumos && !solaris
+//go:build !darwin && !linux && !windows && !illumos && !solaris && !freebsd
 
 package sysfs
 

internal/sysfs/sysfs_test.go

@@ -215,7 +215,7 @@ human
 	t.Run("or'd flag", func(t *testing.T) {
 		// Example of a flag that can be or'd into O_RDONLY even if not
 		// currently supported in WASI or GOOS=js
-		const O_NOATIME = fsapi.Oflag(0xF000)
+		const O_NOATIME = fsapi.Oflag(0x40000)
 
 		f, errno := testFS.OpenFile("animals.txt", fsapi.O_RDONLY|O_NOATIME, 0)
 		require.EqualErrno(t, 0, errno)