gitweb: Fix fallback mode of to_utf8 subroutine

[Gitweb] / gitweb.perl
diff --git a/gitweb.perl b/gitweb.perl

index bcf8b84b22d9290904cea644e9c6eff5bc8259ca7b7f775c9f21ea64bad1431c..fb4cf84d591c40e9071c26ca7d1b0262bec5802088a2bedbf97eaff60701952a 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -1444,8 +1444,8 @@ sub validate_refname {
  sub to_utf8 {
         my $str = shift;
         return undef unless defined $str;
-       if (utf8::valid($str)) {
-               utf8::decode($str);
+
+       if (utf8::is_utf8($str) || utf8::decode($str)) {
                 return $str;
         } else {
                 return decode($fallback_encoding, $str, Encode::FB_DEFAULT);
@@ -1697,6 +1697,7 @@ sub chop_and_escape_str {
         my ($str) = @_;
  
         my $chopped = chop_str(@_);
+       $str = to_utf8($str);
         if ($chopped eq $str) {
                 return esc_html($chopped);
         } else {
@@ -6244,7 +6245,9 @@ sub git_blame_common {
                         -type=>"text/plain", -charset => "utf-8",
                         -status=> "200 OK");
                 local $| = 1; # output autoflush
-               print while <$fd>;
+               while (my $line = <$fd>) {
+                       print to_utf8($line);
+               }
                 close $fd
                         or print "ERROR $!\n";
  
@@ -7165,6 +7168,7 @@ sub git_blobdiff {
                 my $formats_nav =
                         $cgi->a({-href => href(action=>"blobdiff_plain", -replay=>1)},
                                 "raw");
+               $formats_nav .= diff_style_nav($diff_style);
                 git_header_html(undef, $expires);
                 if (defined $hash_base && (my %co = parse_commit($hash_base))) {
                         git_print_page_nav('','', $hash_base,$co{'tree'},$hash_base, $formats_nav);
@@ -7222,6 +7226,27 @@ sub git_blobdiff_plain {
         git_blobdiff('plain');
  }
  
+# assumes that it is added as later part of already existing navigation,
+# so it returns "| foo | bar" rather than just "foo | bar"
+sub diff_style_nav {
+       my ($diff_style, $is_combined) = @_;
+       $diff_style ||= 'inline';
+
+       return "" if ($is_combined);
+
+       my @styles = (inline => 'inline', 'sidebyside' => 'side by side');
+       my %styles = @styles;
+       @styles =
+               @styles[ map { $_ * 2 } 0..$#styles/2 ];
+
+       return join '',
+               map { " | ".$_ }
+               map {
+                       $_ eq $diff_style ? $styles{$_} :
+                       $cgi->a({-href => href(-replay=>1, diff_style => $_)}, $styles{$_})
+               } @styles;
+}
+
  sub git_commitdiff {
         my %params = @_;
         my $format = $params{-format} || 'html';
@@ -7251,6 +7276,7 @@ sub git_commitdiff {
                                 $cgi->a({-href => href(action=>"patch", -replay=>1)},
                                         "patch");
                 }
+               $formats_nav .= diff_style_nav($diff_style, @{$co{'parents'}} > 1);
  
                 if (defined $hash_parent &&
                     $hash_parent ne '-c' && $hash_parent ne '--cc') {
@@ -7840,11 +7866,12 @@ sub git_opml {
                 -charset => 'utf-8',
                 -content_disposition => 'inline; filename="opml.xml"');
  
+       my $title = esc_html($site_name);
         print <<XML;
  <?xml version="1.0" encoding="utf-8"?>
  <opml version="1.0">
  <head>
-  <title>$site_name OPML Export</title>
+  <title>$title OPML Export</title>
  </head>
  <body>
  <outline text="git RSS feeds">