github/creack.pty
2
0
Fork 0
mirror of https://github.com/creack/pty.git synced 2026-04-01 11:07:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26 from yoheiueda/use-syscall-consts

Browse Source 
Use syscall.TIOCGPTN and syscall.TIOCSPTLCK for ioctl
This commit is contained in:
Guillaume J. Charmes
2014-12-17 16:19:37 -05:00
parent 53dd597300 9cf8a72e81
commit 05017fcccf
2 changed files with 2 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ioctl_linux.go
View File

@@ -1,42 +0,0 @@
package pty
// from <asm-generic/ioctl.h>
const (
_IOC_NRBITS = 8
_IOC_TYPEBITS = 8
_IOC_SIZEBITS = 14
_IOC_DIRBITS = 2
_IOC_NRSHIFT = 0
_IOC_TYPESHIFT = _IOC_NRSHIFT + _IOC_NRBITS
_IOC_SIZESHIFT = _IOC_TYPESHIFT + _IOC_TYPEBITS
_IOC_DIRSHIFT = _IOC_SIZESHIFT + _IOC_SIZEBITS
_IOC_NONE uint = 0
_IOC_WRITE uint = 1
_IOC_READ uint = 2
)
func _IOC(dir uint, ioctl_type byte, nr byte, size uintptr) uintptr {
return (uintptr(dir)<<_IOC_DIRSHIFT |
uintptr(ioctl_type)<<_IOC_TYPESHIFT |
uintptr(nr)<<_IOC_NRSHIFT |
size<<_IOC_SIZESHIFT)
}
func _IO(ioctl_type byte, nr byte) uintptr {
return _IOC(_IOC_NONE, ioctl_type, nr, 0)
}
func _IOR(ioctl_type byte, nr byte, size uintptr) uintptr {
return _IOC(_IOC_READ, ioctl_type, nr, size)
}
func _IOW(ioctl_type byte, nr byte, size uintptr) uintptr {
return _IOC(_IOC_WRITE, ioctl_type, nr, size)
}
func _IOWR(ioctl_type byte, nr byte, size uintptr) uintptr {
return _IOC(_IOC_READ|_IOC_WRITE, ioctl_type, nr, size)
}

9
pty_linux.go
View File

@@ -7,11 +7,6 @@ import (
"unsafe"
)
var (
ioctl_TIOCGPTN = _IOR('T', 0x30, unsafe.Sizeof(_C_uint(0))) /* Get Pty Number (of pty-mux device) */
ioctl_TIOCSPTLCK = _IOW('T', 0x31, unsafe.Sizeof(_C_int(0))) /* Lock/unlock Pty */
)
func open() (pty, tty *os.File, err error) {
p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0)
if err != nil {
@@ -37,7 +32,7 @@ func open() (pty, tty *os.File, err error) {
func ptsname(f *os.File) (string, error) {
var n _C_uint
err := ioctl(f.Fd(), ioctl_TIOCGPTN, uintptr(unsafe.Pointer(&n)))
err := ioctl(f.Fd(), syscall.TIOCGPTN, uintptr(unsafe.Pointer(&n)))
if err != nil {
return "", err
}
@@ -47,5 +42,5 @@ func ptsname(f *os.File) (string, error) {
func unlockpt(f *os.File) error {
var u _C_int
// use TIOCSPTLCK with a zero valued arg to clear the slave pty lock
return ioctl(f.Fd(), ioctl_TIOCSPTLCK, uintptr(unsafe.Pointer(&u)))
return ioctl(f.Fd(), syscall.TIOCSPTLCK, uintptr(unsafe.Pointer(&u)))
}