diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/grep.c | 2 | ||||
| -rwxr-xr-x | tests/foad1.sh | 7 |
4 files changed, 1 insertions, 23 deletions
@@ -1,11 +1,3 @@ -2007-10-07 Tony Abou-Assaleh <taa@acm.org> - * src/grep.c: When -h and -H are combined, use the last specified, - Bug #15620, Patch #4866 - * tests/foad1.sh: add tests for -h and -H - * ChangeLog: Add a copyright notice (years taken from commit logs), - add a license notice (taken from gnulib ChangeLog) - * TODO: update the link to a list of other grep implementations - 2007-06-29 Bernhard Rosenkraenzer <bero@arklinux.org> * all files: GPLv3 @@ -3225,8 +3217,3 @@ axes.) 1993-05-22 Mike Haertel <mike@cs.uoregon.edu> * Version 2.0 released. - -Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 - Free Software Foundation, Inc. -Copying and distribution of this file, with or without modification, - are permitted provided the copyright notice and this notice are preserved. @@ -43,7 +43,7 @@ Sunday's "Quick Search" Algorithm (CACM 33, 8 August 1990 pp. 132-142) claim that his algo. is faster then Boyer-More ???? Worth Checking. -Check <http://tony.abou-assaleh.net/greps.html>. +Check <http://flame.cs.dal.ca/~taa/greps.html>. Take a look at: -- cgrep (Context grep) seems like nice work; -- sgrep (Struct grep); @@ -1907,7 +1907,6 @@ main (int argc, char **argv) case 'H': with_filenames = 1; - no_filenames = 0; break; case 'I': @@ -1988,7 +1987,6 @@ main (int argc, char **argv) break; case 'h': - with_filenames = 0; no_filenames = 1; break; diff --git a/tests/foad1.sh b/tests/foad1.sh index 3c12ece5..47015750 100755 --- a/tests/foad1.sh +++ b/tests/foad1.sh @@ -55,13 +55,6 @@ grep_test "wA wB/" "(standard input):wA/(standard input):wB/" "w." -o -H grep_test "wA wB/" "(standard input):wA/(standard input):wB/" "w." -o -H -i grep_test "wA wB/" "(standard input):wA/(standard input):wB/" "w." -o -H -3 2>/dev/null -# Combination of -h and -H -grep_test "wA wB/" "wA wB/" "w." -grep_test "wA wB/" "wA wB/" "w." -h -grep_test "wA wB/" "wA wB/" "w." -H -h -grep_test "wA wB/" "(standard input):wA wB/" "w." -H -grep_test "wA wB/" "(standard input):wA wB/" "w." -h -H - # End of a previous match should not match a "start of ..." expression. grep_test "word_word/" "word_/" "^word_*" -o grep_test "wordword/" "word/" "\<word" -o |