From c2049d2dfeeea3d41fafa91e3e3f0e47c285355b Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 1 Nov 2011 22:04:37 -0400 Subject: src/pkg/[a-m]*: gofix -r error -force=error R=golang-dev, iant CC=golang-dev https://golang.org/cl/5322051 --- src/pkg/exp/ssh/server_shell.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/pkg/exp/ssh/server_shell.go') diff --git a/src/pkg/exp/ssh/server_shell.go b/src/pkg/exp/ssh/server_shell.go index 0e9967a909..5243d0ee7f 100644 --- a/src/pkg/exp/ssh/server_shell.go +++ b/src/pkg/exp/ssh/server_shell.go @@ -4,9 +4,7 @@ package ssh -import ( - "os" -) +import "io" // ServerShell contains the state for running a VT100 terminal that is capable // of reading lines of input. @@ -326,12 +324,12 @@ func parsePtyRequest(s []byte) (width, height int, ok bool) { return } -func (ss *ServerShell) Write(buf []byte) (n int, err os.Error) { +func (ss *ServerShell) Write(buf []byte) (n int, err error) { return ss.c.Write(buf) } // ReadLine returns a line of input from the terminal. -func (ss *ServerShell) ReadLine() (line string, err os.Error) { +func (ss *ServerShell) ReadLine() (line string, err error) { ss.writeLine([]byte(ss.prompt)) ss.c.Write(ss.outBuf) ss.outBuf = ss.outBuf[:0] @@ -353,7 +351,7 @@ func (ss *ServerShell) ReadLine() (line string, err os.Error) { break } if key == keyCtrlD { - return "", os.EOF + return "", io.EOF } line, lineOk = ss.handleKey(key) } -- cgit v1.3