From 00697236a70818ad3a37f52f9baec382cb1b9b7e Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Wed, 15 Mar 2023 15:17:21 +0300 Subject: [PATCH] Strip "From " from mail message --- cmd/sgblog-comment-add/main.go | 9 ++++++++- common.go | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go index f2e6016..5d6130a 100644 --- a/cmd/sgblog-comment-add/main.go +++ b/cmd/sgblog-comment-add/main.go @@ -95,7 +95,14 @@ func main() { } syscall.Umask(int(umaskInt)) - msg, err := mail.ReadMessage(os.Stdin) + data, err := io.ReadAll(os.Stdin) + if err != nil { + log.Fatal(err) + } + if bytes.HasPrefix(data, []byte("From ")) { + data = data[bytes.Index(data, []byte("\n"))+1:] + } + msg, err := mail.ReadMessage(bytes.NewReader(data)) if err != nil { log.Fatal(err) } diff --git a/common.go b/common.go index 8b9f100..7ea657c 100644 --- a/common.go +++ b/common.go @@ -15,7 +15,7 @@ import ( ) const ( - Version = "0.27.1" + Version = "0.27.2" WhenFmt = "2006-01-02 15:04:05Z07:00" ) -- 2.44.0