update

use our own instead of default.

now don't rely on matcher = argv[0] set explicitly at compilation.

* src/grep.c: The Matcher is not set to argv[0] but
explicitly by a #define MATCHER at compile time default is "grep".

2 files changed, 79 insertions, 58 deletions

diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 5ea42b98..ee795144 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -41,9 +41,11 @@ const struct _msg_ent _msg_tbl[] = {
   {"memory exhausted", 32},
   {"%s: warning: %s: %s\n", 33},
   {"writing output", 34},
-  {"Usage: %s [OPTION]... PATTERN [FILE]...\n", 35},
-  {"Try `%s --help' for more information.\n", 36},
-  {"Usage: %s [OPTION]... PATTERN [FILE] ...\n", 37},
+  {"Binary file %s matches\n", 35},
+  {"(standard input)", 36},
+  {"Usage: %s [OPTION]... PATTERN [FILE]...\n", 37},
+  {"Try `%s --help' for more information.\n", 38},
+  {"Usage: %s [OPTION]... PATTERN [FILE] ...\n", 39},
   {"\
 Search for PATTERN in each FILE or standard input.\n\
 \n\
@@ -55,14 +57,14 @@ Regexp selection and interpretation:\n\
   -f, --file=FILE           obtain PATTERN from FILE\n\
   -i, --ignore-case         ignore case distinctions\n\
   -w, --word-regexp         force PATTERN to match only whole words\n\
-  -x, --line-regexp         force PATTERN to match only whole lines\n", 38},
+  -x, --line-regexp         force PATTERN to match only whole lines\n", 40},
   {"\
 \n\
 Miscellaneous:\n\
   -s, --no-messages         suppress error messages\n\
   -v, --revert-match        select non-matching lines\n\
   -V, --version             print version information and exit\n\
-      --help                display this help and exit\n", 39},
+      --help                display this help and exit\n", 41},
   {"\
 \n\
 Output control:\n\
@@ -71,38 +73,43 @@ Output control:\n\
   -H, --with-filename       print the filename for each match\n\
   -h, --no-filename         suppress the prefixing filename on output\n\
   -q, --quiet, --silent     suppress all normal output\n\
+  -a, --text                do not suppress binary output\n\
+  -d, --directories=ACTION  how to handle directories\n\
+                            ACTION is 'read', 'recurse', or 'skip'.\n\
+  -r, --recursive           equivalent to --directories=recurse.\n\
   -L, --files-without-match only print FILE names containing no match\n\
   -l, --files-with-matches  only print FILE names containing matches\n\
-  -c, --count               only print a count of matching lines per FILE\n", 40},
+  -c, --count               only print a count of matching lines per FILE\n", 42},
   {"\
 \n\
 Context control:\n\
   -B, --before-context=NUM  print NUM lines of leading context\n\
   -A, --after-context=NUM   print NUM lines of trailing context\n\
-  -NUM                      same as both -B NUM and -A NUM\n\
-  -C, --context             same as -2\n\
+  -C, --context[=NUM]       print NUM (default 2) lines of output context\n\
+                            unless overriden by -A or -B\n\
+  -NUM                      same as --contex=NUM\n\
   -U, --binary              do not strip CR characters at EOL (MSDOS)\n\
   -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n\
 \n\
 If no -[GEF], then `egrep' assumes -E, `fgrep' -F, else -G.\n\
 With no FILE, or when FILE is -, read standard input. If less than\n\
 two FILEs given, assume -h. Exit with 0 if matches, with 1 if none.\n\
-Exit with 2 if syntax errors or system errors.\n", 41},
+Exit with 2 if syntax errors or system errors.\n", 43},
   {"\
 \n\
-Report bugs to <bug-gnu-utils@gnu.org>.\n", 42},
-  {"invalid context length argument", 43},
-  {"you may specify only one of -E, -F, or -G", 44},
-  {"matcher already specified", 45},
-  {"grep (GNU grep) %s\n", 46},
+Report bugs to <bug-gnu-utils@gnu.org>.\n", 44},
+  {"invalid context length argument", 45},
+  {"infalid context length argument", 46},
+  {"you may specify only one of -E, -F, or -G", 47},
+  {"matcher already specified", 48},
+  {"unknown directories method", 49},
+  {"grep (GNU grep) %s\n", 50},
   {"\
-Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n", 47},
+Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n", 51},
   {"\
 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", 48},
-  {"(standard input)", 49},
-  {"(standard input)\n", 50},
-  {"memory exhausted\n", 51},
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 52},
+  {"memory exhausted\n", 53},
 };
 
-int _msg_tbl_length = 51;
+int _msg_tbl_length = 53;
diff --git a/po/grep.pot b/po/grep.pot
index 4b904055..f2795915 100644
--- a/po/grep.pot
+++ b/po/grep.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-04-26 19:31-0400\n"
+"POT-Creation-Date: 1998-11-08 15:31-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: src/dfa.c:147 src/dfa.c:159 src/dfa.c:172
+#: src/dfa.c:155 src/dfa.c:167 src/dfa.c:180 src/grep.c:766
 msgid "Memory exhausted"
 msgstr ""
 
-#: src/dfa.c:444
+#: src/dfa.c:452
 msgid "Unfinished \\ escape"
 msgstr ""
 
@@ -27,32 +27,32 @@ msgstr ""
 #. {M,} - minimum count, maximum is infinity
 #. {,M} - 0 through M
 #. {M,N} - M through N
-#: src/dfa.c:556 src/dfa.c:562 src/dfa.c:573 src/dfa.c:584
+#: src/dfa.c:564 src/dfa.c:570 src/dfa.c:581 src/dfa.c:592
 msgid "unfinished repeat count"
 msgstr ""
 
