X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=w.go;h=32ee966c1e22e14454866f5366c08ff3ac304d25;hb=a24ce24d791284ed7ded63fc824c1c4e239d6d6d;hp=9057f8dbc33a33892098fd9bbb52345924489968;hpb=bc8cebaebde70164a86c00ec5ead3693513cc924;p=gorecfile.git diff --git a/w.go b/w.go index 9057f8d..32ee966 100644 --- a/w.go +++ b/w.go @@ -1,6 +1,6 @@ /* recfile -- GNU recutils'es recfiles parser on pure Go -Copyright (C) 2020-2022 Sergey Matveev +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 @@ -37,7 +37,9 @@ func (w *Writer) RecordStart() (written int, err error) { 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 + ": " + strings.TrimRight(strings.TrimLeft(f.Value, " "), "\\") + "\n", + ) written += n if err != nil { return @@ -48,13 +50,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 + ": " + strings.TrimRight(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("+ " + strings.TrimRight(l, "\\") + "\n") written += n if err != nil { return