viewdiff: use defined checks in more places

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

diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index d2c5fabef64b9c12c9a72ff9def1a67a229c7c28..fb394b7c430e5b47994f1af91e8c644b673030ef 100644 (file)
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -15,8 +15,7 @@ use URI::Escape qw(uri_escape_utf8);
 use PublicInbox::Hval qw(ascii_html to_attr);
 use PublicInbox::Git qw(git_unquote);
 
-sub UNSAFE () { "^A-Za-z0-9\-\._~/" }
-
+my $UNSAFE = "^A-Za-z0-9\-\._~/"; # '/' + $URI::Escape::Unsafe{RFC3986}
 my $OID_NULL = '0{7,}';
 my $OID_BLOB = '[a-f0-9]{7,}';
 my $LF = qr!\n!;
@@ -78,13 +77,13 @@ sub anchor0 ($$$$) {
        # which works well in practice. If projects put "=>", or trailing
        # spaces in filenames, oh well :P
        $fn =~ s/$DIFFSTAT_COMMENT//;
-       $fn =~ s/{(?:.+) => (.+)}/$1/ or $fn =~ s/.* => (.+)/$1/;
+       $fn =~ s/\{(?:.+) => (.+)\}/$1/ or $fn =~ s/.* => (.+)/$1/;
        $fn = git_unquote($fn);
 
        # long filenames will require us to check in anchor1()
        push(@{$ctx->{-long_path}}, $fn) if $fn =~ s!\A\.\.\./?!!;
 
-       if (my $attr = to_attr($ctx->{-apfx}.$fn)) {
+       if (defined(my $attr = to_attr($ctx->{-apfx}.$fn))) {
                $ctx->{-anchors}->{$attr} = 1;
                my $spaces = ($orig =~ s/( +)\z//) ? $1 : '';
                $$dst .= " <a\nid=i$attr\nhref=#$attr>" .
@@ -98,7 +97,7 @@ sub anchor0 ($$$$) {
 # returns "diff --git" anchor destination, undef otherwise
 sub anchor1 ($$) {
        my ($ctx, $pb) = @_;
-       my $attr = to_attr($ctx->{-apfx}.$pb) or return;
+       my $attr = to_attr($ctx->{-apfx}.$pb) // return;
 
        my $ok = delete $ctx->{-anchors}->{$attr};
 
@@ -106,10 +105,10 @@ sub anchor1 ($$) {
        # assume diffstat and diff output follow the same order,
        # and ignore different ordering (could be malicious input)
        unless ($ok) {
-               my $fn = shift(@{$ctx->{-long_path}}) or return;
+               my $fn = shift(@{$ctx->{-long_path}}) // return;
                $pb =~ /\Q$fn\E\z/s or return;
-               $attr = to_attr($ctx->{-apfx}.$fn) or return;
-               $ok = delete $ctx->{-anchors}->{$attr} or return;
+               $attr = to_attr($ctx->{-apfx}.$fn) // return;
+               $ok = delete $ctx->{-anchors}->{$attr} // return;
        }
        $ok ? "<a\nhref=#i$attr\nid=$attr>diff</a> --git" : undef
 }
@@ -124,14 +123,14 @@ sub diff_header ($$$) {
        $pa = (split(m'/', git_unquote($pa), 2))[1] if $pa ne '/dev/null';
        $pb = (split(m'/', git_unquote($pb), 2))[1] if $pb ne '/dev/null';
        if ($pa eq $pb && $pb ne '/dev/null') {
-               $dctx->{Q} = "?b=".uri_escape_utf8($pb, UNSAFE);
+               $dctx->{Q} = "?b=".uri_escape_utf8($pb, $UNSAFE);
        } else {
                my @q;
                if ($pb ne '/dev/null') {
-                       push @q, 'b='.uri_escape_utf8($pb, UNSAFE);
+                       push @q, 'b='.uri_escape_utf8($pb, $UNSAFE);
                }
                if ($pa ne '/dev/null') {
-                       push @q, 'a='.uri_escape_utf8($pa, UNSAFE);
+                       push @q, 'a='.uri_escape_utf8($pa, $UNSAFE);
                }
                $dctx->{Q} = '?'.join('&amp;', @q);
        }