mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Split term files to make it easier to manage
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
parent
a3e96abb5a
commit
aecb9c39ab
3 changed files with 104 additions and 89 deletions
49
pkg/libcontainer/nsinit/std_term.go
Normal file
49
pkg/libcontainer/nsinit/std_term.go
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
package nsinit
|
||||
|
||||
import (
|
||||
"io"
|
||||
"os"
|
||||
"os/exec"
|
||||
)
|
||||
|
||||
type StdTerminal struct {
|
||||
stdin io.Reader
|
||||
stdout, stderr io.Writer
|
||||
}
|
||||
|
||||
func (s *StdTerminal) SetMaster(*os.File) {
|
||||
// no need to set master on non tty
|
||||
}
|
||||
|
||||
func (s *StdTerminal) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *StdTerminal) Resize(h, w int) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *StdTerminal) Attach(command *exec.Cmd) error {
|
||||
inPipe, err := command.StdinPipe()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
outPipe, err := command.StdoutPipe()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
errPipe, err := command.StderrPipe()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
go func() {
|
||||
defer inPipe.Close()
|
||||
io.Copy(inPipe, s.stdin)
|
||||
}()
|
||||
|
||||
go io.Copy(s.stdout, outPipe)
|
||||
go io.Copy(s.stderr, errPipe)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
package nsinit
|
||||
|
||||
import (
|
||||
"github.com/dotcloud/docker/pkg/term"
|
||||
"io"
|
||||
"os"
|
||||
"os/exec"
|
||||
|
|
@ -28,91 +27,3 @@ func NewTerminal(stdin io.Reader, stdout, stderr io.Writer, tty bool) Terminal {
|
|||
stderr: stderr,
|
||||
}
|
||||
}
|
||||
|
||||
type TtyTerminal struct {
|
||||
stdin io.Reader
|
||||
stdout, stderr io.Writer
|
||||
master *os.File
|
||||
state *term.State
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) Resize(h, w int) error {
|
||||
return term.SetWinsize(t.master.Fd(), &term.Winsize{Height: uint16(h), Width: uint16(w)})
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) SetMaster(master *os.File) {
|
||||
t.master = master
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) Attach(command *exec.Cmd) error {
|
||||
go io.Copy(t.stdout, t.master)
|
||||
go io.Copy(t.master, t.stdin)
|
||||
|
||||
state, err := t.setupWindow(t.master, os.Stdin)
|
||||
if err != nil {
|
||||
command.Process.Kill()
|
||||
return err
|
||||
}
|
||||
t.state = state
|
||||
return err
|
||||
}
|
||||
|
||||
// SetupWindow gets the parent window size and sets the master
|
||||
// pty to the current size and set the parents mode to RAW
|
||||
func (t *TtyTerminal) setupWindow(master, parent *os.File) (*term.State, error) {
|
||||
ws, err := term.GetWinsize(parent.Fd())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := term.SetWinsize(master.Fd(), ws); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return term.SetRawTerminal(parent.Fd())
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) Close() error {
|
||||
term.RestoreTerminal(os.Stdin.Fd(), t.state)
|
||||
return t.master.Close()
|
||||
}
|
||||
|
||||
type StdTerminal struct {
|
||||
stdin io.Reader
|
||||
stdout, stderr io.Writer
|
||||
}
|
||||
|
||||
func (s *StdTerminal) SetMaster(*os.File) {
|
||||
// no need to set master on non tty
|
||||
}
|
||||
|
||||
func (s *StdTerminal) Close() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *StdTerminal) Resize(h, w int) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *StdTerminal) Attach(command *exec.Cmd) error {
|
||||
inPipe, err := command.StdinPipe()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
outPipe, err := command.StdoutPipe()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
errPipe, err := command.StderrPipe()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
go func() {
|
||||
defer inPipe.Close()
|
||||
io.Copy(inPipe, s.stdin)
|
||||
}()
|
||||
|
||||
go io.Copy(s.stdout, outPipe)
|
||||
go io.Copy(s.stderr, errPipe)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
|
|||
55
pkg/libcontainer/nsinit/tty_term.go
Normal file
55
pkg/libcontainer/nsinit/tty_term.go
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
package nsinit
|
||||
|
||||
import (
|
||||
"io"
|
||||
"os"
|
||||
"os/exec"
|
||||
|
||||
"github.com/dotcloud/docker/pkg/term"
|
||||
)
|
||||
|
||||
type TtyTerminal struct {
|
||||
stdin io.Reader
|
||||
stdout, stderr io.Writer
|
||||
master *os.File
|
||||
state *term.State
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) Resize(h, w int) error {
|
||||
return term.SetWinsize(t.master.Fd(), &term.Winsize{Height: uint16(h), Width: uint16(w)})
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) SetMaster(master *os.File) {
|
||||
t.master = master
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) Attach(command *exec.Cmd) error {
|
||||
go io.Copy(t.stdout, t.master)
|
||||
go io.Copy(t.master, t.stdin)
|
||||
|
||||
state, err := t.setupWindow(t.master, os.Stdin)
|
||||
if err != nil {
|
||||
command.Process.Kill()
|
||||
return err
|
||||
}
|
||||
t.state = state
|
||||
return err
|
||||
}
|
||||
|
||||
// SetupWindow gets the parent window size and sets the master
|
||||
// pty to the current size and set the parents mode to RAW
|
||||
func (t *TtyTerminal) setupWindow(master, parent *os.File) (*term.State, error) {
|
||||
ws, err := term.GetWinsize(parent.Fd())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := term.SetWinsize(master.Fd(), ws); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return term.SetRawTerminal(parent.Fd())
|
||||
}
|
||||
|
||||
func (t *TtyTerminal) Close() error {
|
||||
term.RestoreTerminal(os.Stdin.Fd(), t.state)
|
||||
return t.master.Close()
|
||||
}
|
||||
Loading…
Reference in a new issue