Use x/sys/unix rather than syscall. (#124)

This makes our code more portable, and avoids the annoyance with Select returning a different number of arguments as per the following golang bug report: * golang/go#34458
skx · Jun 19, 2024 · 0da3ab3 · 0da3ab3
1 parent f690c15
commit 0da3ab3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 123 deletions.
diff --git a/consolein/select_darwin.go b/consolein/select_darwin.go
diff --git a/consolein/select_freebsd.go b/consolein/select_freebsd.go
diff --git a/consolein/select_netbsd.go b/consolein/select_netbsd.go
diff --git a/consolein/select_openbsd.go b/consolein/select_openbsd.go
diff --git a/consolein/select_linux.go → consolein/select_unix.go b/consolein/select_linux.go → consolein/select_unix.go
@@ -1,23 +1,25 @@
-//go:build linux
+//go:build unix
 
 package consolein
 
 import (
 	"os"
-	"syscall"
+
+	"golang.org/x/sys/unix"
 )
 
 // canSelect contains a platform-specific implementation of code that tries to use
 // SELECT to read from STDIN.
 func canSelect() bool {
 
-	var readfds syscall.FdSet
-
-	fd := os.Stdin.Fd()
-	readfds.Bits[fd/64] |= 1 << (fd % 64)
+	fds := &unix.FdSet{}
+	fds.Set(int(os.Stdin.Fd()))
 
 	// See if input is pending, for a while.
-	nRead, err := syscall.Select(1, &readfds, nil, nil, &syscall.Timeval{Usec: 200})
+	tv := unix.Timeval{Usec: 200}
+
+	// via select with timeout
+	nRead, err := unix.Select(1, fds, nil, nil, &tv)
 	if err != nil {
 		return false
 	}