From 78ee5d567a3de0005a0d7f4a27c554ac3e9e1c04 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Wed, 11 Apr 2018 14:24:01 -0700 Subject: [PATCH 1/2] update bindata after #61817 --- pkg/generated/bindata.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/generated/bindata.go b/pkg/generated/bindata.go index 7cbfc6154f..388c190c7b 100644 --- a/pkg/generated/bindata.go +++ b/pkg/generated/bindata.go @@ -16241,7 +16241,7 @@ msgid "" "\t\t kubectl create secret docker-registry my-secret --docker-server=DOCKER_REGISTRY_SERVER --docker-username=DOCKER_USER --docker-password=DOCKER_PASSWORD --docker-email=DOCKER_EMAIL" msgstr "" "\n" -"\t\t # 如果你还没有一个 .dockercfg 文件, 你可以创建一个 dockercfg 的 secret 直接使用:\n" +"\t\t # 如果你还没有一个 .dockercfg 文件, 你可以直接使用下面的命令创建一个 dockercfg 的 secret:\n" "\t\t kubectl create secret docker-registry my-secret --docker-server=DOCKER_REGISTRY_SERVER --docker-username=DOCKER_USER --docker-password=DOCKER_PASSWORD --docker-email=DOCKER_EMAIL" #: pkg/kubectl/cmd/top_node.go:65 From ec739269e85313275266b4bd528a074d65d69b92 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Wed, 11 Apr 2018 14:24:29 -0700 Subject: [PATCH 2/2] godeps: remove github.com/kr/pty after #62360 --- Godeps/Godeps.json | 5 - Godeps/LICENSES | 31 ------ vendor/BUILD | 1 - vendor/github.com/kr/pty/.gitignore | 4 - vendor/github.com/kr/pty/BUILD | 102 ------------------ vendor/github.com/kr/pty/License | 23 ---- vendor/github.com/kr/pty/README.md | 36 ------- vendor/github.com/kr/pty/doc.go | 16 --- vendor/github.com/kr/pty/ioctl.go | 11 -- vendor/github.com/kr/pty/ioctl_bsd.go | 39 ------- vendor/github.com/kr/pty/mktypes.bash | 19 ---- vendor/github.com/kr/pty/pty_darwin.go | 60 ----------- vendor/github.com/kr/pty/pty_freebsd.go | 73 ------------- vendor/github.com/kr/pty/pty_linux.go | 46 -------- vendor/github.com/kr/pty/pty_unsupported.go | 11 -- vendor/github.com/kr/pty/run.go | 32 ------ vendor/github.com/kr/pty/types.go | 10 -- vendor/github.com/kr/pty/types_freebsd.go | 15 --- vendor/github.com/kr/pty/util.go | 35 ------ vendor/github.com/kr/pty/ztypes_386.go | 9 -- vendor/github.com/kr/pty/ztypes_amd64.go | 9 -- vendor/github.com/kr/pty/ztypes_arm.go | 9 -- vendor/github.com/kr/pty/ztypes_arm64.go | 11 -- .../github.com/kr/pty/ztypes_freebsd_386.go | 13 --- .../github.com/kr/pty/ztypes_freebsd_amd64.go | 14 --- .../github.com/kr/pty/ztypes_freebsd_arm.go | 13 --- vendor/github.com/kr/pty/ztypes_ppc64.go | 11 -- vendor/github.com/kr/pty/ztypes_ppc64le.go | 11 -- vendor/github.com/kr/pty/ztypes_s390x.go | 11 -- 29 files changed, 680 deletions(-) delete mode 100644 vendor/github.com/kr/pty/.gitignore delete mode 100644 vendor/github.com/kr/pty/BUILD delete mode 100644 vendor/github.com/kr/pty/License delete mode 100644 vendor/github.com/kr/pty/README.md delete mode 100644 vendor/github.com/kr/pty/doc.go delete mode 100644 vendor/github.com/kr/pty/ioctl.go delete mode 100644 vendor/github.com/kr/pty/ioctl_bsd.go delete mode 100755 vendor/github.com/kr/pty/mktypes.bash delete mode 100644 vendor/github.com/kr/pty/pty_darwin.go delete mode 100644 vendor/github.com/kr/pty/pty_freebsd.go delete mode 100644 vendor/github.com/kr/pty/pty_linux.go delete mode 100644 vendor/github.com/kr/pty/pty_unsupported.go delete mode 100644 vendor/github.com/kr/pty/run.go delete mode 100644 vendor/github.com/kr/pty/types.go delete mode 100644 vendor/github.com/kr/pty/types_freebsd.go delete mode 100644 vendor/github.com/kr/pty/util.go delete mode 100644 vendor/github.com/kr/pty/ztypes_386.go delete mode 100644 vendor/github.com/kr/pty/ztypes_amd64.go delete mode 100644 vendor/github.com/kr/pty/ztypes_arm.go delete mode 100644 vendor/github.com/kr/pty/ztypes_arm64.go delete mode 100644 vendor/github.com/kr/pty/ztypes_freebsd_386.go delete mode 100644 vendor/github.com/kr/pty/ztypes_freebsd_amd64.go delete mode 100644 vendor/github.com/kr/pty/ztypes_freebsd_arm.go delete mode 100644 vendor/github.com/kr/pty/ztypes_ppc64.go delete mode 100644 vendor/github.com/kr/pty/ztypes_ppc64le.go delete mode 100644 vendor/github.com/kr/pty/ztypes_s390x.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 510b6caee1..c0acdac14b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -2074,11 +2074,6 @@ "Comment": "go.weekly.2011-12-22-24-gf31442d", "Rev": "f31442d60e51465c69811e2107ae978868dbea5c" }, - { - "ImportPath": "github.com/kr/pty", - "Comment": "release.r56-29-gf7ee69f", - "Rev": "f7ee69f31298ecbe5d2b349c711e2547a617d398" - }, { "ImportPath": "github.com/kr/text", "Rev": "6807e777504f54ad073ecef66747de158294b639" diff --git a/Godeps/LICENSES b/Godeps/LICENSES index ac68fe13be..1fa7732fca 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -71232,37 +71232,6 @@ THE SOFTWARE. ================================================================================ -================================================================================ -= vendor/github.com/kr/pty licensed under: = - -Copyright (c) 2011 Keith Rarick - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, -sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall -be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -= vendor/github.com/kr/pty/License 93958070863d769117fa33b129020050 -================================================================================ - - ================================================================================ = vendor/github.com/kr/text licensed under: = diff --git a/vendor/BUILD b/vendor/BUILD index fd3cc56a82..b8e04d7a6e 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -283,7 +283,6 @@ filegroup( "//vendor/github.com/kardianos/osext:all-srcs", "//vendor/github.com/kr/fs:all-srcs", "//vendor/github.com/kr/pretty:all-srcs", - "//vendor/github.com/kr/pty:all-srcs", "//vendor/github.com/kr/text:all-srcs", "//vendor/github.com/kubernetes/repo-infra/kazel:all-srcs", "//vendor/github.com/libopenstorage/openstorage/api:all-srcs", diff --git a/vendor/github.com/kr/pty/.gitignore b/vendor/github.com/kr/pty/.gitignore deleted file mode 100644 index 1f0a99f2f2..0000000000 --- a/vendor/github.com/kr/pty/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -[568].out -_go* -_test* -_obj diff --git a/vendor/github.com/kr/pty/BUILD b/vendor/github.com/kr/pty/BUILD deleted file mode 100644 index e3733e1b57..0000000000 --- a/vendor/github.com/kr/pty/BUILD +++ /dev/null @@ -1,102 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = [ - "doc.go", - "ioctl.go", - "run.go", - "util.go", - ] + select({ - "@io_bazel_rules_go//go/platform:android": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:darwin": [ - "ioctl_bsd.go", - "pty_darwin.go", - ], - "@io_bazel_rules_go//go/platform:dragonfly": [ - "ioctl_bsd.go", - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:freebsd": [ - "ioctl_bsd.go", - "pty_freebsd.go", - ], - "@io_bazel_rules_go//go/platform:linux": [ - "pty_linux.go", - ], - "@io_bazel_rules_go//go/platform:nacl": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:netbsd": [ - "ioctl_bsd.go", - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:openbsd": [ - "ioctl_bsd.go", - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:plan9": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:solaris": [ - "pty_unsupported.go", - ], - "@io_bazel_rules_go//go/platform:windows": [ - "pty_unsupported.go", - ], - "//conditions:default": [], - }) + select({ - "@io_bazel_rules_go//go/platform:386": [ - "ztypes_386.go", - ], - "@io_bazel_rules_go//go/platform:amd64": [ - "ztypes_amd64.go", - ], - "@io_bazel_rules_go//go/platform:arm": [ - "ztypes_arm.go", - ], - "@io_bazel_rules_go//go/platform:arm64": [ - "ztypes_arm64.go", - ], - "@io_bazel_rules_go//go/platform:ppc64": [ - "ztypes_ppc64.go", - ], - "@io_bazel_rules_go//go/platform:ppc64le": [ - "ztypes_ppc64le.go", - ], - "@io_bazel_rules_go//go/platform:s390x": [ - "ztypes_s390x.go", - ], - "//conditions:default": [], - }) + select({ - "@io_bazel_rules_go//go/platform:freebsd_386": [ - "ztypes_freebsd_386.go", - ], - "@io_bazel_rules_go//go/platform:freebsd_amd64": [ - "ztypes_freebsd_amd64.go", - ], - "@io_bazel_rules_go//go/platform:freebsd_arm": [ - "ztypes_freebsd_arm.go", - ], - "//conditions:default": [], - }), - cgo = True, - importpath = "github.com/kr/pty", - visibility = ["//visibility:public"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/vendor/github.com/kr/pty/License b/vendor/github.com/kr/pty/License deleted file mode 100644 index 6b7558b6b4..0000000000 --- a/vendor/github.com/kr/pty/License +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) 2011 Keith Rarick - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, -sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall -be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/github.com/kr/pty/README.md b/vendor/github.com/kr/pty/README.md deleted file mode 100644 index 7b7900c3ae..0000000000 --- a/vendor/github.com/kr/pty/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# pty - -Pty is a Go package for using unix pseudo-terminals. - -## Install - - go get github.com/kr/pty - -## Example - -```go -package main - -import ( - "github.com/kr/pty" - "io" - "os" - "os/exec" -) - -func main() { - c := exec.Command("grep", "--color=auto", "bar") - f, err := pty.Start(c) - if err != nil { - panic(err) - } - - go func() { - f.Write([]byte("foo\n")) - f.Write([]byte("bar\n")) - f.Write([]byte("baz\n")) - f.Write([]byte{4}) // EOT - }() - io.Copy(os.Stdout, f) -} -``` diff --git a/vendor/github.com/kr/pty/doc.go b/vendor/github.com/kr/pty/doc.go deleted file mode 100644 index 190cfbea92..0000000000 --- a/vendor/github.com/kr/pty/doc.go +++ /dev/null @@ -1,16 +0,0 @@ -// Package pty provides functions for working with Unix terminals. -package pty - -import ( - "errors" - "os" -) - -// ErrUnsupported is returned if a function is not -// available on the current platform. -var ErrUnsupported = errors.New("unsupported") - -// Opens a pty and its corresponding tty. -func Open() (pty, tty *os.File, err error) { - return open() -} diff --git a/vendor/github.com/kr/pty/ioctl.go b/vendor/github.com/kr/pty/ioctl.go deleted file mode 100644 index 5b856e8711..0000000000 --- a/vendor/github.com/kr/pty/ioctl.go +++ /dev/null @@ -1,11 +0,0 @@ -package pty - -import "syscall" - -func ioctl(fd, cmd, ptr uintptr) error { - _, _, e := syscall.Syscall(syscall.SYS_IOCTL, fd, cmd, ptr) - if e != 0 { - return e - } - return nil -} diff --git a/vendor/github.com/kr/pty/ioctl_bsd.go b/vendor/github.com/kr/pty/ioctl_bsd.go deleted file mode 100644 index 73b12c53cf..0000000000 --- a/vendor/github.com/kr/pty/ioctl_bsd.go +++ /dev/null @@ -1,39 +0,0 @@ -// +build darwin dragonfly freebsd netbsd openbsd - -package pty - -// from -const ( - _IOC_VOID uintptr = 0x20000000 - _IOC_OUT uintptr = 0x40000000 - _IOC_IN uintptr = 0x80000000 - _IOC_IN_OUT uintptr = _IOC_OUT | _IOC_IN - _IOC_DIRMASK = _IOC_VOID | _IOC_OUT | _IOC_IN - - _IOC_PARAM_SHIFT = 13 - _IOC_PARAM_MASK = (1 << _IOC_PARAM_SHIFT) - 1 -) - -func _IOC_PARM_LEN(ioctl uintptr) uintptr { - return (ioctl >> 16) & _IOC_PARAM_MASK -} - -func _IOC(inout uintptr, group byte, ioctl_num uintptr, param_len uintptr) uintptr { - return inout | (param_len&_IOC_PARAM_MASK)<<16 | uintptr(group)<<8 | ioctl_num -} - -func _IO(group byte, ioctl_num uintptr) uintptr { - return _IOC(_IOC_VOID, group, ioctl_num, 0) -} - -func _IOR(group byte, ioctl_num uintptr, param_len uintptr) uintptr { - return _IOC(_IOC_OUT, group, ioctl_num, param_len) -} - -func _IOW(group byte, ioctl_num uintptr, param_len uintptr) uintptr { - return _IOC(_IOC_IN, group, ioctl_num, param_len) -} - -func _IOWR(group byte, ioctl_num uintptr, param_len uintptr) uintptr { - return _IOC(_IOC_IN_OUT, group, ioctl_num, param_len) -} diff --git a/vendor/github.com/kr/pty/mktypes.bash b/vendor/github.com/kr/pty/mktypes.bash deleted file mode 100755 index 9952c88838..0000000000 --- a/vendor/github.com/kr/pty/mktypes.bash +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -GOOSARCH="${GOOS}_${GOARCH}" -case "$GOOSARCH" in -_* | *_ | _) - echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2 - exit 1 - ;; -esac - -GODEFS="go tool cgo -godefs" - -$GODEFS types.go |gofmt > ztypes_$GOARCH.go - -case $GOOS in -freebsd) - $GODEFS types_$GOOS.go |gofmt > ztypes_$GOOSARCH.go - ;; -esac diff --git a/vendor/github.com/kr/pty/pty_darwin.go b/vendor/github.com/kr/pty/pty_darwin.go deleted file mode 100644 index 4f4d5ca26e..0000000000 --- a/vendor/github.com/kr/pty/pty_darwin.go +++ /dev/null @@ -1,60 +0,0 @@ -package pty - -import ( - "errors" - "os" - "syscall" - "unsafe" -) - -func open() (pty, tty *os.File, err error) { - p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0) - if err != nil { - return nil, nil, err - } - - sname, err := ptsname(p) - if err != nil { - return nil, nil, err - } - - err = grantpt(p) - if err != nil { - return nil, nil, err - } - - err = unlockpt(p) - if err != nil { - return nil, nil, err - } - - t, err := os.OpenFile(sname, os.O_RDWR, 0) - if err != nil { - return nil, nil, err - } - return p, t, nil -} - -func ptsname(f *os.File) (string, error) { - n := make([]byte, _IOC_PARM_LEN(syscall.TIOCPTYGNAME)) - - err := ioctl(f.Fd(), syscall.TIOCPTYGNAME, uintptr(unsafe.Pointer(&n[0]))) - if err != nil { - return "", err - } - - for i, c := range n { - if c == 0 { - return string(n[:i]), nil - } - } - return "", errors.New("TIOCPTYGNAME string not NUL-terminated") -} - -func grantpt(f *os.File) error { - return ioctl(f.Fd(), syscall.TIOCPTYGRANT, 0) -} - -func unlockpt(f *os.File) error { - return ioctl(f.Fd(), syscall.TIOCPTYUNLK, 0) -} diff --git a/vendor/github.com/kr/pty/pty_freebsd.go b/vendor/github.com/kr/pty/pty_freebsd.go deleted file mode 100644 index b341babd05..0000000000 --- a/vendor/github.com/kr/pty/pty_freebsd.go +++ /dev/null @@ -1,73 +0,0 @@ -package pty - -import ( - "errors" - "os" - "syscall" - "unsafe" -) - -func posix_openpt(oflag int) (fd int, err error) { - r0, _, e1 := syscall.Syscall(syscall.SYS_POSIX_OPENPT, uintptr(oflag), 0, 0) - fd = int(r0) - if e1 != 0 { - err = e1 - } - return -} - -func open() (pty, tty *os.File, err error) { - fd, err := posix_openpt(syscall.O_RDWR | syscall.O_CLOEXEC) - if err != nil { - return nil, nil, err - } - - p := os.NewFile(uintptr(fd), "/dev/pts") - sname, err := ptsname(p) - if err != nil { - return nil, nil, err - } - - t, err := os.OpenFile("/dev/"+sname, os.O_RDWR, 0) - if err != nil { - return nil, nil, err - } - return p, t, nil -} - -func isptmaster(fd uintptr) (bool, error) { - err := ioctl(fd, syscall.TIOCPTMASTER, 0) - return err == nil, err -} - -var ( - emptyFiodgnameArg fiodgnameArg - ioctl_FIODGNAME = _IOW('f', 120, unsafe.Sizeof(emptyFiodgnameArg)) -) - -func ptsname(f *os.File) (string, error) { - master, err := isptmaster(f.Fd()) - if err != nil { - return "", err - } - if !master { - return "", syscall.EINVAL - } - - const n = _C_SPECNAMELEN + 1 - var ( - buf = make([]byte, n) - arg = fiodgnameArg{Len: n, Buf: (*byte)(unsafe.Pointer(&buf[0]))} - ) - err = ioctl(f.Fd(), ioctl_FIODGNAME, uintptr(unsafe.Pointer(&arg))) - if err != nil { - return "", err - } - - for i, c := range buf { - if c == 0 { - return string(buf[:i]), nil - } - } - return "", errors.New("FIODGNAME string not NUL-terminated") -} diff --git a/vendor/github.com/kr/pty/pty_linux.go b/vendor/github.com/kr/pty/pty_linux.go deleted file mode 100644 index cb901a21e0..0000000000 --- a/vendor/github.com/kr/pty/pty_linux.go +++ /dev/null @@ -1,46 +0,0 @@ -package pty - -import ( - "os" - "strconv" - "syscall" - "unsafe" -) - -func open() (pty, tty *os.File, err error) { - p, err := os.OpenFile("/dev/ptmx", os.O_RDWR, 0) - if err != nil { - return nil, nil, err - } - - sname, err := ptsname(p) - if err != nil { - return nil, nil, err - } - - err = unlockpt(p) - if err != nil { - return nil, nil, err - } - - t, err := os.OpenFile(sname, os.O_RDWR|syscall.O_NOCTTY, 0) - if err != nil { - return nil, nil, err - } - return p, t, nil -} - -func ptsname(f *os.File) (string, error) { - var n _C_uint - err := ioctl(f.Fd(), syscall.TIOCGPTN, uintptr(unsafe.Pointer(&n))) - if err != nil { - return "", err - } - return "/dev/pts/" + strconv.Itoa(int(n)), nil -} - -func unlockpt(f *os.File) error { - var u _C_int - // use TIOCSPTLCK with a zero valued arg to clear the slave pty lock - return ioctl(f.Fd(), syscall.TIOCSPTLCK, uintptr(unsafe.Pointer(&u))) -} diff --git a/vendor/github.com/kr/pty/pty_unsupported.go b/vendor/github.com/kr/pty/pty_unsupported.go deleted file mode 100644 index 898c7303c4..0000000000 --- a/vendor/github.com/kr/pty/pty_unsupported.go +++ /dev/null @@ -1,11 +0,0 @@ -// +build !linux,!darwin,!freebsd - -package pty - -import ( - "os" -) - -func open() (pty, tty *os.File, err error) { - return nil, nil, ErrUnsupported -} diff --git a/vendor/github.com/kr/pty/run.go b/vendor/github.com/kr/pty/run.go deleted file mode 100644 index c2bc48878c..0000000000 --- a/vendor/github.com/kr/pty/run.go +++ /dev/null @@ -1,32 +0,0 @@ -package pty - -import ( - "os" - "os/exec" - "syscall" -) - -// 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 -// corresponding pty. -func Start(c *exec.Cmd) (pty *os.File, err error) { - pty, tty, err := Open() - if err != nil { - return nil, err - } - defer tty.Close() - c.Stdout = tty - c.Stdin = tty - c.Stderr = tty - if c.SysProcAttr == nil { - c.SysProcAttr = &syscall.SysProcAttr{} - } - c.SysProcAttr.Setctty = true - c.SysProcAttr.Setsid = true - err = c.Start() - if err != nil { - pty.Close() - return nil, err - } - return pty, err -} diff --git a/vendor/github.com/kr/pty/types.go b/vendor/github.com/kr/pty/types.go deleted file mode 100644 index 5aecb6bcdc..0000000000 --- a/vendor/github.com/kr/pty/types.go +++ /dev/null @@ -1,10 +0,0 @@ -// +build ignore - -package pty - -import "C" - -type ( - _C_int C.int - _C_uint C.uint -) diff --git a/vendor/github.com/kr/pty/types_freebsd.go b/vendor/github.com/kr/pty/types_freebsd.go deleted file mode 100644 index ce3eb95181..0000000000 --- a/vendor/github.com/kr/pty/types_freebsd.go +++ /dev/null @@ -1,15 +0,0 @@ -// +build ignore - -package pty - -/* -#include -#include -*/ -import "C" - -const ( - _C_SPECNAMELEN = C.SPECNAMELEN /* max length of devicename */ -) - -type fiodgnameArg C.struct_fiodgname_arg diff --git a/vendor/github.com/kr/pty/util.go b/vendor/github.com/kr/pty/util.go deleted file mode 100644 index 67c52d06cd..0000000000 --- a/vendor/github.com/kr/pty/util.go +++ /dev/null @@ -1,35 +0,0 @@ -package pty - -import ( - "os" - "syscall" - "unsafe" -) - -// Getsize returns the number of rows (lines) and cols (positions -// in each line) in terminal t. -func Getsize(t *os.File) (rows, cols int, err error) { - var ws winsize - err = windowrect(&ws, t.Fd()) - return int(ws.ws_row), int(ws.ws_col), err -} - -type winsize struct { - ws_row uint16 - ws_col uint16 - ws_xpixel uint16 - ws_ypixel uint16 -} - -func windowrect(ws *winsize, fd uintptr) error { - _, _, errno := syscall.Syscall( - syscall.SYS_IOCTL, - fd, - syscall.TIOCGWINSZ, - uintptr(unsafe.Pointer(ws)), - ) - if errno != 0 { - return syscall.Errno(errno) - } - return nil -} diff --git a/vendor/github.com/kr/pty/ztypes_386.go b/vendor/github.com/kr/pty/ztypes_386.go deleted file mode 100644 index ff0b8fd838..0000000000 --- a/vendor/github.com/kr/pty/ztypes_386.go +++ /dev/null @@ -1,9 +0,0 @@ -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types.go - -package pty - -type ( - _C_int int32 - _C_uint uint32 -) diff --git a/vendor/github.com/kr/pty/ztypes_amd64.go b/vendor/github.com/kr/pty/ztypes_amd64.go deleted file mode 100644 index ff0b8fd838..0000000000 --- a/vendor/github.com/kr/pty/ztypes_amd64.go +++ /dev/null @@ -1,9 +0,0 @@ -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types.go - -package pty - -type ( - _C_int int32 - _C_uint uint32 -) diff --git a/vendor/github.com/kr/pty/ztypes_arm.go b/vendor/github.com/kr/pty/ztypes_arm.go deleted file mode 100644 index ff0b8fd838..0000000000 --- a/vendor/github.com/kr/pty/ztypes_arm.go +++ /dev/null @@ -1,9 +0,0 @@ -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types.go - -package pty - -type ( - _C_int int32 - _C_uint uint32 -) diff --git a/vendor/github.com/kr/pty/ztypes_arm64.go b/vendor/github.com/kr/pty/ztypes_arm64.go deleted file mode 100644 index 6c29a4b918..0000000000 --- a/vendor/github.com/kr/pty/ztypes_arm64.go +++ /dev/null @@ -1,11 +0,0 @@ -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types.go - -// +build arm64 - -package pty - -type ( - _C_int int32 - _C_uint uint32 -) diff --git a/vendor/github.com/kr/pty/ztypes_freebsd_386.go b/vendor/github.com/kr/pty/ztypes_freebsd_386.go deleted file mode 100644 index d9975374e3..0000000000 --- a/vendor/github.com/kr/pty/ztypes_freebsd_386.go +++ /dev/null @@ -1,13 +0,0 @@ -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types_freebsd.go - -package pty - -const ( - _C_SPECNAMELEN = 0x3f -) - -type fiodgnameArg struct { - Len int32 - Buf *byte -} diff --git a/vendor/github.com/kr/pty/ztypes_freebsd_amd64.go b/vendor/github.com/kr/pty/ztypes_freebsd_amd64.go deleted file mode 100644 index 5fa102fcdf..0000000000 --- a/vendor/github.com/kr/pty/ztypes_freebsd_amd64.go +++ /dev/null @@ -1,14 +0,0 @@ -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types_freebsd.go - -package pty - -const ( - _C_SPECNAMELEN = 0x3f -) - -type fiodgnameArg struct { - Len int32 - Pad_cgo_0 [4]byte - Buf *byte -} diff --git a/vendor/github.com/kr/pty/ztypes_freebsd_arm.go b/vendor/github.com/kr/pty/ztypes_freebsd_arm.go deleted file mode 100644 index d9975374e3..0000000000 --- a/vendor/github.com/kr/pty/ztypes_freebsd_arm.go +++ /dev/null @@ -1,13 +0,0 @@ -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types_freebsd.go - -package pty - -const ( - _C_SPECNAMELEN = 0x3f -) - -type fiodgnameArg struct { - Len int32 - Buf *byte -} diff --git a/vendor/github.com/kr/pty/ztypes_ppc64.go b/vendor/github.com/kr/pty/ztypes_ppc64.go deleted file mode 100644 index 4e1af84312..0000000000 --- a/vendor/github.com/kr/pty/ztypes_ppc64.go +++ /dev/null @@ -1,11 +0,0 @@ -// +build ppc64 - -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types.go - -package pty - -type ( - _C_int int32 - _C_uint uint32 -) diff --git a/vendor/github.com/kr/pty/ztypes_ppc64le.go b/vendor/github.com/kr/pty/ztypes_ppc64le.go deleted file mode 100644 index e6780f4e23..0000000000 --- a/vendor/github.com/kr/pty/ztypes_ppc64le.go +++ /dev/null @@ -1,11 +0,0 @@ -// +build ppc64le - -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types.go - -package pty - -type ( - _C_int int32 - _C_uint uint32 -) diff --git a/vendor/github.com/kr/pty/ztypes_s390x.go b/vendor/github.com/kr/pty/ztypes_s390x.go deleted file mode 100644 index a7452b61cb..0000000000 --- a/vendor/github.com/kr/pty/ztypes_s390x.go +++ /dev/null @@ -1,11 +0,0 @@ -// +build s390x - -// Created by cgo -godefs - DO NOT EDIT -// cgo -godefs types.go - -package pty - -type ( - _C_int int32 - _C_uint uint32 -)