Rename CROrLFLines function

Author: retrixe

app/execflash.go

@@ -88,7 +88,7 @@ func CopyConvert(iff string, of string) (chan DdProgress, io.WriteCloser, error)
 	go (func() {
 		phase := "Phase Unknown"
 		scanner := bufio.NewScanner(output)
-		scanner.Split(ScanCRLFLines)
+		scanner.Split(ScanCROrLFLines)
 		for scanner.Scan() {
 			text := scanner.Text()
 			println(text)
@@ -122,35 +122,37 @@ func CopyConvert(iff string, of string) (chan DdProgress, io.WriteCloser, error)
 	return channel, stdin, nil
 }
 
-// dropCRLF drops a terminal \r or \n from the data.
-func dropCRLF(data []byte) []byte {
+// dropCROrLF drops a terminal \r or \n from the data.
+func dropCROrLF(data []byte) []byte {
 	// FIXME: Write unit tests
 	if len(data) > 0 && (data[len(data)-1] == '\r' || data[len(data)-1] == '\n') {
 		return data[0 : len(data)-1]
 	}
 	return data
 }
 
-// ScanCRLFLines is a split function for a Scanner that returns each line of
+// ScanCROrLFLines is a split function for a Scanner that returns each line of
 // text, stripped of any trailing end-of-line marker. The returned line may
 // be empty. The end-of-line marker is one carriage return or one mandatory
 // newline. In regular expression notation, it is `\r|\n`. The last
 // non-empty line of input will be returned even if it has no newline.
-func ScanCRLFLines(data []byte, atEOF bool) (advance int, token []byte, err error) {
+//
+// Modified from [bufio.ScanLines] to support \r as a line terminator on its own.
+func ScanCROrLFLines(data []byte, atEOF bool) (advance int, token []byte, err error) {
 	// FIXME: Write unit tests
 	if atEOF && len(data) == 0 {
 		return 0, nil, nil
 	}
 	if i := bytes.IndexByte(data, '\n'); i >= 0 {
 		// We have a full newline-terminated line.
-		return i + 1, dropCRLF(data[0:i]), nil
+		return i + 1, dropCROrLF(data[0:i]), nil
 	} else if i := bytes.IndexByte(data, '\r'); i >= 0 {
 		// We have a full carriage return-terminated line.
-		return i + 1, dropCRLF(data[0:i]), nil
+		return i + 1, dropCROrLF(data[0:i]), nil
 	}
 	// If we're at EOF, we have a final, non-terminated line. Return it.
 	if atEOF {
-		return len(data), dropCRLF(data), nil
+		return len(data), dropCROrLF(data), nil
 	}
 	// Request more data.
 	return 0, nil, nil