X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=mailinfo.c;h=5b6c2157ede415e019099098f2d0dc522b1e7a27;hb=b8c92caddac61e556254bf93c3a4bd744de94320;hp=88f9fbb198a7343715fb01c64c72044a7abaedab;hpb=51937e533a39078a6d440b8a0b89bb491061c80b;p=git.git

diff --git a/mailinfo.c b/mailinfo.c
index 88f9fbb1..5b6c2157 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -240,11 +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 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;
+		}
+	}
 	if (!memcmp("From:", line, 5) && isspace(line[5])) {
 		if (!(*seen & SEEN_FROM) && handle_from(line+6)) {
 			*seen |= SEEN_FROM;