diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | configure.ac.in | 2 | ||||
| -rw-r--r-- | src/grep.c | 9 | ||||
| -rwxr-xr-x | tests/foad1.sh | 7 |
6 files changed, 38 insertions, 6 deletions
@@ -1,3 +1,20 @@ +2007-10-10 Tony Abou-Assaleh <taa@acm.org> + + * configure.ac.in: update version to 2.6-dev + + * src/grep.c: update --version message + +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 @@ -3217,3 +3234,8 @@ 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. @@ -1,6 +1,6 @@ Version 2.5.2 - The new option --exclude-dir allows to specify a directory pattern that - will be exclided from recursive grep. + will be excluded from recursive grep. - Numerous bug fixes Version 2.5.1 @@ -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://flame.cs.dal.ca/~taa/greps.html>. +Check <http://tony.abou-assaleh.net/greps.html>. Take a look at: -- cgrep (Context grep) seems like nice work; -- sgrep (Struct grep); diff --git a/configure.ac.in b/configure.ac.in index 3c83fabd..8a5792e4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -26,7 +26,7 @@ dnl Bernhard Rosenkraenzer <bero@arklinux.org> dnl Stepan Kasal <kasal@gnu.org> dnl -AC_INIT(GNU grep, 2.5.3, bug-grep@gnu.org, grep) +AC_INIT(GNU grep, 2.6-cvs, bug-grep@gnu.org, grep) AC_CONFIG_SRCDIR(src/grep.c) AC_DEFINE(GREP, 1, [We are building grep]) AC_PREREQ(2.53) @@ -1907,6 +1907,7 @@ main (int argc, char **argv) case 'H': with_filenames = 1; + no_filenames = 0; break; case 'I': @@ -1987,6 +1988,7 @@ main (int argc, char **argv) break; case 'h': + with_filenames = 0; no_filenames = 1; break; @@ -2180,10 +2182,11 @@ main (int argc, char **argv) { printf ("%s\n\n", PACKAGE_STRING); printf (_("\ -Copyright (C) 1988, 1992-2002, 2004, 2005 Free Software Foundation, Inc.\n")); +Copyright (C) 2007 Free Software Foundation, Inc.\n")); printf (_("\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n")); +License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\ +This is free software: you are free to change and redistribute it.\n\ +There is NO WARRANTY, to the extent permitted by law.\n")); printf ("\n"); exit (0); } diff --git a/tests/foad1.sh b/tests/foad1.sh index 47015750..3c12ece5 100755 --- a/tests/foad1.sh +++ b/tests/foad1.sh @@ -55,6 +55,13 @@ 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 |