Fixed segfault with 'cut -f 1 -d:' and added 'cut -s' suport.

[oweals/busybox.git] / grep.c

diff --git a/grep.c b/grep.c
index 06b6980bc02fd64a92e7d1bc5a75d9f57fa0cf73..0e495ff87e19648c674941a47e80cd144839a568 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -39,10 +39,14 @@
 #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\n"
-       "Search for PATTERN in each FILE or standard input.\n\n"
+       "grep [OPTIONS]... PATTERN [FILE]...\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nSearch for PATTERN in each FILE or standard input.\n\n"
        "OPTIONS:\n"
        "\t-h\tsuppress the prefixing filename on output\n"
        "\t-i\tignore case distinctions\n"
@@ -50,28 +54,24 @@ static const char grep_usage[] =
        "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n"
        "\t-v\tselect non-matching lines\n\n"
 #if defined BB_REGEXP
-       "This version of grep matches full regular expresions.\n";
+       "This version of grep matches full regular expressions.\n";
 #else
-       "This version of grep matches strings (not regular expresions).\n";
+       "This version of grep matches strings (not regular expressions).\n"
 #endif
+#endif
+       ;
 
 static int match = FALSE, beQuiet = FALSE;
 
 static void do_grep(FILE * fp, char *needle, char *fileName, int tellName,
                                        int ignoreCase, int tellLine, int invertSearch)
 {
-       char *cp;
        long line = 0;
-       char haystack[BUF_SIZE];
+       char *haystack;
        int  truth = !invertSearch;
 
-       while (fgets(haystack, sizeof(haystack), fp)) {
+       while ((haystack = cstring_lineFromFile(fp))) {
                line++;
-               cp = &haystack[strlen(haystack) - 1];
-
-               if (*cp != '\n')
-                       fprintf(stderr, "%s: Line too long\n", fileName);
-
                if (find_match(haystack, needle, ignoreCase) == truth) {
                        if (tellName == TRUE)
                                printf("%s:", fileName);
@@ -84,6 +84,7 @@ static void do_grep(FILE * fp, char *needle, char *fileName, int tellName,
 
                        match = TRUE;
                }
+               free(haystack);
        }
 }
 
@@ -91,7 +92,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;
@@ -99,18 +99,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;
@@ -134,6 +130,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++;
@@ -161,7 +163,7 @@ extern int grep_main(int argc, char **argv)
                        fclose(fp);
                }
        }
-       exit(match);
+       return(match);
 }