X-Git-Url: http://www.git.cypherpunks.ru/?p=gorecfile.git;a=blobdiff_plain;f=w.go;h=9057f8dbc33a33892098fd9bbb52345924489968;hp=4525222c1f2b69cd4c8d8d8b64d95b3fadb7ed32;hb=HEAD;hpb=9395de748e74e117bcc36d22e4223952d35bdc33 diff --git a/w.go b/w.go index 4525222..38fb2d7 100644 --- 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 - -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 . -*/ +// recfile -- GNU recutils'es recfiles parser on pure Go +// Copyright (C) 2020-2024 Sergey Matveev +// +// 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 . package recfile @@ -26,18 +24,23 @@ 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.TrimLeft(f.Value, " ") + "\n") + n, err = w.w.WriteString( + f.Name + ": " + backslashSpace(strings.TrimLeft(f.Value, " ")) + "\n", + ) written += n if err != nil { return @@ -48,13 +51,15 @@ 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.TrimLeft(lines[0], " ") + "\n") + n, err = w.w.WriteString( + name + ": " + backslashSpace(strings.TrimLeft(lines[0], " ")) + "\n", + ) written += n if err != nil { return } for _, l := range lines[1:] { - n, err = w.w.WriteString("+ " + l + "\n") + n, err = w.w.WriteString("+ " + backslashSpace(l) + "\n") written += n if err != nil { return