From: Eric Wong <e@80x24.org>
Date: Sun, 26 Jun 2016 23:06:48 +0000 (+0000)
Subject: mda: drop leading "From " lines again
X-Git-Tag: v1.0.0~353
X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=commitdiff_plain;h=a0c07cba0e5d8b6a518e276e83477fd3892efaec

mda: drop leading "From " lines again

Oops...

While we're at it, drop blank lines before the "From ", too,
since it could happen.
---

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 <STDIN>;
-	$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 $/; <STDIN> };
+$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;