Fix a bug pointed out by Michal Jaegermann <michal@ellpspace.math.ualberta.ca>

where you used to see:
      ./grep -q -i B some_file
      B: No such file or directory
This is now fixed.
 -Erik

diff --git a/Changelog b/Changelog
index 50c28843bc9fdfc907f17e98a3dd5ad03cca7397..3a497d1a29f0318469ec4356cfb3e9fe3801095e 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -78,6 +78,7 @@
            for helping track this one down.
        * More doc updates
        * Fixed grep "Line too long" problem -- John Beppu
+       * Fixed 'grep -q -i B some_file' so it works
        * math takes input from stdin if no args are given.  -- John Beppu
 
 

diff --git a/findutils/grep.c b/findutils/grep.c
index bb1a1462242617667028c0945e00b53c003d9b05..1272a464b33c03aa5240ef39beb34aa44885cfff 100644 (file)
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -39,6 +39,9 @@
 #include <signal.h>
 #include <time.h>
 #include <ctype.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_too_few_args
+#include "messages.c"
 
 static const char grep_usage[] =
        "grep [OPTIONS]... PATTERN [FILE]...\n"
@@ -92,7 +95,6 @@ static void do_grep(FILE * fp, char *needle, char *fileName, int tellName,
 extern int grep_main(int argc, char **argv)
 {
        FILE *fp;
-       char *cp;
        char *needle;
        char *fileName;
        int tellName     = TRUE;
@@ -100,18 +102,14 @@ extern int grep_main(int argc, char **argv)
        int tellLine     = FALSE;
        int invertSearch = FALSE;
 
-       argc--;
-       argv++;
        if (argc < 1) {
                usage(grep_usage);
        }
+       argv++;
 
-       if (**argv == '-') {
-               argc--;
-               cp = *argv++;
-
-               while (*++cp)
-                       switch (*cp) {
+       while (--argc >= 0 && *argv && (**argv == '-')) {
+               while (*++(*argv)) {
+                       switch (**argv) {
                        case 'i':
                                ignoreCase = TRUE;
                                break;
@@ -135,6 +133,12 @@ extern int grep_main(int argc, char **argv)
                        default:
                                usage(grep_usage);
                        }
+               }
+               argv++;
+       }
+
+       if (argc == 0 || *argv == NULL) {
+               fatalError(too_few_args, "grep");
        }
 
        needle = *argv++;

diff --git a/grep.c b/grep.c
index bb1a1462242617667028c0945e00b53c003d9b05..1272a464b33c03aa5240ef39beb34aa44885cfff 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -39,6 +39,9 @@
 #include <signal.h>
 #include <time.h>
 #include <ctype.h>
+#define BB_DECLARE_EXTERN
+#define bb_need_too_few_args
+#include "messages.c"
 
 static const char grep_usage[] =
        "grep [OPTIONS]... PATTERN [FILE]...\n"
@@ -92,7 +95,6 @@ static void do_grep(FILE * fp, char *needle, char *fileName, int tellName,
 extern int grep_main(int argc, char **argv)
 {
        FILE *fp;
-       char *cp;
        char *needle;
        char *fileName;
        int tellName     = TRUE;
@@ -100,18 +102,14 @@ extern int grep_main(int argc, char **argv)
        int tellLine     = FALSE;
        int invertSearch = FALSE;
 
-       argc--;
-       argv++;
        if (argc < 1) {
                usage(grep_usage);
        }
+       argv++;
 
-       if (**argv == '-') {
-               argc--;
-               cp = *argv++;
-
-               while (*++cp)
-                       switch (*cp) {
+       while (--argc >= 0 && *argv && (**argv == '-')) {
+               while (*++(*argv)) {
+                       switch (**argv) {
                        case 'i':
                                ignoreCase = TRUE;
                                break;
@@ -135,6 +133,12 @@ extern int grep_main(int argc, char **argv)
                        default:
                                usage(grep_usage);
                        }
+               }
+               argv++;
+       }
+
+       if (argc == 0 || *argv == NULL) {
+               fatalError(too_few_args, "grep");
        }
 
        needle = *argv++;