|
|
@@ -13,25 +13,21 @@ const (
|
|
|
cmdTcSet = unix.TCSETS
|
|
|
)
|
|
|
|
|
|
-func ioctl(fd, flag, data uintptr) error {
|
|
|
- if _, _, err := unix.Syscall(unix.SYS_IOCTL, fd, flag, data); err != 0 {
|
|
|
- return err
|
|
|
- }
|
|
|
- return nil
|
|
|
-}
|
|
|
-
|
|
|
// unlockpt unlocks the slave pseudoterminal device corresponding to the master pseudoterminal referred to by f.
|
|
|
// unlockpt should be called before opening the slave side of a pty.
|
|
|
func unlockpt(f *os.File) error {
|
|
|
var u int32
|
|
|
- return ioctl(f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u)))
|
|
|
+ if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))); err != 0 {
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ return nil
|
|
|
}
|
|
|
|
|
|
// ptsname retrieves the name of the first available pts for the given master.
|
|
|
func ptsname(f *os.File) (string, error) {
|
|
|
- n, err := unix.IoctlGetInt(int(f.Fd()), unix.TIOCGPTN)
|
|
|
- if err != nil {
|
|
|
+ var u uint32
|
|
|
+ if _, _, err := unix.Syscall(unix.SYS_IOCTL, f.Fd(), unix.TIOCGPTN, uintptr(unsafe.Pointer(&u))); err != 0 {
|
|
|
return "", err
|
|
|
}
|
|
|
- return fmt.Sprintf("/dev/pts/%d", n), nil
|
|
|
+ return fmt.Sprintf("/dev/pts/%d", u), nil
|
|
|
}
|
Vincent Demeester