Merge lp:~dave-cheney/goetveld/001-add-darwin-termios-support into lp:~niemeyer/goetveld/trunk

[Dave Cheney]

Add minimal darwin support.

[Dave Cheney (dave-cheney)]

Please take a look.

Unmerged revisions

40. By Dave Cheney on 2012-09-25

add darwin termios support

=== added file 'terminal_darwin.go'
--- terminal_darwin.go	1970-01-01 00:00:00 +0000
+++ terminal_darwin.go	2012-09-25 02:25:21 +0000
@@ -0,0 +1,62 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package rietveld
+
+import (
+	"io"
+	"syscall"
+	"unsafe"
+)
+
+const (
+	syscall_TCGETS = 0x40487413
+	syscall_TCSETS = 0x80487414
+)
+
+// This was copied from package exp/terminal
+
+// readPassword reads a line of input from a terminal without local echo.  This
+// is commonly used for inputting passwords and other sensitive data. The slice
+// returned does not include the \n.
+func readPassword(fd uintptr) ([]byte, error) {
+	var oldState syscall.Termios
+	if _, _, e := syscall.Syscall6(syscall.SYS_IOCTL, fd, uintptr(syscall_TCGETS), uintptr(unsafe.Pointer(&oldState)), 0, 0, 0); e != 0 {
+		return nil, syscall.Errno(e)
+	}
+
+	newState := oldState
+	newState.Lflag &^= syscall.ECHO
+	if _, _, e := syscall.Syscall6(syscall.SYS_IOCTL, fd, uintptr(syscall_TCSETS), uintptr(unsafe.Pointer(&newState)), 0, 0, 0); e != 0 {
+		return nil, syscall.Errno(e)
+	}
+
+	defer func() {
+		syscall.Syscall6(syscall.SYS_IOCTL, fd, uintptr(syscall_TCSETS), uintptr(unsafe.Pointer(&oldState)), 0, 0, 0)
+	}()
+
+	var buf [16]byte
+	var ret []byte
+	for {
+		n, errno := syscall.Read(int(fd), buf[:])
+		if errno != nil {
+			return nil, errno
+		}
+		if n == 0 {
+			if len(ret) == 0 {
+				return nil, io.EOF
+			}
+			break
+		}
+		if buf[n-1] == '\n' {
+			n--
+		}
+		ret = append(ret, buf[:n]...)
+		if n < len(buf) {
+			break
+		}
+	}
+
+	return ret, nil
+}

=== renamed file 'terminal.go' => 'terminal_linux.go'
--- terminal.go	2012-02-21 18:47:37 +0000
+++ terminal_linux.go	2012-09-25 02:25:21 +0000
@@ -12,7 +12,7 @@
 
 // This was copied from package exp/terminal
 
-// ReadPassword reads a line of input from a terminal without local echo.  This
+// readPassword reads a line of input from a terminal without local echo.  This
 // is commonly used for inputting passwords and other sensitive data. The slice
 // returned does not include the \n.
 func readPassword(fd uintptr) ([]byte, error) {