Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use golang.org/x/sys/unix for android and *BSD #49

Merged
merged 3 commits into from Jan 21, 2020
Merged

Use golang.org/x/sys/unix for android and *BSD #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65118e8
Re-use implementation in isatty_tcgets.go for android
tklauser Jan 21, 2020
27288b1
Use golang.org/x/sys/unix for IsTerminal on *BSD
tklauser Jan 21, 2020
6ede958
go mod tidy
tklauser Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions go.sum
View file
Open in desktop
@@ -1,6 +1,2 @@
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200107162124-548cf772de50 h1:YvQ10rzcqWXLlJZ3XCUoO25savxmscf4+SC+ZqiCHhA=
golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
23 changes: 0 additions & 23 deletions isatty_android.go
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions isatty_bsd.go
View file
Open in desktop
Expand Up @@ -3,18 +3,12 @@

package isatty

import (
"syscall"
"unsafe"
)

const ioctlReadTermios = syscall.TIOCGETA
import "golang.org/x/sys/unix"

// IsTerminal return true if the file descriptor is terminal.
func IsTerminal(fd uintptr) bool {
var termios syscall.Termios
_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
return err == 0
_, err := unix.IoctlGetTermios(int(fd), unix.TIOCGETA)
return err == nil
}

// IsCygwinTerminal return true if the file descriptor is a cygwin or msys2
Expand Down
1 change: 0 additions & 1 deletion isatty_tcgets.go
View file
Open in desktop
@@ -1,6 +1,5 @@
// +build linux aix
// +build !appengine
// +build !android

package isatty

Expand Down