fix line count for files that don't end in a newline
This commit is contained in:
parent
239d5b2dfa
commit
584243d358
1 changed files with 8 additions and 0 deletions
|
@ -45,15 +45,23 @@ func (d *deps) listFiles(files []git.NiceTree, data map[string]any, w http.Respo
|
|||
|
||||
func countLines(r io.Reader) (int, error) {
|
||||
buf := make([]byte, 32*1024)
|
||||
bufLen := 0
|
||||
count := 0
|
||||
nl := []byte{'\n'}
|
||||
|
||||
for {
|
||||
c, err := r.Read(buf)
|
||||
if c > 0 {
|
||||
bufLen += c
|
||||
}
|
||||
count += bytes.Count(buf[:c], nl)
|
||||
|
||||
switch {
|
||||
case err == io.EOF:
|
||||
/* handle last line not having a newline at the end */
|
||||
if bufLen >= 1 && buf[bufLen-1] != '\n' {
|
||||
count++
|
||||
}
|
||||
return count, nil
|
||||
case err != nil:
|
||||
return 0, err
|
||||
|
|
Loading…
Reference in a new issue