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

grep: support NUL chars in search strings for -F

Browse Source 
Search patterns in a file specified with -f can contain NUL characters.
The current code ignores all characters on a line after a NUL.

Pass the actual length of the line all the way from the pattern file to
fixmatch() and use it for case-sensitive fixed string matching.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2010-05-22 23:43:43 +02:00
committed by Junio C Hamano
parent f96e56733a
commit ed40a0951c
4 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
grep.h
View File

@ -29,6 +29,7 @@ struct grep_pat {
int no;
enum grep_pat_token token;
const char *pattern;
size_t patternlen;
enum grep_header_field field;
regex_t regexp;
unsigned fixed:1;
@ -104,6 +105,7 @@ struct grep_opt {
void *output_priv;
};
extern void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);
extern void append_grep_pattern(struct grep_opt *opt, const char *pat, const char *origin, int no, enum grep_pat_token t);
extern void append_header_grep_pattern(struct grep_opt *, enum grep_header_field, const char *);
extern void compile_grep_patterns(struct grep_opt *opt);