From a0c07cba0e5d8b6a518e276e83477fd3892efaec Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 26 Jun 2016 23:06:48 +0000 Subject: mda: drop leading "From " lines again Oops... While we're at it, drop blank lines before the "From ", too, since it could happen. --- script/public-inbox-learn | 2 +- script/public-inbox-mda | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'script') diff --git a/script/public-inbox-learn b/script/public-inbox-learn index 7ef2a312..09fd7c8f 100755 --- a/script/public-inbox-learn +++ b/script/public-inbox-learn @@ -26,7 +26,7 @@ my $err; my $mime = Email::MIME->new(eval { local $/; my $data = scalar ; - $data =~ s/\AFrom [^\r\n]*\r?\n//s; + $data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; eval { if ($train eq 'ham') { $spamc->hamlearn(\$data); diff --git a/script/public-inbox-mda b/script/public-inbox-mda index f739ad06..d76f33a8 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -32,6 +32,7 @@ use PublicInbox::Spamcheck::Spamc; my $emergency = $ENV{PI_EMERGENCY} || "$ENV{HOME}/.public-inbox/emergency/"; $ems = PublicInbox::Emergency->new($emergency); my $str = eval { local $/; }; +$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; $ems->prepare(\$str); my $simple = Email::Simple->new(\$str); my $config = PublicInbox::Config->new; -- cgit v1.2.3-24-ge0c7