development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into maint

Browse source 
* jm/maint-1.6.5-grep-NUL-terminate:
  grep: NUL terminate input from a file
This commit is contained in:
Junio C Hamano 2010-01-18 17:03:34 -08:00
parent b9cb07726a 34f3999206
commit 7d0dafe394
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
builtin-grep.c
View file

@ -205,6 +205,7 @@ static int grep_file(struct grep_opt *opt, const char *filename)
return 0;
}
close(i);
data[sz] = 0;
if (opt->relative && opt->prefix_length)
filename = quote_path_relative(filename, -1, &buf, opt->prefix);
i = grep_buffer(opt, filename, data, sz);