Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2024-11-18 02:55:11 +00:00
Code Issues Projects Releases Wiki Activity

Do not trim CR on Windows when --read0 is set

Browse Source
This commit is contained in:
Junegunn Choi 2024-04-04 23:39:29 +09:00
parent 9b9ad77e1c
commit 68a35e4735
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/reader.go
View File

@ -127,8 +127,10 @@ func (r *Reader) feed(src io.Reader) {
*/ */
delim := byte('\n') delim := byte('\n')
trimCR := util.IsWindows()
if r.delimNil { if r.delimNil {
delim = '\000' delim = '\000'
trimCR = false
} }
slab := make([]byte, readerSlabSize) slab := make([]byte, readerSlabSize)
@ -157,7 +159,7 @@ func (r *Reader) feed(src io.Reader) {
// Found the delimiter // Found the delimiter
slice := buf[:i+1] slice := buf[:i+1]
buf = buf[i+1:] buf = buf[i+1:]
if util.IsWindows() && len(slice) >= 2 && slice[len(slice)-2] == byte('\r') { if trimCR && len(slice) >= 2 && slice[len(slice)-2] == byte('\r') {
slice = slice[:len(slice)-2] slice = slice[:len(slice)-2]
} else { } else {
slice = slice[:len(slice)-1] slice = slice[:len(slice)-1]