README | 2 +- w.go | 19 +++++++++++-------- diff --git a/README b/README index 9197bf147fa9556e0334b1982299c9e53aaeefd0ef070c6583270732ec12d9de..ba5acc5d63c4b08f105154675649e6543261b8bcaa7d4c48235c7af10d1e56d6 100644 --- a/README +++ b/README @@ -9,6 +9,6 @@ * support continuation lines (\$) and multilines (^+) Limitations: * leading spaces in the first line of the value are ignored -* trailing backslash at the end of lines is cut +* trailing backslash at the end of lines is followed by space It is free software: see the file COPYING for copying conditions. diff --git a/w.go b/w.go index 0f4b84203d3d7b13dba930651e85c77edbad427ab7dff54eb0bcbb0127df4a0c..84030cdf0b0c12ab0dfb4a0e10674629a3d400bfb9f2e63635abb5fa9b42910c 100644 --- a/w.go +++ b/w.go @@ -26,19 +26,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 +54,14 @@ 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