X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=scripts%2Fssoma-replay;h=071214230ac42a9b1bb1ce7e79e54d986d898892;hb=a479b45117ed69d9311770fa39e6676d38f9cab2;hp=50bf45604b19aa7acefba902ebde6c86015bb304;hpb=23d896234f3eb5e579de2e8ddf3c723654862ade;p=public-inbox.git

diff --git a/scripts/ssoma-replay b/scripts/ssoma-replay
index 50bf4560..07121423 100755
--- a/scripts/ssoma-replay
+++ b/scripts/ssoma-replay
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2015-2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # A work-in-progress, but one day I hope this script is no longer
@@ -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,