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

Change hardcoded "0" onto os.Stdin.Fd()

Browse source
This commit is contained in:
Guillaume J. Charmes 2013-03-27 23:56:36 -07:00
parent 108acc0511
commit 6a236184af
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
docker/docker.go
View file

@ -48,17 +48,17 @@ func daemon() error {
func runCommand(args []string) error { func runCommand(args []string) error {
var oldState *term.State var oldState *term.State
var err error var err error
if term.IsTerminal(0) && os.Getenv("NORAW") == "" { if term.IsTerminal(int(os.Stdin.Fd())) && os.Getenv("NORAW") == "" {
oldState, err = term.MakeRaw(0) oldState, err = term.MakeRaw(int(os.Stdin.Fd()))
if err != nil { if err != nil {
return err return err
} }
defer term.Restore(0, oldState) defer term.Restore(int(os.Stdin.Fd()), oldState)
c := make(chan os.Signal, 1) c := make(chan os.Signal, 1)
signal.Notify(c, os.Interrupt) signal.Notify(c, os.Interrupt)
go func() { go func() {
for _ = range c { for _ = range c {
term.Restore(0, oldState) term.Restore(int(os.Stdin.Fd()), oldState)
log.Printf("\nSIGINT received\n") log.Printf("\nSIGINT received\n")
os.Exit(0) os.Exit(0)
} }
@ -83,7 +83,7 @@ func runCommand(args []string) error {
if err := <-receive_stdout; err != nil { if err := <-receive_stdout; err != nil {
return err return err
} }
if !term.IsTerminal(0) { if !term.IsTerminal(int(os.Stdin.Fd())) {
if err := <-send_stdin; err != nil { if err := <-send_stdin; err != nil {
return err return err
} }
@ -98,7 +98,7 @@ func runCommand(args []string) error {
} }
} }
if oldState != nil { if oldState != nil {
term.Restore(0, oldState) term.Restore(int(os.Stdin.Fd()), oldState)
} }
return nil return nil
} }