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 <junkio@cox.net>
This commit is contained in:
parent
d5e3d60c20
commit
81c5cf7865
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user