From 5cb157003908a3986eb18f93823a0c4e786be7c8 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 8 Jul 2019 17:02:16 +0200 Subject: [PATCH] simplify loop --- pkg/commands/container.go | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkg/commands/container.go b/pkg/commands/container.go index f25e400d..5922ba77 100644 --- a/pkg/commands/container.go +++ b/pkg/commands/container.go @@ -394,6 +394,7 @@ func (c *Container) Attach() error { if c.Details.Config.OpenStdin { go func() { // the default escape key sequence: ctrl-p, ctrl-q + // // shamelessly taken from docker/cli escapeKeys := []byte{16, 17} // Stop reading if escape sequence had been entered @@ -404,22 +405,20 @@ func (c *Container) Attach() error { } for { - select { - case sig := <-channel: - if sig == syscall.SIGWINCH { - err := c.Resize(fd) - if err != nil { - return err - } - } else { - err = terminal.Restore(fd, oldState) - if err != nil { - return err - } - - hijack.Close() - return nil + sig := <-channel + if sig == syscall.SIGWINCH { + err := c.Resize(fd) + if err != nil { + return err } + } else { + err = terminal.Restore(fd, oldState) + if err != nil { + return err + } + + hijack.Close() + return nil } } }