From: Kay Sievers Date: Sat, 19 Nov 2005 16:41:29 +0000 (+0100) Subject: replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd) X-Git-Tag: v1.4.0~1^2~39 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=40c138134f183e635712ceace33d04e10744607f;p=git.git replace invalid utf8 sequences by UTF-8 REPLACEMENT CHARACTER (efbfbd) I still strongly disagree with the git maintainers not to hint people, to use the only sane default encoding for a distributed project, which is utf8. I'm tired of hearing filesystem development arguments. Git is a software offered to merge forth and back across the world and not to provide a content neutral filesystem. Btw: I have nothing against the ability to run git in a closed environment, with a different encoding, that's fine, sure. But that is obviously not the case for the projects on kernel.org. It's about sane defaults, nothing else. You have to make decisions guy, as always in life. The problems to allow random encoded garbage in commit messages _without_ storing the encoding, just makes zero sense. Eighter you introduce a per-commit encoding field, if you insist on this craziness, or you define a default encoding. Everything else is just lazy and does not solve any problem, besides that you can claim now, that you are not responsible for the mess in the repository. Gitweb shows several commits at once, you allow various encodings committed to the same repository, without any hint what that garbage from the individual commits is encoded with. No idea why you don't get the problem - it's unsolvable. If you merge different peoples work, you have to speak a common language! Kay Sievers --- diff --git a/gitweb.cgi b/gitweb.cgi index 0822cb1e3..f2a1526da 100755 --- a/gitweb.cgi +++ b/gitweb.cgi @@ -12,17 +12,18 @@ use warnings; use CGI qw(:standard :escapeHTML -nosticky); use CGI::Util qw(unescape); use CGI::Carp qw(fatalsToBrowser); +use Encode; use Fcntl ':mode'; my $cgi = new CGI; my $version = "249"; my $my_url = $cgi->url(); my $my_uri = $cgi->url(-absolute => 1); -my $rss_link = ""; +my $rss_link = ""; # absolute fs-path which will be prepended to the project path #my $projectroot = "/pub/scm"; -my $projectroot = "/home/kay/public_html/pub/scm"; +my $projectroot = "/home/kay/public_html/pub/scm"; # location of the git-core binaries my $gitbin = "/usr/bin"; @@ -37,8 +38,8 @@ my $home_link = $my_uri; my $home_text = "indextext.html"; # source of projects list -#my $projects_list = $projectroot; -my $projects_list = "index/index.aux"; +#my $projects_list = $projectroot; +my $projects_list = "index/index.aux"; # input validation and dispatch my $action = $cgi->param('a'); @@ -78,8 +79,8 @@ if (defined $project) { undef $project; die_error(undef, "No such project."); } - $rss_link = ""; + $rss_link = ""; $ENV{'GIT_DIR'} = "$projectroot/$project"; } else { git_project_list(); @@ -207,13 +208,20 @@ if (!defined $action || $action eq "summary") { exit; } -sub esc { +sub esc_url { my $str = shift; $str =~ s/\+/%2B/g; $str =~ s/ /\+/g; return $str; } +sub esc_html { + my $str = shift; + $str = escapeHTML($str); + $str = decode("utf8", $str, Encode::FB_DEFAULT); + return $str; +} + sub git_header_html { my $status = shift || "200 OK"; my $expires = shift; @@ -294,11 +302,11 @@ a.rss_logo:hover { background-color:#ee5500; } EOF print "
\n" . "" . - "\"git\"" . + "\"git\"" . "\n"; - print $cgi->a({-href => esc($home_link)}, "projects") . " / "; + print $cgi->a({-href => esc_url($home_link)}, "projects") . " / "; if (defined $project) { - print $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, escapeHTML($project)); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, esc_html($project)); if (defined $action) { print " / $action"; } @@ -331,11 +339,11 @@ sub git_footer_html { if (defined $project) { my $descr = git_read_description($project); if (defined $descr) { - print "
" . escapeHTML($descr) . "
\n"; + print "
" . esc_html($descr) . "
\n"; } - print $cgi->a({-href => esc("$my_uri?p=$project;a=rss"), -class => "rss_logo"}, "RSS") . "\n"; + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=rss"), -class => "rss_logo"}, "RSS") . "\n"; } else { - print $cgi->a({-href => esc("$my_uri?a=opml"), -class => "rss_logo"}, "OPML") . "\n"; + print $cgi->a({-href => esc_url("$my_uri?a=opml"), -class => "rss_logo"}, "OPML") . "\n"; } print "
\n" . "\n" . @@ -606,7 +614,7 @@ sub git_diff_print { $line =~ s/\t/$spaces/; } } - print "
" . escapeHTML($line) . "
\n"; + print "
" . esc_html($line) . "
\n"; } } close $fd; @@ -671,12 +679,12 @@ sub file_type { sub format_log_line_html { my $line = shift; - $line = escapeHTML($line); + $line = esc_html($line); $line =~ s/ / /g; if ($line =~ m/([0-9a-fA-F]{40})/) { my $hash_text = $1; if (git_get_type($hash_text) eq "commit") { - my $link = $cgi->a({-class => "text", -href => esc("$my_uri?p=$project;a=commit;h=$hash_text")}, $hash_text); + my $link = $cgi->a({-class => "text", -href => esc_url("$my_uri?p=$project;a=commit;h=$hash_text")}, $hash_text); $line =~ s/$hash_text/$link/; } } @@ -824,25 +832,25 @@ sub git_project_list { @projects = sort {$a->{'path'} cmp $b->{'path'}} @projects; print "Project\n"; } else { - print "" . $cgi->a({-class => "header", -href => esc("$my_uri?o=project")}, "Project") . "\n"; + print "" . $cgi->a({-class => "header", -href => esc_url("$my_uri?o=project")}, "Project") . "\n"; } if (defined($order) && ($order eq "descr")) { @projects = sort {$a->{'descr'} cmp $b->{'descr'}} @projects; print "Description\n"; } else { - print "" . $cgi->a({-class => "header", -href => esc("$my_uri?o=descr")}, "Description") . "\n"; + print "" . $cgi->a({-class => "header", -href => esc_url("$my_uri?o=descr")}, "Description") . "\n"; } if (defined($order) && ($order eq "owner")) { @projects = sort {$a->{'owner'} cmp $b->{'owner'}} @projects; print "Owner\n"; } else { - print "" . $cgi->a({-class => "header", -href => esc("$my_uri?o=owner")}, "Owner") . "\n"; + print "" . $cgi->a({-class => "header", -href => esc_url("$my_uri?o=owner")}, "Owner") . "\n"; } if (defined($order) && ($order eq "age")) { @projects = sort {$a->{'commit'}{'age'} <=> $b->{'commit'}{'age'}} @projects; print "Last Change\n"; } else { - print "" . $cgi->a({-class => "header", -href => esc("$my_uri?o=age")}, "Last Change") . "\n"; + print "" . $cgi->a({-class => "header", -href => esc_url("$my_uri?o=age")}, "Last Change") . "\n"; } print "\n" . "\n"; @@ -854,7 +862,7 @@ sub git_project_list { print "\n"; } $alternate ^= 1; - print "" . $cgi->a({-href => esc("$my_uri?p=$pr->{'path'};a=summary"), -class => "list"}, escapeHTML($pr->{'path'})) . "\n" . + print "" . $cgi->a({-href => esc_url("$my_uri?p=$pr->{'path'};a=summary"), -class => "list"}, esc_html($pr->{'path'})) . "\n" . "$pr->{'descr'}\n" . "" . chop_str($pr->{'owner'}, 15) . "\n"; my $colored_age; @@ -867,9 +875,9 @@ sub git_project_list { } print "$colored_age\n" . "" . - $cgi->a({-href => esc("$my_uri?p=$pr->{'path'};a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$pr->{'path'};a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$pr->{'path'};a=log")}, "log") . + $cgi->a({-href => esc_url("$my_uri?p=$pr->{'path'};a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$pr->{'path'};a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$pr->{'path'};a=log")}, "log") . "\n" . "\n"; } @@ -968,16 +976,16 @@ sub git_summary { git_header_html(); print "
\n" . "summary". - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$head")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree")}, "tree") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$head")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree")}, "tree") . "

