Unify copyright comment format

[gorecfile.git] / w.go

diff --git a/w.go b/w.go
index 32ee966c1e22e14454866f5366c08ff3ac304d25..38fb2d7c4de17531e8813eb22f376bab66caf4d5 100644 (file)
--- a/w.go
+++ b/w.go
@@ -1,19 +1,17 @@
-/*
-recfile -- GNU recutils'es recfiles parser on pure Go
-Copyright (C) 2020-2023 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
 
@@ -26,19 +24,22 @@ type Writer struct {
        w io.StringWriter
 }
 
-func NewWriter(w io.StringWriter) *Writer {
-       return &Writer{w}
-}
+func NewWriter(w io.StringWriter) *Writer { return &Writer{w} }
+
+func (w *Writer) RecordStart() (written int, err error) { return w.w.WriteString("\n") }
 
-func (w *Writer) RecordStart() (written int, err error) {
-       return w.w.WriteString("\n")
+func backslashSpace(s string) string {
+       if strings.HasSuffix(s, "\\") {
+               return s + " "
+       }
+       return s
 }
 
 func (w *Writer) WriteFields(fs ...Field) (written int, err error) {
        var n int
        for _, f := range fs {
                n, err = w.w.WriteString(
-                       f.Name + ": " + strings.TrimRight(strings.TrimLeft(f.Value, " "), "\\") + "\n",
+                       f.Name + ": " + backslashSpace(strings.TrimLeft(f.Value, " ")) + "\n",
                )
                written += n
                if err != nil {
@@ -51,14 +52,14 @@ func (w *Writer) WriteFields(fs ...Field) (written int, err error) {
 func (w *Writer) WriteFieldMultiline(name string, lines []string) (written int, err error) {
        var n int
        n, err = w.w.WriteString(
-               name + ": " + strings.TrimRight(strings.TrimLeft(lines[0], " "), "\\") + "\n",
+               name + ": " + backslashSpace(strings.TrimLeft(lines[0], " ")) + "\n",
        )
        written += n
        if err != nil {
                return
        }
        for _, l := range lines[1:] {
-               n, err = w.w.WriteString("+ " + strings.TrimRight(l, "\\") + "\n")
+               n, err = w.w.WriteString("+ " + backslashSpace(l) + "\n")
                written += n
                if err != nil {
                        return