mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fix merge issue
This commit is contained in:
parent
626bfd87a7
commit
72cef46e5e
1 changed files with 0 additions and 9 deletions
|
@ -56,15 +56,6 @@ func daemon() error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func runCommand(args []string) error {
|
func runCommand(args []string) error {
|
||||||
var oldState *term.State
|
|
||||||
var err error
|
|
||||||
if term.IsTerminal(int(os.Stdin.Fd())) && os.Getenv("NORAW") == "" {
|
|
||||||
oldState, err = term.MakeRaw(int(os.Stdin.Fd()))
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer term.Restore(int(os.Stdin.Fd()), oldState)
|
|
||||||
}
|
|
||||||
// FIXME: we want to use unix sockets here, but net.UnixConn doesn't expose
|
// FIXME: we want to use unix sockets here, but net.UnixConn doesn't expose
|
||||||
// CloseWrite(), which we need to cleanly signal that stdin is closed without
|
// CloseWrite(), which we need to cleanly signal that stdin is closed without
|
||||||
// closing the connection.
|
// closing the connection.
|
||||||
|
|
Loading…
Add table
Reference in a new issue