From: Eric Wong <e@yhbt.net>
Date: Tue, 19 May 2020 22:45:32 +0000 (+0000)
Subject: spamcheck/spamc: use localized slurp to read from spamc
X-Git-Tag: v1.6.0~493
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=d4e0a141a691e25ca085660c4caca59b05a7827b;p=public-inbox.git

spamcheck/spamc: use localized slurp to read from spamc

The <EXPR> perlop, `readline', and `read' functions will all
retry on EINTR, so there's no need to retry and loop ourselves
with `sysread'.
---

diff --git a/lib/PublicInbox/Spamcheck/Spamc.pm b/lib/PublicInbox/Spamcheck/Spamc.pm
index b6098669..3ba2c3c9 100644
--- a/lib/PublicInbox/Spamcheck/Spamc.pm
+++ b/lib/PublicInbox/Spamcheck/Spamc.pm
@@ -23,19 +23,11 @@ sub spamcheck {
 
 	my $rdr = { 0 => _msg_to_fh($self, $msg) };
 	my ($fh, $pid) = popen_rd($self->{checkcmd}, undef, $rdr);
-	my $r;
 	unless (ref $out) {
 		my $buf = '';
 		$out = \$buf;
 	}
-again:
-	do {
-		$r = sysread($fh, $$out, 65536, length($$out));
-	} while (defined($r) && $r != 0);
-	unless (defined $r) {
-		goto again if $!{EINTR};
-		die "read failed: $!";
-	}
+	$$out = do { local $/; <$fh> };
 	close $fh or die "close failed: $!";
 	waitpid($pid, 0);
 	($? || $$out eq '') ? 0 : 1;