From 9c32ef4f1644f515df6b343da79d39b69ea7fd5a Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Thu, 7 Dec 2006 08:06:54 +0000
Subject: [PATCH] fix bug with bad message "From " delimiter detection

---
 src/internfile/mh_mail.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/internfile/mh_mail.cpp b/src/internfile/mh_mail.cpp
index a5faa1fa..65ff74e2 100644
--- a/src/internfile/mh_mail.cpp
+++ b/src/internfile/mh_mail.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.22 2006-12-07 07:06:28 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.23 2006-12-07 08:06:20 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -94,7 +94,7 @@ MimeHandlerMail::mkDoc(RclConfig *cnf, const string &fn,
 	return MimeHandler::MHError;
 }
 
-static const  char *frompat = "^From .* [1-2][0-9][0-9][0-9]\n$";
+static const  char *frompat = "^From .* [1-2][0-9][0-9][0-9][\r]*\n$";
 static regex_t fromregex;
 static bool regcompiled;
 
@@ -153,7 +153,7 @@ MimeHandlerMail::processmbox(const string &fn, Rcl::Doc &docout, string& ipath)
 		// another return code here
 		return MimeHandler::MHError;
 	    }
-	    if (line[0] == '\n') {
+	    if (line[0] == '\n' || line[0] == '\r') {
 		hademptyline = true;
 		continue;
 	    }
@@ -179,7 +179,7 @@ MimeHandlerMail::processmbox(const string &fn, Rcl::Doc &docout, string& ipath)
 	    if (mtarg <= 0 || m_msgnum == mtarg) {
 		msgtxt += line;
 	    }
-	    if (line[0] == '\n') {
+	    if (line[0] == '\n' || line[0] == '\r') {
 		hademptyline = true;
 	    } else {
 		hademptyline = false;