From: Eric Wong <e@80x24.org>
Date: Thu, 9 Nov 2023 10:09:44 +0000 (+0000)
Subject: xapcmd: get rid of scalar wantarray popen_rd
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e82342c911eeb91a4f50a5392d197c83ef15a07c;p=thirdparty%2Fpublic-inbox.git

xapcmd: get rid of scalar wantarray popen_rd

We can rely on Process::IO->attached_pid and work towards
simplifying popen_rd.
---

diff --git a/lib/PublicInbox/Xapcmd.pm b/lib/PublicInbox/Xapcmd.pm
index c2b66e69d..69f0af432 100644
--- a/lib/PublicInbox/Xapcmd.pm
+++ b/lib/PublicInbox/Xapcmd.pm
@@ -329,8 +329,8 @@ sub progress_pfx ($) {
 }
 
 sub kill_compact { # setup_signals callback
-	my ($sig, $pidref) = @_;
-	kill($sig, $$pidref) if defined($$pidref);
+	my ($sig, $ioref) = @_;
+	kill($sig, $$ioref->attached_pid // return) if defined($$ioref);
 }
 
 # xapian-compact wrapper
@@ -358,18 +358,16 @@ sub compact ($$) { # cb_spawn callback
 	}
 	$pr->("$pfx `".join(' ', @$cmd)."'\n") if $pr;
 	push @$cmd, $src, $dst;
-	my ($rd, $pid);
 	local @SIG{keys %SIG} = values %SIG;
-	setup_signals(\&kill_compact, \$pid);
-	($rd, $pid) = popen_rd($cmd, undef, $rdr);
+	setup_signals(\&kill_compact, \my $rd);
+	$rd = popen_rd($cmd, undef, $rdr);
 	while (<$rd>) {
 		if ($pr) {
 			s/\r/\r$pfx /g;
 			$pr->("$pfx $_");
 		}
 	}
-	waitpid($pid, 0);
-	die "@$cmd failed: \$?=$?\n" if $?;
+	$rd->close or die "@$cmd failed: \$?=$?\n";
 }
 
 sub cpdb_loop ($$$;$$) {