\n" . "
\n"; print "
 
\n"; print "\n" . - "\n" . + "\n" . "\n" . "\n" . "
description" . escapeHTML($descr) . "
description" . esc_html($descr) . "
owner$owner
last change$cd{'rfc2822'}
\n"; @@ -985,7 +993,7 @@ sub git_summary { my (@revlist) = map { chomp; $_ } <$fd>; close $fd; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog"), -class => "title"}, "shortlog") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog"), -class => "title"}, "shortlog") . "
\n"; my $i = 16; print "\n"; @@ -1001,23 +1009,23 @@ sub git_summary { $alternate ^= 1; if ($i-- > 0) { print "\n" . - "\n" . + "\n" . "\n" . "\n" . ""; } else { - print "\n" . + print "\n" . ""; last; } @@ -1027,7 +1035,7 @@ sub git_summary { my $taglist = git_read_refs("refs/tags"); if (defined @$taglist) { print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=tags"), -class => "title"}, "tags") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=tags"), -class => "title"}, "tags") . "
\n"; my $i = 16; print "
$co{'age_string'}" . escapeHTML(chop_str($co{'author_name'}, 10)) . "" . esc_html(chop_str($co{'author_name'}, 10)) . ""; if (length($co{'title_short'}) < length($co{'title'})) { - print $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"}, - "" . escapeHTML($co{'title_short'}) . ""); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"}, + "" . esc_html($co{'title_short'}) . ""); } else { - print $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit"), -class => "list"}, - "" . escapeHTML($co{'title'}) . ""); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit"), -class => "list"}, + "" . esc_html($co{'title'}) . ""); } print "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . "
" . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "...") . "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "...") . "
\n"; @@ -1048,27 +1056,27 @@ sub git_summary { if ($i-- > 0) { print "\n" . "\n" . "\n" . "\n" . ""; } else { - print "\n" . + print "\n" . ""; last; } @@ -1079,7 +1087,7 @@ sub git_summary { my $headlist = git_read_refs("refs/heads"); if (defined @$headlist) { print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=heads"), -class => "title"}, "heads") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=heads"), -class => "title"}, "heads") . "
\n"; my $i = 16; print "
$tag{'age'}" . - $cgi->a({-href => esc("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"), -class => "list"}, - "" . escapeHTML($tag{'name'}) . "") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"), -class => "list"}, + "" . esc_html($tag{'name'}) . "") . ""; if (defined($comment)) { - print $cgi->a({-class => "list", -href => esc("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, $comment); + print $cgi->a({-class => "list", -href => esc_url("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, $comment); } print ""; if ($tag{'type'} eq "tag") { - print $cgi->a({-href => esc("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | "; + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | "; } - print $cgi->a({-href => esc("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'}); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'}); if ($tag{'reftype'} eq "commit") { - print " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$tag{'refid'}")}, "log"); + print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$tag{'refid'}")}, "log"); } print "
" . $cgi->a({-href => esc("$my_uri?p=$project;a=tags")}, "...") . "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tags")}, "...") . "
\n"; @@ -1095,16 +1103,16 @@ sub git_summary { if ($i-- > 0) { print "\n" . "\n" . "\n" . ""; } else { - print "\n" . + print "\n" . ""; last; } @@ -1118,28 +1126,28 @@ sub git_tag { my $head = git_read_hash("$project/HEAD"); git_header_html(); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$head")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;hb=$head")}, "tree") . "
\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$head")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;hb=$head")}, "tree") . "
\n" . "
\n" . "
\n"; my %tag = git_read_tag($hash); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, escapeHTML($tag{'name'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($tag{'name'})) . "\n" . "
\n"; print "
\n" . "
$tag{'age'}" . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$tag{'name'}"), -class => "list"}, - "" . escapeHTML($tag{'name'}) . "") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$tag{'name'}"), -class => "list"}, + "" . esc_html($tag{'name'}) . "") . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$tag{'name'}")}, "log") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$tag{'name'}")}, "log") . "
" . $cgi->a({-href => esc("$my_uri?p=$project;a=heads")}, "...") . "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=heads")}, "...") . "
\n" . "\n" . "\n" . - "\n" . - "\n" . + "\n" . + "\n" . "\n"; if (defined($tag{'author'})) { my %ad = date_str($tag{'epoch'}, $tag{'tz'}); - print "\n"; + print "\n"; print "\n"; } print "
object" . $cgi->a({-class => "list", -href => esc("$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}")}, $tag{'object'}) . "" . $cgi->a({-href => esc("$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}")}, $tag{'type'}) . "" . $cgi->a({-class => "list", -href => esc_url("$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}")}, $tag{'object'}) . "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=$tag{'type'};h=$tag{'object'}")}, $tag{'type'}) . "
author" . escapeHTML($tag{'author'}) . "
author" . esc_html($tag{'author'}) . "
" . $ad{'rfc2822'} . sprintf(" (%02d:%02d %s)", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'}) . "
\n\n" . @@ -1147,7 +1155,7 @@ sub git_tag { print "
"; my $comment = $tag{'comment'}; foreach my $line (@$comment) { - print escapeHTML($line) . "
\n"; + print esc_html($line) . "
\n"; } print "
\n"; git_footer_html(); @@ -1157,17 +1165,17 @@ sub git_tags { my $head = git_read_hash("$project/HEAD"); git_header_html(); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$head")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;hb=$head")}, "tree") . "
\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$head")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;hb=$head")}, "tree") . "
\n" . "
\n" . "
\n"; my $taglist = git_read_refs("refs/tags"); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . "
\n"; print "\n"; my $alternate = 0; @@ -1187,22 +1195,22 @@ sub git_tags { $alternate ^= 1; print "\n" . "\n" . "\n" . "\n" . ""; @@ -1216,17 +1224,17 @@ sub git_heads { my $head = git_read_hash("$project/HEAD"); git_header_html(); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$head")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;hb=$head")}, "tree") . "
\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$head")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$head")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;hb=$head")}, "tree") . "
\n" . "
\n" . "
\n"; my $taglist = git_read_refs("refs/heads"); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . "
\n"; print "
$tag{'age'}" . - $cgi->a({-href => esc("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"), -class => "list"}, - "" . escapeHTML($tag{'name'}) . "") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}"), -class => "list"}, + "" . esc_html($tag{'name'}) . "") . ""; if (defined($comment)) { - print $cgi->a({-class => "list", -href => esc("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, $comment); + print $cgi->a({-class => "list", -href => esc_url("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, $comment); } print ""; if ($tag{'type'} eq "tag") { - print $cgi->a({-href => esc("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | "; + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=tag;h=$tag{'id'}")}, "tag") . " | "; } - print $cgi->a({-href => esc("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'}); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=$tag{'reftype'};h=$tag{'refid'}")}, $tag{'reftype'}); if ($tag{'reftype'} eq "commit") { - print " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$tag{'refid'}")}, "log"); + print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$tag{'refid'}")}, "log"); } print "
\n"; my $alternate = 0; @@ -1241,11 +1249,11 @@ sub git_heads { $alternate ^= 1; print "\n" . "\n" . "\n" . ""; } @@ -1293,20 +1301,20 @@ sub git_blob { git_header_html(); if (defined $hash_base && (my %co = git_read_commit($hash_base))) { print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash_base")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") . "
\n"; + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash_base")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") . "
\n"; if (defined $file_name) { - print $cgi->a({-href => esc("$my_uri?p=$project;a=blob_plain;h=$hash;f=$file_name")}, "plain") . "
\n"; + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob_plain;h=$hash;f=$file_name")}, "plain") . "
\n"; } else { - print $cgi->a({-href => esc("$my_uri?p=$project;a=blob_plain;h=$hash")}, "plain") . "
\n"; + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob_plain;h=$hash")}, "plain") . "
\n"; } print "
\n". "
" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash_base"), -class => "title"}, escapeHTML($co{'title'})) . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "
\n"; } else { print "
\n" . @@ -1327,7 +1335,7 @@ sub git_blob { $line =~ s/\t/$spaces/; } } - printf "
%4i %s
\n", $nr, $nr, $nr, escapeHTML($line); + printf "
%4i %s
\n", $nr, $nr, $nr, esc_html($line); } close $fd or print "Reading blob failed.\n"; print "
"; @@ -1369,16 +1377,16 @@ sub git_tree { if (defined $hash_base && (my %co = git_read_commit($hash_base))) { $base_key = ";hb=$hash_base"; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$hash_base")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$hash_base")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash_base")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$hash_base")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$hash_base")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash_base")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") . " | tree" . "

