From: Eric Wong <e@80x24.org>
Date: Wed, 22 Nov 2023 00:13:31 +0000 (+0000)
Subject: lei_to_mail: don't close STDOUT unless it is a mbox* output
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b64ce2044b0a9413855ad63ded4ddc9433e4ea9b;p=thirdparty%2Fpublic-inbox.git

lei_to_mail: don't close STDOUT unless it is a mbox* output

We only care about error checking when stdout is an mbox output
pointed to a pathname.  This is noticeable with `lei up' with
multiple non-mbox* destinations.  We'll also ensure throwing
exceptions to trigger lei->x_it from lei->do_env results in the
epoll/kqueue watch being discarded, otherwise commands may never
terminate (leading to stuck tests)
---

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 8d235b372..86b71fcd6 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -493,6 +493,7 @@ sub x_it ($$) {
 	} elsif ($quit == \&CORE::exit) { # an admin (one-shot) command
 		exit($code >> 8);
 	} # else ignore if client disconnected
+	$self->dclose if $$ == $daemon_pid;
 }
 
 sub err ($;@) {
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 007191bbc..a930fc30b 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -612,8 +612,8 @@ sub _pre_augment_mbox {
 sub finish_output {
 	my ($self, $lei) = @_;
 	my $out = delete $lei->{1} // die 'BUG: no lei->{1}';
-	my $old = delete $lei->{old_1};
-	$lei->{1} = $old if $old;
+	my $old = delete $lei->{old_1} or return; # path only
+	$lei->{1} = $old;
 	return if $out->close; # reaps gzip|pigz|xz|bzip2
 	my $msg = "E: Error closing $lei->{ovv}->{dst}";
 	$? ? $lei->child_error($?) : ($msg .= " ($!)");
diff --git a/t/lei-q-save.t b/t/lei-q-save.t
index a9f9d4d61..0970bc3c1 100644
--- a/t/lei-q-save.t
+++ b/t/lei-q-save.t
@@ -305,5 +305,7 @@ EOM
 	is(scalar(@new), 2, 'got new message');
 	is_xdeeply([grep { $_ eq $orig[0] } @new], \@orig,
 		'original message preserved on up w/ threads');
+	lei_ok 'up', "$home/md", $d, \'multiple maildir up';
+	unlike $lei_err, qr! line \d+!s, 'no warnings';
 });
 done_testing;