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 7ef2a312744c97f89de32a74ee8df4867a1ee142..09fd7c8f43409865471acbe481a82ad149b43ebd 100755 (executable)
--- 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 f739ad0645e99f160c16b940935517fe616e295e..d76f33a81ade85826a09378e7988f248043b31bd 100755 (executable)
--- 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;