\n" . "
\n"; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash_base"), -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" . "
\n"; } else { print "
\n"; @@ -1411,15 +1419,15 @@ sub git_tree { print "
\n"; if ($t_type eq "blob") { print "\n" . "\n"; } elsif ($t_type eq "tree") { print "\n" . "
$tag{'age'}" . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$tag{'name'}"), -class => "list"}, "" . escapeHTML($tag{'name'}) . "") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$tag{'name'}"), -class => "list"}, "" . esc_html($tag{'name'}) . "") . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$tag{'name'}")}, "log") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$tag{'name'}")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$tag{'name'}")}, "log") . "
" . mode_str($t_mode) . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key), -class => "list"}, $t_name) . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key), -class => "list"}, $t_name) . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key)}, "blob") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=history;h=$hash_base" . $file_key)}, "history") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$t_hash" . $base_key . $file_key)}, "blob") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=history;h=$hash_base" . $file_key)}, "history") . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key)}, $t_name) . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key)}, $t_name) . "" . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$t_hash" . $base_key . $file_key)}, "tree") . @@ -1442,7 +1450,7 @@ sub git_rss { "\n"; print "\n"; print "$project\n". - "" . escapeHTML("$my_url?p=$project;a=summary") . "\n". + "" . esc_html("$my_url?p=$project;a=summary") . "\n". "$project log\n". "en\n"; @@ -1459,17 +1467,18 @@ sub git_rss { close $fd or next; print "\n" . "" . - sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . escapeHTML($co{'title'}) . + sprintf("%d %s %02d:%02d", $cd{'mday'}, $cd{'month'}, $cd{'hour'}, $cd{'minute'}) . " - " . esc_html($co{'title'}) . "\n" . - "" . escapeHTML($co{'author'}) . "\n" . + "" . esc_html($co{'author'}) . "\n" . "$cd{'rfc2822'}\n" . - "" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "\n" . - "" . escapeHTML("$my_url?p=$project;a=commit;h=$commit") . "\n" . - "" . escapeHTML($co{'title'}) . "\n" . + "" . esc_html("$my_url?p=$project;a=commit;h=$commit") . "\n" . + "" . esc_html("$my_url?p=$project;a=commit;h=$commit") . "\n" . + "" . esc_html($co{'title'}) . "\n" . "" . "\n"; } print "
\n"; @@ -1511,7 +1520,7 @@ sub git_opml { next; } - my $path = escapeHTML(chop_str($proj{'path'}, 25, 5)); + my $path = esc_html(chop_str($proj{'path'}, 25, 5)); my $rss = "$my_url?p=$proj{'path'};a=rss"; my $html = "$my_url?p=$proj{'path'};a=summary"; print "\n"; @@ -1531,12 +1540,12 @@ sub git_log { } git_header_html(); print "
\n"; - print $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$hash")}, "shortlog") . + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$hash")}, "shortlog") . " | log" . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "
\n"; + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "
\n"; my $limit = sprintf("--max-count=%i", (100 * ($page+1))); open my $fd, "-|", "$gitbin/git-rev-list $limit $hash" or die_error(undef, "Open failed."); @@ -1544,19 +1553,19 @@ sub git_log { close $fd; if ($hash ne $head || $page) { - print $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "HEAD"); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "HEAD"); } else { print "HEAD"; } if ($page > 0) { print " ⋅ " . - $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev"); } else { print " ⋅ prev"; } if ($#revlist >= (100 * ($page+1)-1)) { print " ⋅ " . - $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next"); } else { print " ⋅ next"; } @@ -1564,7 +1573,7 @@ sub git_log { "
\n"; if (!@revlist) { print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . "
\n"; my %co = git_read_commit($hash); print "
Last change $co{'age_string'}.

\n"; @@ -1575,16 +1584,16 @@ sub git_log { next if !%co; my %ad = date_str($co{'author_epoch'}); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit"), -class => "title"}, - "$co{'age_string'}" . escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit"), -class => "title"}, + "$co{'age_string'}" . esc_html($co{'title'})) . "\n" . "
\n"; print "
\n" . "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . "
\n" . "
\n" . - "" . escapeHTML($co{'author_name'}) . " [$ad{'rfc2822'}]
\n" . + "" . esc_html($co{'author_name'}) . " [$ad{'rfc2822'}]
\n" . "
\n" . "
\n"; my $comment = $co{'comment'}; @@ -1637,27 +1646,27 @@ sub git_commit { } git_header_html(undef, $expires); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$hash")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$hash")}, "log") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$hash")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$hash")}, "log") . " | commit"; if (defined $co{'parent'}) { - print " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff"); + print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff"); } - print " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "\n" . + print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "\n" . "