-#: src/dfa.c:569 src/dfa.c:583 src/dfa.c:587
+#: src/dfa.c:577 src/dfa.c:591 src/dfa.c:595
 msgid "malformed repeat count"
 msgstr ""
 
-#: src/dfa.c:652 src/dfa.c:655 src/dfa.c:682 src/dfa.c:686 src/dfa.c:687
-#: src/dfa.c:690 src/dfa.c:703 src/dfa.c:704
+#: src/dfa.c:660 src/dfa.c:663 src/dfa.c:690 src/dfa.c:694 src/dfa.c:695
+#: src/dfa.c:698 src/dfa.c:711 src/dfa.c:712
 msgid "Unbalanced ["
 msgstr ""
 
-#: src/dfa.c:841
+#: src/dfa.c:849
 msgid "Unbalanced ("
 msgstr ""
 
-#: src/dfa.c:962
+#: src/dfa.c:970
 msgid "No syntax specified"
 msgstr ""
 
-#: src/dfa.c:970
+#: src/dfa.c:978
 msgid "Unbalanced )"
 msgstr ""
 
-#: src/dfa.c:1990
+#: src/dfa.c:1998
 msgid "out of memory"
 msgstr ""
 
@@ -161,36 +161,45 @@ msgstr ""
 msgid "non-option ARGV-elements: "
 msgstr ""
 
-#: src/grep.c:144 src/grep.c:161 src/grep.c:222 src/grep.c:263 src/kwset.c:184
+#: src/grep.c:158 src/grep.c:175 src/grep.c:237 src/grep.c:294 src/kwset.c:184
 #: src/kwset.c:190
 msgid "memory exhausted"
 msgstr ""
 
-#: src/grep.c:293
+#: src/grep.c:324
 #, c-format
 msgid "%s: warning: %s: %s\n"
 msgstr ""
 
-#: src/grep.c:392 src/grep.c:1034
+#: src/grep.c:429 src/grep.c:1220
 msgid "writing output"
 msgstr ""
 
-#: src/grep.c:597
+#: src/grep.c:655
+#, c-format
+msgid "Binary file %s matches\n"
+msgstr ""
+
+#: src/grep.c:670
+msgid "(standard input)"
+msgstr ""
+
+#: src/grep.c:800
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr ""
 
-#: src/grep.c:598
+#: src/grep.c:801
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/grep.c:602
+#: src/grep.c:805
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr ""
 
-#: src/grep.c:603
+#: src/grep.c:806
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
 "\n"
@@ -205,7 +214,7 @@ msgid ""
 "  -x, --line-regexp         force PATTERN to match only whole lines\n"
 msgstr ""
 
-#: src/grep.c:615
+#: src/grep.c:818
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -215,7 +224,7 @@ msgid ""
 "      --help                display this help and exit\n"
 msgstr ""
 
-#: src/grep.c:622
+#: src/grep.c:825
 msgid ""
 "\n"
 "Output control:\n"
@@ -224,19 +233,24 @@ msgid ""
 "  -H, --with-filename       print the filename for each match\n"
 "  -h, --no-filename         suppress the prefixing filename on output\n"
 "  -q, --quiet, --silent     suppress all normal output\n"
+"  -a, --text                do not suppress binary output\n"
+"  -d, --directories=ACTION  how to handle directories\n"
+"                            ACTION is 'read', 'recurse', or 'skip'.\n"
+"  -r, --recursive           equivalent to --directories=recurse.\n"
 "  -L, --files-without-match only print FILE names containing no match\n"
 "  -l, --files-with-matches  only print FILE names containing matches\n"
 "  -c, --count               only print a count of matching lines per FILE\n"
 msgstr ""
 
-#: src/grep.c:633
+#: src/grep.c:840
 msgid ""
 "\n"
 "Context control:\n"
 "  -B, --before-context=NUM  print NUM lines of leading context\n"
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
-"  -NUM                      same as both -B NUM and -A NUM\n"
-"  -C, --context             same as -2\n"
+"  -C, --context[=NUM]       print NUM (default 2) lines of output context\n"
+"                            unless overriden by -A or -B\n"
+"  -NUM                      same as --contex=NUM\n"
 "  -U, --binary              do not strip CR characters at EOL (MSDOS)\n"
 "  -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n"
 "\n"
@@ -246,48 +260,48 @@ msgid ""
 "Exit with 2 if syntax errors or system errors.\n"
 msgstr ""
 
-#: src/grep.c:647
+#: src/grep.c:855
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
 
-#: src/grep.c:785 src/grep.c:792
+#: src/grep.c:1006 src/grep.c:1013
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:800 src/grep.c:805 src/grep.c:810
+#: src/grep.c:1022
+msgid "infalid context length argument"
+msgstr ""
+
+#: src/grep.c:1029 src/grep.c:1034 src/grep.c:1039
 msgid "you may specify only one of -E, -F, or -G"
 msgstr ""
 
-#: src/grep.c:829
+#: src/grep.c:1058
 msgid "matcher already specified"
 msgstr ""
 
-#: src/grep.c:915
+#: src/grep.c:1079
+msgid "unknown directories method"
+msgstr ""
+
+#: src/grep.c:1165
 #, c-format
 msgid "grep (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:917
+#: src/grep.c:1167
 msgid ""
 "Copyright (C) 1988, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:919
+#: src/grep.c:1169
 msgid ""
 "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"
 msgstr ""
 
-#: src/grep.c:964 src/grep.c:1015
-msgid "(standard input)"
-msgstr ""
-
-#: src/grep.c:1027 src/grep.c:1030
-msgid "(standard input)\n"
-msgstr ""
-
 #: src/obstack.c:467
 msgid "memory exhausted\n"
 msgstr ""