about summary refs log tree commit homepage
path: root/lib/PublicInbox/Spamcheck/Spamc.pm
diff options
context:
space:
mode:
authorEric Wong <e@yhbt.net>2020-05-19 22:45:32 +0000
committerEric Wong <e@yhbt.net>2020-05-20 23:58:16 +0000
commitd4e0a141a691e25ca085660c4caca59b05a7827b (patch)
tree5775a5f0ab7dddf491bb844f3f76d8c5fefc139a /lib/PublicInbox/Spamcheck/Spamc.pm
parent6eb84d273eea3943ceb7e138cdfd17c83ade410f (diff)
downloadpublic-inbox-d4e0a141a691e25ca085660c4caca59b05a7827b.tar.gz
The <EXPR> perlop, `readline', and `read' functions will all
retry on EINTR, so there's no need to retry and loop ourselves
with `sysread'.
Diffstat (limited to 'lib/PublicInbox/Spamcheck/Spamc.pm')
-rw-r--r--lib/PublicInbox/Spamcheck/Spamc.pm10
1 files changed, 1 insertions, 9 deletions
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;