\n"; if (defined $co{'parent'}) { print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash"), -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" . "
\n"; } else { print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"), -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" . "
\n"; } print "
\n" . "\n"; - print "\n". + print "\n". "" . "" . "\n"; - print "\n"; + print "\n"; print "\n"; print "\n"; print "" . "" . "" . - "" . "\n"; my $parents = $co{'parents'}; foreach my $par (@$parents) { print "" . "" . - "" . + "" . "" . "\n"; } @@ -1707,7 +1716,7 @@ sub git_commit { } if ($line =~ m/^ *(signed[ \-]off[ \-]by[ :]|acked[ \-]by[ :]|cc[ :])/i) { $signed = 1; - print "" . escapeHTML($line) . "
\n"; + print "" . esc_html($line) . "
\n"; } else { $signed = 0; print format_log_line_html($line) . "
\n"; @@ -1746,16 +1755,16 @@ sub git_commit { $mode_chng = sprintf(" with mode: %04o", (oct $to_mode) & 0777); } print "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)) . "\n" . "\n" . - "\n"; + "\n"; } elsif ($status eq "D") { print "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)) . "\n" . "\n" . "\n" } elsif ($status eq "M" || $status eq "T") { my $mode_chnge = ""; @@ -1775,18 +1784,18 @@ sub git_commit { } print "\n" . "\n" . "\n"; } elsif ($status eq "R") { my ($from_file, $to_file) = split "\t", $file; @@ -1795,14 +1804,14 @@ sub git_commit { $mode_chng = sprintf(", mode: %04o", (oct $to_mode) & 0777); } print "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file"), -class => "list"}, esc_html($to_file)) . "\n" . "\n" . "\n"; } @@ -1817,17 +1826,17 @@ sub git_blobdiff { git_header_html(); if (defined $hash_base && (my %co = git_read_commit($hash_base))) { print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash_base")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash_base")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash_base")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash_base")}, "tree") . "
\n"; - print $cgi->a({-href => esc("$my_uri?p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain") . + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=blobdiff_plain;h=$hash;hp=$hash_parent")}, "plain") . "
\n"; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash_base"), -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash_base"), -class => "title"}, esc_html($co{'title'})) . "\n" . "
\n"; } else { print "
\n" . @@ -1839,9 +1848,9 @@ sub git_blobdiff { } print "
\n" . "
blob:" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$hash_parent;hb=$hash_base;f=$file_name")}, $hash_parent) . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$hash_parent;hb=$hash_base;f=$file_name")}, $hash_parent) . " -> blob:" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, $hash) . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, $hash) . "
\n"; git_diff_print($hash_parent, $file_name || $hash_parent, $hash, $file_name || $hash); print "
"; @@ -1874,16 +1883,16 @@ sub git_commitdiff { } git_header_html(undef, $expires); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$hash")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$hash")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$hash")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$hash")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . " | commitdiff" . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "
\n"; - print $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain") . "\n" . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "
\n"; + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff_plain;h=$hash;hp=$hash_parent")}, "plain") . "\n" . "
\n"; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" . "
\n"; print "
\n"; my $comment = $co{'comment'}; @@ -1922,20 +1931,20 @@ sub git_commitdiff { my $file = $6; if ($status eq "A") { print "
" . file_type($to_mode) . ":" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, $to_id) . "(new)" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, $to_id) . "(new)" . "
\n"; git_diff_print(undef, "/dev/null", $to_id, "b/$file"); } elsif ($status eq "D") { print "
" . file_type($from_mode) . ":" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, $from_id) . "(deleted)" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, $from_id) . "(deleted)" . "
\n"; git_diff_print($from_id, "a/$file", undef, "/dev/null"); } elsif ($status eq "M") { if ($from_id ne $to_id) { print "
" . - file_type($from_mode) . ":" . $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, $from_id) . + file_type($from_mode) . ":" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, $from_id) . " -> " . - file_type($to_mode) . ":" . $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, $to_id); + file_type($to_mode) . ":" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, $to_id); print "
\n"; git_diff_print($from_id, "a/$file", $to_id, "b/$file"); } @@ -2016,16 +2025,16 @@ sub git_history { } git_header_html(); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "

