tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug with bad message "From " delimiter detection

Browse Source
This commit is contained in:
dockes 2006-12-07 08:06:54 +00:00
parent b9b6a871ca
commit 9c32ef4f16
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/internfile/mh_mail.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
/* /*
* This program is free software; you can redistribute it and/or modify * 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; 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 regex_t fromregex;
static bool regcompiled; static bool regcompiled;
@ -153,7 +153,7 @@ MimeHandlerMail::processmbox(const string &fn, Rcl::Doc &docout, string& ipath)
// another return code here // another return code here
return MimeHandler::MHError; return MimeHandler::MHError;
} }
if (line[0] == '\n') { if (line[0] == '\n' || line[0] == '\r') {
hademptyline = true; hademptyline = true;
continue; continue;
} }
@ -179,7 +179,7 @@ MimeHandlerMail::processmbox(const string &fn, Rcl::Doc &docout, string& ipath)
if (mtarg <= 0 || m_msgnum == mtarg) { if (mtarg <= 0 || m_msgnum == mtarg) {
msgtxt += line; msgtxt += line;
} }
if (line[0] == '\n') { if (line[0] == '\n' || line[0] == '\r') {
hademptyline = true; hademptyline = true;
} else { } else {
hademptyline = false; hademptyline = false;