From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 93E3D1F51B for ; Thu, 2 Nov 2023 09:35:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1698917742; bh=2OCdHVB6NU2YPUHob0WIDnSbHtkLAkThMSF/5NSIhqM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=EXm9PJIZsHzLG8QBKUFN6QMVW85jfLnkvbN6hWWfumbYB3E8z+AkRJEF5HiHYZRsr We/k4/oIRKuZvp6JAd/98psain7Tqsf+ysiGUinKr2wnaAm0XQJxx0EI9QPHsP1aM7 k9Ml4ryPGtkPbUXOdW7bdQ7KNtuRJ1vZM5w0tht4= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 07/14] git_credential: use autodie where appropriate Date: Thu, 2 Nov 2023 09:35:32 +0000 Message-Id: <20231102093539.2067470-8-e@80x24.org> In-Reply-To: <20231102093539.2067470-1-e@80x24.org> References: <20231102093539.2067470-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can also rely on `say' in Perl 5.10+ to save us the trouble of printing a newline. --- lib/PublicInbox/GitCredential.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/GitCredential.pm b/lib/PublicInbox/GitCredential.pm index a4444e2c..bb225ff3 100644 --- a/lib/PublicInbox/GitCredential.pm +++ b/lib/PublicInbox/GitCredential.pm @@ -5,19 +5,20 @@ package PublicInbox::GitCredential; use v5.12; use PublicInbox::Spawn qw(popen_rd); +use autodie qw(close pipe); sub run ($$;$) { my ($self, $op, $lei) = @_; my ($in_r, $in_w, $out_r); my $cmd = [ qw(git credential), $op ]; - pipe($in_r, $in_w) or die "pipe: $!"; + pipe($in_r, $in_w); if ($lei) { # we'll die if disconnected: - pipe($out_r, my $out_w) or die "pipe: $!"; + pipe($out_r, my $out_w); $lei->send_exec_cmd([ $in_r, $out_w ], $cmd, {}); } else { $out_r = popen_rd($cmd, undef, { 0 => $in_r }); } - close $in_r or die "close in_r: $!"; + close $in_r; my $out = ''; for my $k (qw(url protocol host username password)) { @@ -25,9 +26,8 @@ sub run ($$;$) { die "`$k' contains `\\n' or `\\0'\n" if $v =~ /[\n\0]/; $out .= "$k=$v\n"; } - $out .= "\n"; - print $in_w $out or die "print (git credential $op): $!"; - close $in_w or die "close (git credential $op): $!"; + say $in_w $out; + close $in_w; return $out_r if $op eq 'fill'; <$out_r> and die "unexpected output from `git credential $op'\n"; $out_r->close or die "`git credential $op' failed: \$!=$! \$?=$?\n";