mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
vendor: github.com/creack/pty v1.1.11
full diff: https://github.com/creack/pty/compare/v1.1.9...v1.1.11 - v1.1.11: Add arm support for OpenBSD - v1.1.10: Fix CTTY to work with go1.15 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
0b93c6e131
commit
53727ce2f0
5 changed files with 45 additions and 28 deletions
|
@ -16,7 +16,7 @@ github.com/moby/term 7f0af18e79f2784809e9cef63d0d
|
||||||
# could be either `mountinfo/vX.Y.Z` or `mount/vX.Y.Z`.
|
# could be either `mountinfo/vX.Y.Z` or `mount/vX.Y.Z`.
|
||||||
github.com/moby/sys 9a75fe61baf4b9788826b48b0518abecffb79b16 # mountinfo v0.4.0
|
github.com/moby/sys 9a75fe61baf4b9788826b48b0518abecffb79b16 # mountinfo v0.4.0
|
||||||
|
|
||||||
github.com/creack/pty 3a6a957789163cacdfe0e291617a1c8e80612c11 # v1.1.9
|
github.com/creack/pty 2a38352e8b4d7ab6c336eef107e42a55e72e7fbc # v1.1.11
|
||||||
github.com/sirupsen/logrus 6699a89a232f3db797f2e280639854bbc4b89725 # v1.7.0
|
github.com/sirupsen/logrus 6699a89a232f3db797f2e280639854bbc4b89725 # v1.7.0
|
||||||
github.com/tchap/go-patricia a7f0089c6f496e8e70402f61733606daa326cac5 # v2.3.0
|
github.com/tchap/go-patricia a7f0089c6f496e8e70402f61733606daa326cac5 # v2.3.0
|
||||||
golang.org/x/net ab34263943818b32f575efc978a3d24e80b04bd7
|
golang.org/x/net ab34263943818b32f575efc978a3d24e80b04bd7
|
||||||
|
|
41
vendor/github.com/creack/pty/run.go
generated
vendored
41
vendor/github.com/creack/pty/run.go
generated
vendored
|
@ -11,6 +11,8 @@ import (
|
||||||
// Start assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout,
|
// Start assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout,
|
||||||
// and c.Stderr, calls c.Start, and returns the File of the tty's
|
// and c.Stderr, calls c.Start, and returns the File of the tty's
|
||||||
// corresponding pty.
|
// corresponding pty.
|
||||||
|
//
|
||||||
|
// Starts the process in a new session and sets the controlling terminal.
|
||||||
func Start(c *exec.Cmd) (pty *os.File, err error) {
|
func Start(c *exec.Cmd) (pty *os.File, err error) {
|
||||||
return StartWithSize(c, nil)
|
return StartWithSize(c, nil)
|
||||||
}
|
}
|
||||||
|
@ -19,16 +21,35 @@ func Start(c *exec.Cmd) (pty *os.File, err error) {
|
||||||
// and c.Stderr, calls c.Start, and returns the File of the tty's
|
// and c.Stderr, calls c.Start, and returns the File of the tty's
|
||||||
// corresponding pty.
|
// corresponding pty.
|
||||||
//
|
//
|
||||||
// This will resize the pty to the specified size before starting the command
|
// This will resize the pty to the specified size before starting the command.
|
||||||
|
// Starts the process in a new session and sets the controlling terminal.
|
||||||
func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) {
|
func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) {
|
||||||
|
if c.SysProcAttr == nil {
|
||||||
|
c.SysProcAttr = &syscall.SysProcAttr{}
|
||||||
|
}
|
||||||
|
c.SysProcAttr.Setsid = true
|
||||||
|
c.SysProcAttr.Setctty = true
|
||||||
|
return StartWithAttrs(c, sz, c.SysProcAttr)
|
||||||
|
}
|
||||||
|
|
||||||
|
// StartWithAttrs assigns a pseudo-terminal tty os.File to c.Stdin, c.Stdout,
|
||||||
|
// and c.Stderr, calls c.Start, and returns the File of the tty's
|
||||||
|
// corresponding pty.
|
||||||
|
//
|
||||||
|
// This will resize the pty to the specified size before starting the command if a size is provided.
|
||||||
|
// The `attrs` parameter overrides the one set in c.SysProcAttr.
|
||||||
|
//
|
||||||
|
// This should generally not be needed. Used in some edge cases where it is needed to create a pty
|
||||||
|
// without a controlling terminal.
|
||||||
|
func StartWithAttrs(c *exec.Cmd, sz *Winsize, attrs *syscall.SysProcAttr) (pty *os.File, err error) {
|
||||||
pty, tty, err := Open()
|
pty, tty, err := Open()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer tty.Close()
|
defer tty.Close()
|
||||||
|
|
||||||
if sz != nil {
|
if sz != nil {
|
||||||
err = Setsize(pty, sz)
|
if err := Setsize(pty, sz); err != nil {
|
||||||
if err != nil {
|
|
||||||
pty.Close()
|
pty.Close()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -42,15 +63,11 @@ func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) {
|
||||||
if c.Stdin == nil {
|
if c.Stdin == nil {
|
||||||
c.Stdin = tty
|
c.Stdin = tty
|
||||||
}
|
}
|
||||||
if c.SysProcAttr == nil {
|
|
||||||
c.SysProcAttr = &syscall.SysProcAttr{}
|
c.SysProcAttr = attrs
|
||||||
}
|
|
||||||
c.SysProcAttr.Setctty = true
|
if err := c.Start(); err != nil {
|
||||||
c.SysProcAttr.Setsid = true
|
_ = pty.Close()
|
||||||
c.SysProcAttr.Ctty = int(tty.Fd())
|
|
||||||
err = c.Start()
|
|
||||||
if err != nil {
|
|
||||||
pty.Close()
|
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
return pty, err
|
return pty, err
|
||||||
|
|
13
vendor/github.com/creack/pty/ztypes_freebsd_arm64.go
generated
vendored
Normal file
13
vendor/github.com/creack/pty/ztypes_freebsd_arm64.go
generated
vendored
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
|
||||||
|
// cgo -godefs types_freebsd.go
|
||||||
|
|
||||||
|
package pty
|
||||||
|
|
||||||
|
const (
|
||||||
|
_C_SPECNAMELEN = 0xff
|
||||||
|
)
|
||||||
|
|
||||||
|
type fiodgnameArg struct {
|
||||||
|
Len int32
|
||||||
|
Buf *byte
|
||||||
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
// Created by cgo -godefs - DO NOT EDIT
|
// +build openbsd
|
||||||
// cgo -godefs types_openbsd.go
|
// +build 386 amd64 arm arm64
|
||||||
|
|
||||||
package pty
|
package pty
|
||||||
|
|
13
vendor/github.com/creack/pty/ztypes_openbsd_amd64.go
generated
vendored
13
vendor/github.com/creack/pty/ztypes_openbsd_amd64.go
generated
vendored
|
@ -1,13 +0,0 @@
|
||||||
// Created by cgo -godefs - DO NOT EDIT
|
|
||||||
// cgo -godefs types_openbsd.go
|
|
||||||
|
|
||||||
package pty
|
|
||||||
|
|
||||||
type ptmget struct {
|
|
||||||
Cfd int32
|
|
||||||
Sfd int32
|
|
||||||
Cn [16]int8
|
|
||||||
Sn [16]int8
|
|
||||||
}
|
|
||||||
|
|
||||||
var ioctl_PTMGET = 0x40287401
|
|
Loading…
Reference in a new issue