\n" . "
\n"; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" . "
\n"; print "
/$file_name
\n"; @@ -2050,18 +2059,18 @@ sub git_history { } $alternate ^= 1; print "
\n" . - "\n" . - "\n" . + "\n" . + "\n" . "\n" . @@ -2101,17 +2110,17 @@ sub git_search { } git_header_html(); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary;h=$hash")}, "summary") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "shortlog") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$hash")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary;h=$hash")}, "summary") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "shortlog") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$hash")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "

\n" . "
\n"; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, escapeHTML($co{'title'})) . "\n" . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash"), -class => "title"}, esc_html($co{'title'})) . "\n" . "
\n"; print "
author" . escapeHTML($co{'author'}) . "
author" . esc_html($co{'author'}) . "
$ad{'rfc2822'}"; if ($ad{'hour_local'} < 6) { @@ -1667,25 +1676,25 @@ sub git_commit { } print "
committer" . escapeHTML($co{'committer'}) . "
committer" . esc_html($co{'committer'}) . "
$cd{'rfc2822'}" . sprintf(" (%02d:%02d %s)", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . "
commit$co{'id'}
tree" . - $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"), class => "list"}, $co{'tree'}) . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash"), class => "list"}, $co{'tree'}) . "" . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . + "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$hash")}, "tree") . "
parent" . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$par"), class => "list"}, $par) . "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$par"), class => "list"}, $par) . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$par")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash;hp=$par")}, "commitdiff") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$par")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash;hp=$par")}, "commitdiff") . "
" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"), -class => "list"}, escapeHTML($file)) . "[new " . file_type($to_mode) . "$mode_chng]" . $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, "blob") . "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, "blob") . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file"), -class => "list"}, escapeHTML($file)) . "[deleted " . file_type($from_mode). "]" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, "blob") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=history;h=$hash;f=$file")}, "history") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$file")}, "blob") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=history;h=$hash;f=$file")}, "history") . ""; if ($to_id ne $from_id) { - print $cgi->a({-href => esc("$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"), -class => "list"}, escapeHTML($file)); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)); } else { - print $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"), -class => "list"}, escapeHTML($file)); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file"), -class => "list"}, esc_html($file)); } print "$mode_chnge"; - print $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, "blob"); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$file")}, "blob"); if ($to_id ne $from_id) { - print " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file")}, "diff"); + print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$file")}, "diff"); } - print " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=history;h=$hash;f=$file")}, "history") . "\n"; + print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=history;h=$hash;f=$file")}, "history") . "\n"; print "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file"), -class => "list"}, escapeHTML($to_file)) . "[moved from " . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file"), -class => "list"}, escapeHTML($from_file)) . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file"), -class => "list"}, esc_html($from_file)) . " with " . (int $similarity) . "% similarity$mode_chng]" . - $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file")}, "blob"); + $cgi->a({-href => esc_uresc_url("$my_uri?p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file")}, "blob"); if ($to_id ne $from_id) { - print " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file")}, "diff"); + print " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=blobdiff;h=$to_id;hp=$from_id;hb=$hash;f=$to_file")}, "diff"); } print "$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 15, 3)) . "" . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit"), -class => "list"}, "" . - escapeHTML(chop_str($co{'title'}, 50)) . "") . "" . esc_html(chop_str($co{'author_name'}, 15, 3)) . "" . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit"), -class => "list"}, "" . + esc_html(chop_str($co{'title'}, 50)) . "") . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=blob;hb=$commit;f=$file_name")}, "blob"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;hb=$commit;f=$file_name")}, "blob"); my $blob = git_get_hash_by_path($hash, $file_name); my $blob_parent = git_get_hash_by_path($commit, $file_name); if (defined $blob && defined $blob_parent && $blob ne $blob_parent) { print " | " . - $cgi->a({-href => esc("$my_uri?p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=$file_name")}, + $cgi->a({-href => esc_url("$my_uri?p=$project;a=blobdiff;h=$blob;hp=$blob_parent;hb=$commit;f=$file_name")}, "diff to current"); } print "
\n"; my $alternate = 0; @@ -2140,16 +2149,16 @@ sub git_search { } $alternate ^= 1; print "\n" . - "\n" . + "\n" . "\n" . "\n" . "\n"; } @@ -2193,20 +2202,20 @@ sub git_search { } $alternate ^= 1; print "\n" . - "\n" . + "\n" . "\n" . "\n" . "\n"; } @@ -2229,12 +2238,12 @@ sub git_shortlog { } git_header_html(); print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary")}, "summary") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary")}, "summary") . " | shortlog" . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=log;h=$hash")}, "log") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "
\n"; + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=log;h=$hash")}, "log") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$hash")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$hash")}, "commitdiff") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "
\n"; my $limit = sprintf("--max-count=%i", (100 * ($page+1))); open my $fd, "-|", "$gitbin/git-rev-list $limit $hash" or die_error(undef, "Open failed."); @@ -2242,26 +2251,26 @@ sub git_shortlog { close $fd; if ($hash ne $head || $page) { - print $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog")}, "HEAD"); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog")}, "HEAD"); } else { print "HEAD"; } if ($page > 0) { print " ⋅ " . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page-1)), -accesskey => "p", -title => "Alt-p"}, "prev"); } else { print " ⋅ prev"; } if ($#revlist >= (100 * ($page+1)-1)) { print " ⋅ " . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -accesskey => "n", -title => "Alt-n"}, "next"); } else { print " ⋅ next"; } print "
\n" . "
\n"; print "
\n" . - $cgi->a({-href => esc("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=summary"), -class => "title"}, " ") . "
\n"; print "
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "" . esc_html(chop_str($co{'author_name'}, 15, 5)) . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$co{'id'}"), -class => "list"}, "" . escapeHTML(chop_str($co{'title'}, 50)) . "
"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$co{'id'}"), -class => "list"}, "" . esc_html(chop_str($co{'title'}, 50)) . "
"); my $comment = $co{'comment'}; foreach my $line (@$comment) { if ($line =~ m/^(.*)($searchtext)(.*)$/i) { - my $lead = escapeHTML($1) || ""; + my $lead = esc_html($1) || ""; $lead = chop_str($lead, 30, 10); - my $match = escapeHTML($2) || ""; - my $trail = escapeHTML($3) || ""; + my $match = esc_html($2) || ""; + my $trail = esc_html($3) || ""; $trail = chop_str($trail, 30, 10); my $text = "$lead$match$trail"; print chop_str($text, 80, 5) . "
\n"; @@ -2157,8 +2166,8 @@ sub git_search { } print "		" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$co{'id'}")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}")}, "tree"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$co{'id'}")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}")}, "tree"); print "
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 15, 5)) . "" . esc_html(chop_str($co{'author_name'}, 15, 5)) . "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$co{'id'}"), -class => "list"}, "" . - escapeHTML(chop_str($co{'title'}, 50)) . "
"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$co{'id'}"), -class => "list"}, "" . + esc_html(chop_str($co{'title'}, 50)) . "
"); while (my $setref = shift @files) { my %set = %$setref; - print $cgi->a({-href => esc("$my_uri?p=$project;a=blob;h=$set{'id'};hb=$co{'id'};f=$set{'file'}"), class => "list"}, - "" . escapeHTML($set{'file'}) . "") . + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=blob;h=$set{'id'};hb=$co{'id'};f=$set{'file'}"), class => "list"}, + "" . esc_html($set{'file'}) . "") . "
\n"; } print "		" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$co{'id'}")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}")}, "tree"); + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$co{'id'}")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=tree;h=$co{'tree'};hb=$co{'id'}")}, "tree"); print "
\n"; my $alternate = 0; @@ -2276,26 +2285,26 @@ sub git_shortlog { } $alternate ^= 1; print "\n" . - "\n" . + "\n" . "\n" . "\n" . ""; } if ($#revlist >= (100 * ($page+1)-1)) { print "\n" . "\n" . "\n"; }
$co{'age_string_date'}" . escapeHTML(chop_str($co{'author_name'}, 10)) . "" . esc_html(chop_str($co{'author_name'}, 10)) . ""; if (length($co{'title_short'}) < length($co{'title'})) { - print $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"}, - "" . escapeHTML($co{'title_short'}) . ""); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit"), -class => "list", -title => "$co{'title'}"}, + "" . esc_html($co{'title_short'}) . ""); } else { - print $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit"), -class => "list"}, - "" . escapeHTML($co{'title_short'}) . ""); + print $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit"), -class => "list"}, + "" . esc_html($co{'title_short'}) . ""); } print "" . - $cgi->a({-href => esc("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . - " | " . $cgi->a({-href => esc("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=commit;h=$commit")}, "commit") . + " | " . $cgi->a({-href => esc_url("$my_uri?p=$project;a=commitdiff;h=$commit")}, "commitdiff") . "
" . - $cgi->a({-href => esc("$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -title => "Alt-n"}, "next") . + $cgi->a({-href => esc_url("$my_uri?p=$project;a=shortlog;h=$hash;pg=" . ($page+1)), -title => "Alt-n"}, "next") . "