diff options
| author | Michael Kelley <michael.kelley@here.com> | 2016-10-23 20:45:45 -0700 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2016-11-07 02:32:14 +0900 |
| commit | 26895da96918f9b1956a04981c8af5f3e42fcbd8 (patch) | |
| tree | 189b7c8f639bda4f8d4e5aee838e59be48c69044 /src/reader.go | |
| parent | 0c573b3dffe806253e1df2447754a5f3939a11f0 (diff) | |
| download | fzf-26895da96918f9b1956a04981c8af5f3e42fcbd8.tar.gz | |
Implement tcell-based renderer
Diffstat (limited to 'src/reader.go')
| -rw-r--r-- | src/reader.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/reader.go b/src/reader.go index 05426660..15a0f44e 100644 --- a/src/reader.go +++ b/src/reader.go @@ -4,6 +4,7 @@ import ( "bufio" "io" "os" + "runtime" "github.com/junegunn/fzf/src/util" ) @@ -39,9 +40,15 @@ func (r *Reader) feed(src io.Reader) { // ReadBytes returns err != nil if and only if the returned data does not // end in delim. bytea, err := reader.ReadBytes(delim) + byteaLen := len(bytea) if len(bytea) > 0 { if err == nil { - bytea = bytea[:len(bytea)-1] + // get rid of carriage return if under Windows: + if runtime.GOOS == "windows" && byteaLen >= 2 && bytea[byteaLen-2] == byte('\r') { + bytea = bytea[:byteaLen-2] + } else { + bytea = bytea[:byteaLen-1] + } } if r.pusher(bytea) { r.eventBox.Set(EvtReadNew, nil) |