From: Junio C Hamano <junkio@cox.net>
Date: Sun, 28 May 2006 20:39:05 +0000 (-0700)
Subject: Merge branch 'jc/mailinfo'
X-Git-Tag: v1.4.0-rc1~48
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d177e584255aad351bbbff14aba8e73afc008c75;p=git.git

Merge branch 'jc/mailinfo'

* jc/mailinfo:
  mailinfo: skip bogus UNIX From line inside body
---

d177e584255aad351bbbff14aba8e73afc008c75
diff --cc mailinfo.c
index 88f9fbb19,a133e6d08..5b6c2157e
--- a/mailinfo.c
+++ b/mailinfo.c
@@@ -240,11 -237,17 +240,18 @@@ static int eatspace(char *line
  #define SEEN_FROM 01
  #define SEEN_DATE 02
  #define SEEN_SUBJECT 04
- #define SEEN_PREFIX  0x08
+ #define SEEN_BOGUS_UNIX_FROM 010
++#define SEEN_PREFIX  020
  
  /* First lines of body can have From:, Date:, and Subject: */
 -static int handle_inbody_header(int *seen, char *line)
 +static void 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;
++			return;
+ 		}
+ 	}
  	if (!memcmp("From:", line, 5) && isspace(line[5])) {
  		if (!(*seen & SEEN_FROM) && handle_from(line+6)) {
  			*seen |= SEEN_FROM;