Fixed issues on MacOS

Signed-off-by: xchenan <xchenan@gmail.com>

sys/errors.go

@@ -0,0 +1,8 @@
+package sys
+
+import "errors"
+
+var (
+	ErrNotImplemented = errors.New("not implemented")
+	ErrInvalidAction  = errors.New("invalid action")
+)

sys/select.go

@@ -6,13 +6,6 @@ import (
 
 type FdSet syscall.FdSet
 
-const NFDBits = 64
-
-func index(fd int) (idx uint, bit int64) {
-	u := uint(fd)
-	return u / NFDBits, 1 << (u % NFDBits)
-}
-
 func (fs *FdSet) s() *syscall.FdSet {
 	return (*syscall.FdSet)(fs)
 }

sys/select_bsd.go

@@ -4,6 +4,13 @@ package sys
 
 import "syscall"
 
+const NFDBits = 64
+
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *syscall.Timeval) (err error) {
 	return syscall.Select(nfd, r.s(), w.s(), e.s(), timeout)
 }
+
+func index(fd int) (idx uint, bit int32) {
+	u := uint(fd)
+	return u / NFDBits, 1 << (u % NFDBits)
+}

sys/select_linux.go

@@ -4,7 +4,14 @@ package sys
 
 import "syscall"
 
+const NFDBits = 64
+
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *syscall.Timeval) error {
 	_, err := syscall.Select(nfd, r.s(), w.s(), e.s(), timeout)
 	return err
 }
+
+func index(fd int) (idx uint, bit int64) {
+	u := uint(fd)
+	return u / NFDBits, 1 << (u % NFDBits)
+}

sys/termios.go

@@ -55,13 +55,7 @@ func (term *Termios) SetVMin(v uint8) {
 	term.Cc[unix.VMIN] = v
 }
 
-func setFlag(flag *uint32, mask uint32, v bool) {
-	if v {
-		*flag |= mask
-	} else {
-		*flag &= ^mask
-	}
-}
+
 
 // SetICanon sets the canonical flag.
 func (term *Termios) SetICanon(v bool) {

sys/termios_freebsd.go → sys/termios_bsd.go

@@ -1,3 +1,5 @@
+// +build darwin dragonfly freebsd netbsd openbsd
+
 // Copyright 2015 go-termios Author. All Rights Reserved.
 // https://github.com/go-termios/termios
 // Author: John Lenton <chipaca@github.com>
@@ -8,7 +10,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/termios"
 	"golang.org/x/sys/unix"
 )
 
@@ -52,8 +53,8 @@ func (tio *Termios) GetSpeed() (in int, out int) {
 
 // SetSpeed sets the baud rate.
 func (tio *Termios) SetSpeed(in int, out int) error {
-	tio.Ispeed = uint32(in)
-	tio.Ospeed = uint32(out)
+	tio.Ispeed = uint64(in)
+	tio.Ospeed = uint64(out)
 
 	return nil
 }
@@ -102,24 +103,32 @@ func Flow(fd uintptr, action int) error {
 	case TCION:
 		idx = unix.VSTART
 	default:
-		return termios.ErrInvalidAction
+		return ErrInvalidAction
 	}
 
-	tio, err := GetAttr(fd)
+	tio, err := NewTermiosFromFd(int(fd))
 	if err != nil {
 		return err
 	}
 	_, err = os.NewFile(fd, "").Write([]byte{tio.Cc[idx]})
 	return err
 }
 
-func (q Queue) bits() uintptr {
-	switch q {
-	case InputQueue:
-		return FREAD
-	case OutputQueue:
-		return FWRITE
-	default:
-		return 0
+//func (q Queue) bits() uintptr {
+//	switch q {
+//	case InputQueue:
+//		return FREAD
+//	case OutputQueue:
+//		return FWRITE
+//	default:
+//		return 0
+//	}
+//}
+
+func setFlag(flag *uint64, mask uint64, v bool) {
+	if v {
+		*flag |= mask
+	} else {
+		*flag &= ^mask
 	}
 }

sys/termios_linux.go

@@ -1,3 +1,5 @@
+// +build linux
+
 // Copyright 2015 go-termios Author. All Rights Reserved.
 // https://github.com/go-termios/termios
 // Author: John Lenton <chipaca@github.com>
@@ -189,3 +191,11 @@ func Drain(fd uintptr) error {
 func Flow(fd uintptr, action int) error {
 	return ioctlu(fd, unix.TCXONC, uintptr(action))
 }
+
+func setFlag(flag *uint32, mask uint32, v bool) {
+	if v {
+		*flag |= mask
+	} else {
+		*flag &= ^mask
+	}
+}