summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Wienand <ianw@vmware.com>2010-04-30 07:32:10 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2010-04-30 07:32:10 (GMT)
commit0a2c793bd61540629d5686adb5afd2ada19d624f (patch)
treea40bb43c93cb08dddbe91363d3ae3a8ac63603f3
parentd2844fcb6862c080177aaf314cc98d03e65b05ac (diff)
downloadbusybox-0a2c793bd61540629d5686adb5afd2ada19d624f.tar.gz
busybox-0a2c793bd61540629d5686adb5afd2ada19d624f.tar.bz2
grep: fix -Fi
function old new delta grep_file 1151 1169 +18 Signed-off-by: Ian Wienand <ianw@vmware.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--findutils/grep.c5
-rwxr-xr-xtestsuite/grep.tests2
2 files changed, 6 insertions, 1 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index 40caef4..0f1c11a 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -254,7 +254,10 @@ static int grep_file(FILE *file)
while (pattern_ptr) {
gl = (grep_list_data_t *)pattern_ptr->data;
if (FGREP_FLAG) {
- found |= (strstr(line, gl->pattern) != NULL);
+ found |= (((option_mask32 & OPT_i)
+ ? strcasestr(line, gl->pattern)
+ : strstr(line, gl->pattern)
+ ) != NULL);
} else {
if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
gl->flg_mem_alocated_compiled |= COMPILED;
diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index 8692307..d4bf80d 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -75,6 +75,8 @@ testing "grep handles multiple regexps" "grep -e one -e two input ; echo \$?" \
"one\ntwo\n0\n" "one\ntwo\n" ""
testing "grep -F handles multiple expessions" "grep -F -e one -e two input ; echo \$?" \
"one\ntwo\n0\n" "one\ntwo\n" ""
+testing "grep -F handles -i" "grep -F -i foo input ; echo \$?" \
+ "FOO\n0\n" "FOO\n" ""
# -f file/-
testing "grep can read regexps from stdin" "grep -f - input ; echo \$?" \