Unify copyright comment format

[gorecfile.git] / r.go

diff --git a/r.go b/r.go
index 483fc2a67cb830076a5cbb69c2b7a539ed959f1a..a16f8477ea68ad9231679a1f2a7339ffb0140149 100644 (file)
--- a/r.go
+++ b/r.go
@@ -1,19 +1,17 @@
-/*
-recfile -- GNU recutils'es recfiles parser on pure Go
-Copyright (C) 2020-2022 Sergey Matveev <stargrave@stargrave.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// recfile -- GNU recutils'es recfiles parser on pure Go
+// Copyright (C) 2020-2024 Sergey Matveev <stargrave@stargrave.org>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package recfile
 
@@ -21,12 +19,9 @@ import (
        "bufio"
        "errors"
        "io"
-       "regexp"
        "strings"
 )
 
-var KeyValRe = regexp.MustCompile(`([a-zA-Z%][a-zA-Z0-9_]*):\s*(.*)$`)
-
 type Reader struct {
        scanner *bufio.Scanner
 }
@@ -37,6 +32,31 @@ func NewReader(r io.Reader) *Reader {
        return &Reader{bufio.NewScanner(r)}
 }
 
+func getKeyValue(text string) (string, string) {
+       cols := strings.SplitN(text, ":", 2)
+       if len(cols) != 2 {
+               return "", ""
+       }
+       k := cols[0]
+       if len(k) == 0 {
+               return "", ""
+       }
+       if !((k[0] == '%') ||
+               ('a' <= k[0] && k[0] <= 'z') ||
+               ('A' <= k[0] && k[0] <= 'Z')) {
+               return "", ""
+       }
+       for _, c := range k[1:] {
+               if !((c == '_') ||
+                       ('a' <= c && c <= 'z') ||
+                       ('A' <= c && c <= 'Z') ||
+                       ('0' <= c && c <= '9')) {
+                       return "", ""
+               }
+       }
+       return k, strings.TrimPrefix(cols[1], " ")
+}
+
 // Get next record. Each record is just a collection of fields. io.EOF
 // is returned if there is nothing to read more.
 func (r *Reader) Next() ([]Field, error) {
@@ -58,7 +78,9 @@ func (r *Reader) Next() ([]Field, error) {
                text = r.scanner.Text()
 
                if continuation {
-                       if text[len(text)-1] == '\\' {
+                       if len(text) == 0 {
+                               continuation = false
+                       } else if text[len(text)-1] == '\\' {
                                lines = append(lines, text[:len(text)-1])
                        } else {
                                lines = append(lines, text)
@@ -94,12 +116,10 @@ func (r *Reader) Next() ([]Field, error) {
                        break
                }
 
-               matches := KeyValRe.FindStringSubmatch(text)
-               if len(matches) == 0 {
+               name, line = getKeyValue(text)
+               if name == "" {
                        return fields, errors.New("invalid field format")
                }
-               name = matches[1]
-               line = matches[2]
 
                if len(line) > 0 && line[len(line)-1] == '\\' {
                        continuation = true