favor `do {}' over `eval {}' for localized slurp

[public-inbox.git] / scripts / ssoma-replay

diff --git a/scripts/ssoma-replay b/scripts/ssoma-replay
index 46b15d7eb185d26d98304424fc33567dcdda2e34..071214230ac42a9b1bb1ce7e79e54d986d898892 100755 (executable)
--- a/scripts/ssoma-replay
+++ b/scripts/ssoma-replay
@@ -30,10 +30,7 @@ use Email::Simple;
 use URI::Escape qw/uri_escape_utf8/;
 use File::Temp qw/tempfile/;
 my ($fh, $filename) = tempfile('ssoma-replay-XXXXXXXX', TMPDIR => 1);
-my $msg = eval {
-       local $/;
-       Email::Simple->new(<STDIN>);
-};
+my $msg = Email::Simple->new(do { local $/; <STDIN> });
 select $fh;
 
 # Note: the archive URL makes assumptions about where the
@@ -52,7 +49,7 @@ if (defined $list_id) {
        if (defined $domain) {
                $archive_url = "https://$domain/$user/";
                my $mid = $header_obj->header('Message-Id');
-               if ($mid =~ /\A<(.+)>\z/) {
+               if ($mid =~ /<[ \t]*([^>]+)?[ \t]*>/s) {
                        $mid = $1;
                }
                $mid = uri_escape_utf8($mid,