*idx: pass smsg in even more places

[public-inbox.git] / lib / PublicInbox / ViewVCS.pm

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index ead8c2b45fe1fd8e1791227b13872f480e2560aa..2f8e1c4f6531413e8bec34b5929678bdf8f86ab8 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # show any VCS object, similar to "git show"
@@ -33,14 +33,14 @@ my $BIN_DETECT = 8000; # same as git
 
 sub html_i { # WwwStream::getline callback
        my ($nr, $ctx) =  @_;
-       $nr == 1 ? ${delete $ctx->{rv}} : undef;
+       $nr == 1 ? ${delete $ctx->{obuf}} : undef;
 }
 
 sub html_page ($$$) {
        my ($ctx, $code, $strref) = @_;
        my $wcb = delete $ctx->{-wcb};
        $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
-       $ctx->{rv} = $strref;
+       $ctx->{obuf} = $strref;
        my $res = PublicInbox::WwwStream->response($ctx, $code, \&html_i);
        $wcb ? $wcb->($res) : $res;
 }
@@ -90,8 +90,7 @@ sub show_other_result ($$) {
        }
        my $l = PublicInbox::Linkify->new;
        utf8::decode($$bref);
-       $l->linkify_1($$bref);
-       $$bref = '<pre>'. $l->linkify_2(ascii_html($$bref));
+       $$bref = '<pre>'. $l->to_html($$bref);
        $$bref .= '</pre><hr>' . $$logref;
        html_page($ctx, 200, $bref);
 }
@@ -125,9 +124,8 @@ sub solve_result {
 
        my $ref = ref($res);
        my $l = PublicInbox::Linkify->new;
-       $l->linkify_1($log);
        $log = '<pre>debug log:</pre><hr /><pre>' .
-               $l->linkify_2(ascii_html($log)) . '</pre>';
+               $l->to_html($log) . '</pre>';
 
        $res or return html_page($ctx, 404, \$log);
        $ref eq 'ARRAY' or return html_page($ctx, 500, \$log);
@@ -166,7 +164,7 @@ sub solve_result {
 
        # TODO: detect + convert to ensure validity
        utf8::decode($$blob);
-       my $nl = ($$blob =~ tr/\n/\n/);
+       my $nl = ($$blob =~ s/\r?\n/\n/sg);
        my $pad = length($nl);
 
        $l->linkify_1($$blob);