Use the upstrea creack/pty instead of my own fork

In the meantime they added a Setsize function which seems to do the same thing as I was doing.
elisescu · Nov 25, 2022 · e0292cb · e0292cb
1 parent ef39dfc
commit e0292cb
Show file tree

Hide file tree

Showing 42 changed files with 642 additions and 163 deletions.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/elisescu/tty-share
 go 1.18
 
 require (
-	github.com/elisescu/pty v1.0.2
+	github.com/creack/pty v1.1.11
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/hashicorp/yamux v0.1.1

diff --git a/go.sum b/go.sum
@@ -1,11 +1,10 @@
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/elisescu/pty v1.0.2 h1:I/wkN5bnPyh00j/bnNAy8wll8yvd8wRLUjPnmcmYI+Q=
-github.com/elisescu/pty v1.0.2/go.mod h1:tzLUboZf84k7sFZdd2cOvhr/fSxMABV0UTMxnF25R/Y=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=

diff --git a/pty_master.go b/pty_master.go
@@ -7,7 +7,7 @@ import (
 	"syscall"
 	"time"
 
-	ptyDevice "github.com/elisescu/pty"
+	ptyDevice "github.com/creack/pty"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh/terminal"
 )
@@ -101,7 +101,11 @@ func (pty *ptyMaster) Read(b []byte) (int, error) {
 }
 
 func (pty *ptyMaster) SetWinSize(rows, cols int) {
-	ptyDevice.Setsize(pty.ptyFile, rows, cols)
+	winSize := ptyDevice.Winsize{
+		Rows: uint16(rows),
+		Cols: uint16(cols),
+	}
+	ptyDevice.Setsize(pty.ptyFile, &winSize)
 }
 
 func (pty *ptyMaster) Refresh() {

diff --git a/vendor/github.com/elisescu/pty/.gitignore → vendor/github.com/creack/pty/.gitignore b/vendor/github.com/elisescu/pty/.gitignore → vendor/github.com/creack/pty/.gitignore
diff --git a/vendor/github.com/creack/pty/Dockerfile.riscv b/vendor/github.com/creack/pty/Dockerfile.riscv
diff --git a/vendor/github.com/elisescu/pty/License → vendor/github.com/creack/pty/LICENSE b/vendor/github.com/elisescu/pty/License → vendor/github.com/creack/pty/LICENSE
diff --git a/vendor/github.com/creack/pty/README.md b/vendor/github.com/creack/pty/README.md
diff --git a/vendor/github.com/elisescu/pty/doc.go → vendor/github.com/creack/pty/doc.go b/vendor/github.com/elisescu/pty/doc.go → vendor/github.com/creack/pty/doc.go
diff --git a/vendor/github.com/elisescu/pty/ioctl.go → vendor/github.com/creack/pty/ioctl.go b/vendor/github.com/elisescu/pty/ioctl.go → vendor/github.com/creack/pty/ioctl.go
diff --git a/vendor/github.com/elisescu/pty/ioctl_bsd.go → vendor/github.com/creack/pty/ioctl_bsd.go b/vendor/github.com/elisescu/pty/ioctl_bsd.go → vendor/github.com/creack/pty/ioctl_bsd.go
diff --git a/vendor/github.com/creack/pty/ioctl_solaris.go b/vendor/github.com/creack/pty/ioctl_solaris.go
diff --git a/vendor/github.com/elisescu/pty/mktypes.bash → vendor/github.com/creack/pty/mktypes.bash b/vendor/github.com/elisescu/pty/mktypes.bash → vendor/github.com/creack/pty/mktypes.bash
diff --git a/vendor/github.com/elisescu/pty/pty_darwin.go → vendor/github.com/creack/pty/pty_darwin.go b/vendor/github.com/elisescu/pty/pty_darwin.go → vendor/github.com/creack/pty/pty_darwin.go
diff --git a/.../github.com/elisescu/pty/pty_dragonfly.go → ...or/github.com/creack/pty/pty_dragonfly.go b/.../github.com/elisescu/pty/pty_dragonfly.go → ...or/github.com/creack/pty/pty_dragonfly.go
diff --git a/...or/github.com/elisescu/pty/pty_freebsd.go → vendor/github.com/creack/pty/pty_freebsd.go b/...or/github.com/elisescu/pty/pty_freebsd.go → vendor/github.com/creack/pty/pty_freebsd.go
diff --git a/vendor/github.com/elisescu/pty/pty_linux.go → vendor/github.com/creack/pty/pty_linux.go b/vendor/github.com/elisescu/pty/pty_linux.go → vendor/github.com/creack/pty/pty_linux.go
diff --git a/vendor/github.com/creack/pty/pty_openbsd.go b/vendor/github.com/creack/pty/pty_openbsd.go