X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewVCS.pm;h=3cbc363b9d113b4b811af9d1acc121e03ad9f5cd;hb=f658918dcc5200b563beea6e1ea3411e89726cb4;hp=702a075d3365089e76c7eaf8e58579c0c6dd1721;hpb=9dfc0b670fc634b54998c3020f173b82de1915ac;p=public-inbox.git diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index 702a075d..3cbc363b 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -15,8 +15,7 @@ package PublicInbox::ViewVCS; use strict; -use warnings; -use bytes (); # only for bytes::length +use v5.10.1; use PublicInbox::SolverGit; use PublicInbox::WwwStream qw(html_oneshot); use PublicInbox::Linkify; @@ -49,13 +48,13 @@ sub stream_blob_parse_hdr { # {parse_hdr} for Qspawn } elsif (index($$bref, "\0") >= 0) { [200, [qw(Content-Type application/octet-stream), @cl] ]; } else { - my $n = bytes::length($$bref); + my $n = length($$bref); if ($n >= $BIN_DETECT || $n == $size) { return [200, [ 'Content-Type', 'text/plain; charset=UTF-8', @cl ] ]; } if ($r == 0) { - warn "premature EOF on $oid $$logref\n"; + warn "premature EOF on $oid $$logref"; return html_page($ctx, 500, $logref); } @$ctx{qw(-res -logref)} = ($res, $logref); @@ -112,7 +111,7 @@ sub solve_result { my ($log, $hints, $fn) = delete @$ctx{qw(log hints fn)}; unless (seek($log, 0, 0)) { - $ctx->{env}->{'psgi.errors'}->print("seek(log): $!\n"); + warn "seek(log): $!"; return html_page($ctx, 500, \'seek error'); } $log = do { local $/; <$log> }; @@ -139,7 +138,7 @@ sub solve_result { my $blob = $git->cat_file($oid); if (!$blob) { # WTF? my $e = "Failed to retrieve generated blob ($oid)"; - $ctx->{env}->{'psgi.errors'}->print("$e ($git->{git_dir})\n"); + warn "$e ($git->{git_dir})"; $log = "
$e
" . $log; return html_page($ctx, 500, \$log); } @@ -195,7 +194,7 @@ sub show ($$;$) { $hints->{$to} = $v if $v ne ''; } - $ctx->{'log'} = tmpfile("solve.$oid_b"); + $ctx->{'log'} = tmpfile("solve.$oid_b") // die "tmpfile: $!"; $ctx->{fn} = $fn; my $solver = PublicInbox::SolverGit->new($ctx->{ibx}, \&solve_result, $ctx);