[PATCH] mda: drop leading "From " lines again

[Eric Wong <e@80x24.org>]

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(-)

diff --git a/script/public-inbox-learn b/script/public-inbox-learn
index 7ef2a31..09fd7c8 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 f739ad0..d76f33a 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;