From d28467db161d0590469b5f8e1115f84858d66e06 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 26 May 2019 10:50:23 +0100 Subject: Replace `confess $!' with `confess "$!"', to actually print errno $ perl -e 'use Carp; open X, ">/dev/eacces" or die $!' Permission denied at -e line 1. $ perl -e 'use Carp; open X, ">/dev/eacces" or confess $!' at -e line 1. $ perl -e 'use Carp; open X, ">/dev/eacces" or confess "$!"' Permission denied at -e line 1. $ confess will get references to its arguments in @_. Its documentation says it saves/restores $!. I conjecture that these interact as we see here: $ perl -e '$!=1; sub x { print ">@_<\n"; } x $!;' >Operation not permitted< $ perl -e '$!=1; sub x { local $!; print ">@_<\n"; } x $!;' >< Quoting "$!" averts the reference (and it will also ensure that we get the string value of $!, in case confess were to do anything in the future which would mess that up). This commit was made like this: perl -i -pe 's/confess \$!/confess "\$!"/g' dgit perl -i -pe 's/confess \$!/confess "\$!"/g' git-debrebase perl -i -pe 's/confess \$!/confess "\$!"/g' Debian/Dgit.pm I have manually reviewed each hunk and it all looks good to me. Closes: #929549 Signed-off-by: Ian Jackson --- Debian/Dgit.pm | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'Debian') diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index 2ef32f3..61476d9 100644 --- a/Debian/Dgit.pm +++ b/Debian/Dgit.pm @@ -148,11 +148,11 @@ sub setup_sigwarn () { sub initdebug ($) { ($debugprefix) = @_; - open DEBUG, ">/dev/null" or confess $!; + open DEBUG, ">/dev/null" or confess "$!"; } sub enabledebug () { - open DEBUG, ">&STDERR" or confess $!; + open DEBUG, ">&STDERR" or confess "$!"; DEBUG->autoflush(1); $debuglevel ||= 1; } @@ -181,7 +181,7 @@ sub printdebug { print DEBUG $debugprefix unless $printdebug_noprefix; pop @_ while @_ and !length $_[-1]; return unless @_; - print DEBUG @_ or confess $!; + print DEBUG @_ or confess "$!"; $printdebug_noprefix = $_[-1] !~ m{\n$}; } @@ -214,9 +214,9 @@ sub shellquote { sub printcmd { my $fh = shift @_; my $intro = shift @_; - print $fh $intro," " or confess $!; - print $fh shellquote @_ or confess $!; - print $fh "\n" or confess $!; + print $fh $intro," " or confess "$!"; + print $fh shellquote @_ or confess "$!"; + print $fh "\n" or confess "$!"; } sub debugcmd { @@ -347,7 +347,7 @@ sub waitstatusmsg () { sub failedcmd_report_cmd { my $intro = shift @_; $intro //= __ "failed command"; - { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess $!; }; + { local ($!); printcmd \*STDERR, _us().": $intro:", @_ or confess "$!"; }; } sub failedcmd_waitstatus { @@ -395,7 +395,7 @@ sub cmdoutput_errok { my $d; $!=0; $?=0; { local $/ = undef; $d =

