Paolo Bonzini wrote: > * NEWS: Document slight semantic change. > * TODO: #ifdefs are gone. > * po/POTFILES.in: Update. > * src/Makefile.am (grep_SOURCES, egrep_SOURCES, fgrep_SOURCES): Remove > grep.c/egrep.c/fgrep.c. > (noinst_LIBRARIES): Change libsearch.a to libgrep.a. > (libsearch_a_SOURCES): Rename to libgrep_a_SOURCES, add grep.c > (LDADD): Change libsearch.a to libgrep.a. > * src/esearch.c: Add before_options and after_options. > * src/fsearch.c: Likewise. > * src/gsearch.c: Likewise. > * src/grep.c (short_options, long_options): Remove GREP_PROGRAM > special-casing. > (usage): Use before_options and after_options, look at matchers. > (setmatcher): Merge with install_matcher. > (main): Call setmatcher (NULL) before getopt instead of install_matcher after. > * src/grep.h (GREP_PROGRAM): Remove. > (before_options, after_options): Add. ... > +** Other changes > + > + egrep accepts the -E option and fgrep accepts the -F option. If egrep > + and fgrep are given another of the -E/-F/-G options, they print a more > + meaningful error message.
This seems fine and passes all tests on F12 x86_64 and ppc. ACK. Thanks!
