kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Simplify term signal handler.

Browse source
This commit is contained in:
David Calavera 2013-08-17 21:29:37 -07:00
parent b54ba5095b
commit b8a8962833
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
commands.go
View file

@ -299,7 +299,8 @@ func (cli *DockerCli) CmdLogin(args ...string) error {
oldState, _ := term.SaveState(cli.terminalFd) oldState, _ := term.SaveState(cli.terminalFd)
fmt.Fprintf(cli.out, "Password: ") fmt.Fprintf(cli.out, "Password: ")
term.DisableEcho(cli.terminalFd, cli.out, oldState) term.DisableEcho(cli.terminalFd, oldState)
password = readInput(cli.in, cli.out) password = readInput(cli.in, cli.out)
fmt.Fprint(cli.out, "\n") fmt.Fprint(cli.out, "\n")
@ -1647,7 +1648,7 @@ func (cli *DockerCli) hijack(method, path string, setRawTerminal bool, in io.Rea
} }
if in != nil && setRawTerminal && cli.isTerminal && os.Getenv("NORAW") == "" { if in != nil && setRawTerminal && cli.isTerminal && os.Getenv("NORAW") == "" {
oldState, err := term.SetRawTerminal(cli.terminalFd, cli.out) oldState, err := term.SetRawTerminal(cli.terminalFd)
if err != nil { if err != nil {
return err return err
} }

25
term/term.go
View file

@ -54,34 +54,33 @@ func SaveState(fd uintptr) (*State, error) {
return &oldState, nil return &oldState, nil
} }
func DisableEcho(fd uintptr, out io.Writer, state *State) error { func DisableEcho(fd uintptr, state *State) error {
newState := state.termios newState := state.termios
newState.Lflag &^= syscall.ECHO newState.Lflag &^= syscall.ECHO
HandleInterrupt(fd, out, state)
if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, setTermios, uintptr(unsafe.Pointer(&newState))); err != 0 { if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, setTermios, uintptr(unsafe.Pointer(&newState))); err != 0 {
return err return err
} }
handleInterrupt(fd, state)
return nil return nil
} }
func HandleInterrupt(fd uintptr, out io.Writer, state *State) { func SetRawTerminal(fd uintptr) (*State, error) {
oldState, err := MakeRaw(fd)
if err != nil {
return nil, err
}
handleInterrupt(fd, oldState)
return oldState, err
}
func handleInterrupt(fd uintptr, state *State) {
sigchan := make(chan os.Signal, 1) sigchan := make(chan os.Signal, 1)
signal.Notify(sigchan, os.Interrupt) signal.Notify(sigchan, os.Interrupt)
go func() { go func() {
_ = <-sigchan _ = <-sigchan
fmt.Fprint(out, "\n")
RestoreTerminal(fd, state) RestoreTerminal(fd, state)
os.Exit(0) os.Exit(0)
}() }()
} }
func SetRawTerminal(fd uintptr, out io.Writer) (*State, error) {
oldState, err := MakeRaw(fd)
if err != nil {
return nil, err
}
HandleInterrupt(fd, out, oldState)
return oldState, err
}