; } - confess $! if P->error; + confess "$!" if P->error; if (!close P) { printdebug "=>!$?\n"; return undef; } chomp $d; if ($debuglevel > 0) { @@ -528,10 +528,10 @@ sub git_cat_file ($;$) { if (!$gcf_pid) { my @cmd = qw(git cat-file --batch); debugcmd "GCF|", @cmd; - $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess $!; + $gcf_pid = open2 $gcf_o, $gcf_i, @cmd or confess "$!"; } printdebug "GCF>| $objname\n"; - print $gcf_i $objname, "\n" or confess $!; + print $gcf_i $objname, "\n" or confess "$!"; my $x = <$gcf_o>; printdebug "GCF<| ", $x; if ($x =~ m/ (missing)$/) { return $chk->($1, undef); } @@ -567,7 +567,7 @@ sub git_for_each_ref ($$;$) { if (defined $gitdir) { @cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd); } - open GFER, "-|", @cmd or confess $!; + open GFER, "-|", @cmd or confess "$!"; debugcmd "|", @cmd; while () { chomp or confess "$_ ?"; @@ -665,7 +665,7 @@ sub git_slurp_config_src ($) { local $/="\0"; my $r = { }; - open GITS, "-|", @cmd or confess $!; + open GITS, "-|", @cmd or confess "$!"; while () { chomp or confess; printdebug "=> ", (messagequote $_), "\n"; @@ -728,7 +728,7 @@ sub parsecontrol { my $fh = new IO::Handle; open $fh, '<', $file or fail f_ "open %s (%s): %s", $file, $desc, $!; my $c = parsecontrolfh($fh,$desc,$allowsigned); - $fh->error and confess $!; + $fh->error and confess "$!"; close $fh; return $c; } @@ -737,7 +737,7 @@ sub parsechangelog { my $c = Dpkg::Control::Hash->new(name => 'parsed changelog'); my $p = new IO::Handle; my @cmd = (qw(dpkg-parsechangelog), @_); - open $p, '-|', @cmd or confess $!; + open $p, '-|', @cmd or confess "$!"; $c->parse($p); $?=0; $!=0; close $p or failedcmd @cmd; return $c; @@ -755,7 +755,7 @@ sub parsechangelog_loop ($$$) { # @$clogcmd is qw(dpkg-parsechangelog ...some...options...) # calls $fn->($thisstanza, $desc); debugcmd "|",@$clogcmd; - open CLOGS, "-|", @$clogcmd or confess $!; + open CLOGS, "-|", @$clogcmd or confess "$!"; for (;;) { my $stanzatext = do { local $/=""; ; }; printdebug "clogp stanza ".Dumper($stanzatext) if $debuglevel>1; @@ -767,7 +767,7 @@ sub parsechangelog_loop ($$$) { $fn->($thisstanza, $desc); } - confess $! if CLOGS->error; + confess "$!" if CLOGS->error; close CLOGS or $?==SIGPIPE or failedcmd @$clogcmd; } @@ -777,11 +777,11 @@ sub make_commit_text ($) { my @cmd = (qw(git hash-object -w -t commit --stdin)); debugcmd "|",@cmd; print Dumper($text) if $debuglevel > 1; - my $child = open2($out, $in, @cmd) or confess $!; + my $child = open2($out, $in, @cmd) or confess "$!"; my $h; eval { - print $in $text or confess $!; - close $in or confess $!; + print $in $text or confess "$!"; + close $in or confess "$!"; $h = <$out>; $h =~ m/^\w+$/ or confess; $h = $&; @@ -803,7 +803,7 @@ sub reflog_cache_insert ($$$) { my $parent = $ref; $parent =~ s{/[^/]+$}{}; ensuredir "$maindir_gitcommon/logs/$parent"; my $makelogfh = new IO::File "$maindir_gitcommon/logs/$ref", '>>' - or confess $!; + or confess "$!"; my $oldcache = git_get_ref $ref; @@ -832,11 +832,11 @@ sub reflog_cache_lookup ($$) { # you must have called record_maindir my @cmd = (qw(git log -g), '--pretty=format:%H %gs', $ref); debugcmd "|(probably)",@cmd; - my $child = open GC, "-|"; defined $child or confess $!; + my $child = open GC, "-|"; defined $child or confess "$!"; if (!$child) { - chdir $maindir or confess $!; + chdir $maindir or confess "$!"; if (!stat "$maindir_gitcommon/logs/$ref") { - $! == ENOENT or confess $!; + $! == ENOENT or confess "$!"; printdebug ">(no reflog)\n"; finish 0; } @@ -849,7 +849,7 @@ sub reflog_cache_lookup ($$) { close GC; return $1; } - confess $! if GC->error; + confess "$!" if GC->error; failedcmd unless close GC; return undef; } @@ -975,11 +975,11 @@ sub playtree_setup (;$) { # $maindir_gitdir contains our main working "dgit", HEAD, etc. # $maindir_gitcommon the shared stuff, including .objects rmtree('.git/objects'); - symlink "$maindir_gitcommon/objects",'.git/objects' or confess $!; + symlink "$maindir_gitcommon/objects",'.git/objects' or confess "$!"; ensuredir '.git/info'; - open GA, "> .git/info/attributes" or confess $!; - print GA "* $negate_harmful_gitattrs\n" or confess $!; - close GA or confess $!; + open GA, "> .git/info/attributes" or confess "$!"; + print GA "* $negate_harmful_gitattrs\n" or confess "$!"; + close GA or confess "$!"; } 1; -- cgit v1.2.3