summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/grep.c6
-rw-r--r--tests/bre.awk2
-rw-r--r--tests/ere.awk2
-rw-r--r--tests/spencer1.awk2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/grep.c b/src/grep.c
index 57019e33..f33b1b46 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -1118,21 +1118,21 @@ main (argc, argv)
if (matcher && strcmp (matcher, "posix-egrep") != 0)
fatal (_("you may specify only one of -E, -F, or -G"), 0);
if (strcmp (default_matcher, "grep") != 0)
- fatal (_("different matcher can only be specified with grep"), 0);
+ fatal (_("different matchers can only be specify with grep"), 0);
matcher = "posix-egrep";
break;
case 'F':
if (matcher && strcmp(matcher, "fgrep") != 0)
fatal(_("you may specify only one of -E, -F, or -G"), 0);;
if (strcmp (default_matcher, "grep") != 0)
- fatal (_("different matcher can only be specified with grep"), 0);
+ fatal (_("different matchers can only be specify with grep"), 0);
matcher = "fgrep";
break;
case 'G':
if (matcher && strcmp (matcher, "grep") != 0)
fatal (_("you may specify only one of -E, -F, or -G"), 0);
if (strcmp (default_matcher, "grep") != 0)
- fatal (_("different matcher can only be specified with grep"), 0);
+ fatal (_("different matchers can only be specify with grep"), 0);
matcher = "grep";
break;
case 'H':
diff --git a/tests/bre.awk b/tests/bre.awk
index 025d4a44..e42bde84 100644
--- a/tests/bre.awk
+++ b/tests/bre.awk
@@ -8,7 +8,7 @@ BEGIN {
$0 ~ /^#/ { next; }
NF == 3 {
- printf ("echo '%s' | { ${GREP} -e '%s' > /dev/null 2>&1 ; cat > /dev/null }\n",$3, $2);
+ printf ("echo '%s' | { ${GREP} -e '%s' > /dev/null 2>&1 ; cat > /dev/null ; }\n",$3, $2);
printf ("if test $? -ne %s ; then\n", $1);
printf ("\techo Spencer bre test \\#%d failed\n", ++n);
printf ("\tfailures=1\n");
diff --git a/tests/ere.awk b/tests/ere.awk
index b790ee2a..0a54ca03 100644
--- a/tests/ere.awk
+++ b/tests/ere.awk
@@ -8,7 +8,7 @@ BEGIN {
$0 ~ /^#/ { next; }
NF == 3 {
- printf ("echo '%s' | { ${GREP} -E -e '%s' > /dev/null 2>&1 ; cat > /dev/null }\n",$3, $2);
+ printf ("echo '%s' | { ${GREP} -E -e '%s' > /dev/null 2>&1 ; cat > /dev/null ; }\n",$3, $2);
printf ("if test $? -ne %s ; then\n", $1);
printf ("\techo Spencer ere test \\#%d failed\n", ++n);
printf ("\tfailures=1\n");
diff --git a/tests/spencer1.awk b/tests/spencer1.awk
index 05603bee..520a34be 100644
--- a/tests/spencer1.awk
+++ b/tests/spencer1.awk
@@ -4,7 +4,7 @@ BEGIN {
}
$0 !~ /^#/ && NF = 3 {
- printf ("echo '%s'| { ${GREP} -E -e '%s' > /dev/null 2>&1 ; cat /dev/null }\n",$3, $2);
+ printf ("echo '%s'| { ${GREP} -E -e '%s' > /dev/null 2>&1 ; cat /dev/null ; }\n",$3, $2);
printf ("if test $? -ne %s ; then\n", $1);
printf ("\techo Spencer test \\#%d failed\n", ++n);
printf ("\tfailures=1\n");