]> Sergey Matveev's repositories - sgblog.git/commitdiff
Strip "From " from mail message v0.27.2
authorSergey Matveev <stargrave@stargrave.org>
Wed, 15 Mar 2023 12:17:21 +0000 (15:17 +0300)
committerSergey Matveev <stargrave@stargrave.org>
Wed, 15 Mar 2023 12:17:57 +0000 (15:17 +0300)
cmd/sgblog-comment-add/main.go
common.go

index f2e6016116a75251470f8f9a3e11efa34763fe05..5d6130aafc74ae4b1f92d0e3115ebecd0002ce63 100644 (file)
@@ -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)
        }
index 8b9f100a56679e715774dc8dc719fa4eb68006e4..7ea657c485a0a034d973b65631a02f80772a33cd 100644 (file)
--- 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"
 )