Bring --lines in line with wc

README.md

@@ -61,16 +61,6 @@ Run a slow command and count the number of bytes logged:
 slow-command | lwc --bytes
 ```
 
-## Caveats
-
-- The `--lines` option is currently implemented differently from `wc`'s. Where
-  `wc` will count the number of newline characters, `lwc` will count the actual
-  number of lines. Hence, if there is no newline at the end of its input, `lwc`
-  will still count the line, while `wc` won't.
-
-- While `lwc` is pretty fast, you'll still get better performance out of `wc`.
-  Benchmarks will be added at some point, but it's currently not a priority.
-
 ## JavaScript Version
 
 This utility briefly existed as a

internal/app/lwc/config.go

@@ -61,7 +61,7 @@ func (config *Config) Processors() []Processor {
 	var temp [5]Processor
 	i := 0
 	if config.Lines {
-		temp[i] = Processor{bufio.ScanLines, ScanCount}
+		temp[i] = Processor{lwcutil.SplitOnByte(LINE_FEED, true), ScanCount}
 		i++
 	}
 	if config.Words {

internal/app/lwc/output.go

@@ -9,9 +9,6 @@ import (
 )
 
 const COUNT_FORMAT string = "%8d"
-const CARRIAGE_RETURN byte = 13
-const LINE_FEED byte = 10
-const SPACE byte = 32
 
 func FormatCounts(counts *[]uint64, name string, cr bool, lf bool) *bytes.Buffer {
 	buf := new(bytes.Buffer)

internal/app/lwc/runes.go

@@ -0,0 +1,5 @@
+package lwc
+
+const CARRIAGE_RETURN byte = 13
+const LINE_FEED byte = 10
+const SPACE byte = 32

internal/pkg/lwcutil/chan.go

@@ -28,7 +28,7 @@ func NewFilesChanFromSlice(values []string) *chan string {
 func NewFilesChanFromReader(reader io.Reader, separator byte) *chan string {
 	c := make(chan string)
 	scanner := bufio.NewScanner(reader)
-	scanner.Split(SplitOnByte(0))
+	scanner.Split(SplitOnByte(0, false))
 	go func() {
 		for scanner.Scan() {
 			name := scanner.Text()

internal/pkg/lwcutil/scan.go

@@ -5,15 +5,15 @@ import (
 	"bytes"
 )
 
-func SplitOnByte(b byte) bufio.SplitFunc {
+func SplitOnByte(b byte, requireEnd bool) bufio.SplitFunc {
 	return func(data []byte, atEOF bool) (advance int, token []byte, err error) {
 		if atEOF && len(data) == 0 {
 			return 0, nil, nil
 		}
 		if i := bytes.IndexByte(data, b); i >= 0 {
 			return i + 1, data[0:i], nil
 		}
-		if atEOF {
+		if atEOF && !requireEnd {
 			return len(data), data, nil
 		}
 		return 0, nil, nil