mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jn/maint-gitweb-grep-fix'

Browse Source 
* jn/maint-gitweb-grep-fix:
  gitweb: Harden "grep" search against filenames with ':'
  gitweb: Fix file links in "grep" search
This commit is contained in:
Junio C Hamano
2012-01-16 16:45:56 -08:00
parent 6db5c6e43d 8e09fd1a1e
commit b63103e908
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gitweb/gitweb.perl
View File

@ -5836,7 +5836,7 @@ sub git_search_files {
my %co = @_; my %co = @_;
local $/ = "\n"; local $/ = "\n";
open my $fd, "-|", git_cmd(), 'grep', '-n', open my $fd, "-|", git_cmd(), 'grep', '-n', '-z',
$search_use_regexp ? ('-E', '-i') : '-F', $search_use_regexp ? ('-E', '-i') : '-F',
$searchtext, $co{'tree'} $searchtext, $co{'tree'}
or die_error(500, "Open git-grep failed"); or die_error(500, "Open git-grep failed");
@ -5852,13 +5852,14 @@ sub git_search_files {
my $lastfile = ''; my $lastfile = '';
while (my $line = <$fd>) { while (my $line = <$fd>) {
chomp $line; chomp $line;
my ($file, $lno, $ltext, $binary); my ($file, $file_href, $lno, $ltext, $binary);
last if ($matches++ > 1000); last if ($matches++ > 1000);
if ($line =~ /^Binary file (.+) matches$/) { if ($line =~ /^Binary file (.+) matches$/) {
$file = $1; $file = $1;
$binary = 1; $binary = 1;
} else { } else {
(undef, $file, $lno, $ltext) = split(/:/, $line, 4); ($file, $lno, $ltext) = split(/\0/, $line, 3);
$file =~ s/^$co{'tree'}://;
} }
if ($file ne $lastfile) { if ($file ne $lastfile) {
$lastfile and print "</td></tr>\n"; $lastfile and print "</td></tr>\n";
@ -5867,10 +5868,10 @@ sub git_search_files {
} else { } else {
print "<tr class=\"light\">\n"; print "<tr class=\"light\">\n";
} }
$file_href = href(action=>"blob", hash_base=>$co{'id'},
file_name=>$file);
print "<td class=\"list\">". print "<td class=\"list\">".
$cgi->a({-href => href(action=>"blob", hash=>$co{'hash'}, $cgi->a({-href => $file_href, -class => "list"}, esc_path($file));
file_name=>"$file"),
-class => "list"}, esc_path($file));
print "</td><td>\n"; print "</td><td>\n";
$lastfile = $file; $lastfile = $file;
} }
@ -5888,10 +5889,9 @@ sub git_search_files {
$ltext = esc_html($ltext, -nbsp=>1); $ltext = esc_html($ltext, -nbsp=>1);
} }
print "<div class=\"pre\">" . print "<div class=\"pre\">" .
$cgi->a({-href => href(action=>"blob", hash=>$co{'hash'}, $cgi->a({-href => $file_href.'#l'.$lno,
file_name=>"$file").'#l'.$lno, -class => "linenr"}, sprintf('%4i', $lno)) .
-class => "linenr"}, sprintf('%4i', $lno)) ' ' . $ltext . "</div>\n";
. ' ' . $ltext . "</div>\n";
} }
} }
if ($lastfile) { if ($lastfile) {