From: Michael S. Tsirkin Date: Thu, 07 Apr 2016 15:23:13 GMT Subject: [PATCH 3/4] builtin/am: read mailinfo from file Message-ID: <1460042563-32741-4-git-send-email-mst@redhat.com> In-Reply-To: <1460042563-32741-1-git-send-email-mst@redhat.com> Slightly slower, but will allow easy additional processing on it. Signed-off-by: Michael S. Tsirkin --- builtin/am.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/builtin/am.c b/builtin/am.c index d003939..4180b04 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1246,6 +1246,7 @@ static int parse_mail(struct am_state *state, const char *mail) FILE *fp; struct strbuf sb = STRBUF_INIT; struct strbuf msg = STRBUF_INIT; + struct strbuf log_msg = STRBUF_INIT; struct strbuf author_name = STRBUF_INIT; struct strbuf author_date = STRBUF_INIT; struct strbuf author_email = STRBUF_INIT; @@ -1330,7 +1331,12 @@ static int parse_mail(struct am_state *state, const char *mail) } strbuf_addstr(&msg, "\n\n"); - strbuf_addbuf(&msg, &mi.log_message); + + if (strbuf_read_file(&log_msg, am_path(state, "msg"), 0) < 0) { + die_errno(_("could not read '%s'"), am_path(state, "msg")); + } + + strbuf_addbuf(&msg, &log_msg); strbuf_stripspace(&msg, 0); if (state->signoff) @@ -1349,6 +1355,7 @@ static int parse_mail(struct am_state *state, const char *mail) state->msg = strbuf_detach(&msg, &state->msg_len); finish: + strbuf_release(&log_msg); strbuf_release(&msg); strbuf_release(&author_date); strbuf_release(&author_email); -- MST