From: Junio C Hamano Date: Mon, 22 May 2006 00:15:06 +0000 (-0700) Subject: mailinfo: skip bogus UNIX From line inside body X-Git-Tag: v1.4.0-rc1~48^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=81c5cf786581c82a8834726ffef26b7def96bf35;p=git.git mailinfo: skip bogus UNIX From line inside body Sometimes people just include the whole format-patch output in the commit e-mail. Detect it and skip the bogus ">From " line. Signed-off-by: Junio C Hamano --- diff --git a/mailinfo.c b/mailinfo.c index b27651935..a133e6d08 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -237,10 +237,17 @@ static int eatspace(char *line) #define SEEN_FROM 01 #define SEEN_DATE 02 #define SEEN_SUBJECT 04 +#define SEEN_BOGUS_UNIX_FROM 010 /* First lines of body can have From:, Date:, and Subject: */ static int handle_inbody_header(int *seen, char *line) { + if (!memcmp(">From", line, 5) && isspace(line[5])) { + if (!(*seen & SEEN_BOGUS_UNIX_FROM)) { + *seen |= SEEN_BOGUS_UNIX_FROM; + return 1; + } + } if (!memcmp("From:", line, 5) && isspace(line[5])) { if (!(*seen & SEEN_FROM) && handle_from(line+6)) { *seen |= SEEN_FROM;