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 1272a464b33c03aa5240ef39beb34aa44885cfff..0e495ff87e19648c674941a47e80cd144839a568 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -54,9 +54,9 @@ 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
        ;
@@ -66,15 +66,12 @@ 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;
        int  truth = !invertSearch;
 
        while ((haystack = cstring_lineFromFile(fp))) {
                line++;
-               cp = &haystack[strlen(haystack) - 1];
-
                if (find_match(haystack, needle, ignoreCase) == truth) {
                        if (tellName == TRUE)
                                printf("%s:", fileName);
@@ -166,7 +163,7 @@ extern int grep_main(int argc, char **argv)
                        fclose(fp);
                }
        }
-       exit(match);
+       return(match);
 }