KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See if at least the field names are the same

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-18 16:12:03 +05:30
parent 43e93414ea
commit 9b703078dd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/utils/tty.go
View File

@ -132,7 +132,7 @@ func (self *Term) SetReadTimeout(d time.Duration) (err error) {
func (self *Term) ReadWithTimeout(b []byte, d time.Duration) (n int, err error) { func (self *Term) ReadWithTimeout(b []byte, d time.Duration) (n int, err error) {
var read, write, in_err unix.FdSet var read, write, in_err unix.FdSet
tv := unix.Timeval(syscall.NsecToTimeval(int64(d))) tv := NsecToTimeval(d)
read.Set(self.fd) read.Set(self.fd)
num_ready, err := unix.Select(self.fd, &read, &write, &in_err, &tv) num_ready, err := unix.Select(self.fd, &read, &write, &in_err, &tv)
if err != nil { if err != nil {
@ -174,6 +174,11 @@ func (t *Term) Write(b []byte) (int, error) {
return n, nil return n, nil
} }
func NsecToTimeval(d time.Duration) unix.Timeval {
nv := syscall.NsecToTimeval(int64(d))
return unix.Timeval{Sec: nv.Sec, Usec: nv.Usec}
}
func (self *Term) WriteAllWithTimeout(b []byte, d time.Duration) (n int, err error) { func (self *Term) WriteAllWithTimeout(b []byte, d time.Duration) (n int, err error) {
var read, write, in_err unix.FdSet var read, write, in_err unix.FdSet
var num_ready int var num_ready int
@ -182,12 +187,12 @@ func (self *Term) WriteAllWithTimeout(b []byte, d time.Duration) (n int, err err
if len(b) == 0 { if len(b) == 0 {
return return
} }
tv := unix.Timeval(syscall.NsecToTimeval(int64(d))) sysnv := NsecToTimeval(d)
read.Zero() read.Zero()
write.Zero() write.Zero()
in_err.Zero() in_err.Zero()
write.Set(self.fd) write.Set(self.fd)
num_ready, err = unix.Select(self.fd, &read, &write, &in_err, &tv) num_ready, err = unix.Select(self.fd, &read, &write, &in_err, &sysnv)
if err != nil { if err != nil {
n -= len(b) n -= len(b)
return return