go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-12 17:27:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

edit: Fix how asyncReader writes to error channel.

Browse Source
This commit is contained in:
Qi Xiao 2016-02-21 18:12:51 +00:00
parent 34e4f68bc0
commit 0396de6b91
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
edit/async_reader.go
View File

@ -101,16 +101,15 @@ func (ar *AsyncReader) Run() {
// BUG(xiaq): AsyncReader relies on the undocumented fact // BUG(xiaq): AsyncReader relies on the undocumented fact
// that (*os.File).Read returns an *os.File.PathError // that (*os.File).Read returns an *os.File.PathError
patherr, ok := err.(*os.PathError) //.Err patherr, ok := err.(*os.PathError) //.Err
if !ok { if ok && patherr.Err == syscall.EWOULDBLOCK || patherr.Err == syscall.EAGAIN {
ar.errCh <- err
return
}
e := patherr.Err
if e == syscall.EWOULDBLOCK || e == syscall.EAGAIN {
break ReadRune break ReadRune
} else { } else {
ar.errCh <- err select {
return case ar.errCh <- err:
case <-ar.ctrlCh:
ar.rCtrl.Read(cBuf[:])
return
}
} }
} }
} }