[PATCH 2/2] mailinfo: Understand forwarded patches
- From
- Matthew Wilcox <mawilcox@linuxonhyperv.com>
- Date
- Jan 12, 2017, 09:20 UTC
- Message-ID
- <1484212824-14108-2-git-send-email-mawilcox@linuxonhyperv.com>
- In-Reply-To
- <1484212824-14108-1-git-send-email-mawilcox@linuxonhyperv.com>
From: Matthew Wilcox <mawilcox@microsoft.com>
Extend the --scissors mechanism to strip off the preamble created by forwarding a patch. There are a couple of extra headers ("Sent" and "To") added by forwarding, but other than that, the --scissors option will now remove patches forwarded from Microsoft Outlook to a Linux email account.
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com> --- mailinfo.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/mailinfo.c b/mailinfo.c index 2059704a8..fc1275532 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -332,7 +332,7 @@ static void cleanup_subject(struct mailinfo *mi, struct strbuf *subject) #define MAX_HDR_PARSED 10 static const char *header[MAX_HDR_PARSED] = { - "From","Subject","Date", + "From","Subject","Date","Sent","To", }; static inline int cmp_header(const struct strbuf *line, const char *hdr) @@ -685,6 +685,13 @@ static int is_scissors_line(const char *line) c++; continue; } + if (!memcmp(c, "Original Message", 16)) { + in_perforation = 1; + perforation += 16; + scissors += 16; + c += 15; + continue; + } in_perforation = 0; }
-- 2.11.0