[PATCH v5 02/10] grep: break down an "if" stmt in preparation for next changes
STALE3762d
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 23:08:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v5 of 2 in this series.
Revisions (2)
- v5 current
- v6 [diff vs current]
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- grep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/grep.c b/grep.c
index 7b2b96a..e739d20 100644
--- a/grep.c
+++ b/grep.c@@ -403,9 +403,11 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt) p->word_regexp = opt->word_regexp; p->ignore_case = opt->ignore_case; - if (opt->fixed || is_fixed(p->pattern, p->patternlen)) + if (is_fixed(p->pattern, p->patternlen)) p->fixed = 1; - else + else if (opt->fixed) { + p->fixed = 1; + } else p->fixed = 0; if (p->fixed) {
--
2.7.0.288.g1d8ad15