First draft

[oweals/busybox.git] / grep.c

diff --git a/grep.c b/grep.c
index de1c820a040d788bbde21be40dad9465fc019d4f..84bb99667373720d1fcbb0108a89988d691e2ca7 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1,7 +1,9 @@
 /*
  * Mini grep implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
+ *
+ * Copyright (C) 1999 by Lineo, inc.
+ * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,6 +22,7 @@
  */
 
 #include "internal.h"
+#include "regexp.h"
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
@@ -28,42 +31,42 @@
 #include <time.h>
 #include <ctype.h>
 
-
-const char grep_usage[] =
-"grep [-ihn]... PATTERN [FILE]...\n"
+static const char grep_usage[] =
+"grep [OPTIONS]... PATTERN [FILE]...\n\n"
 "Search 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"
 "\t-n\tprint line number with output lines\n\n"
-"This version of grep matches strings (not full regexps).\n";
+#if defined BB_REGEXP
+"This version of grep matches full regular expresions.\n";
+#else
+"This version of grep matches strings (not regular expresions).\n";
+#endif
 
 
-/*
- * See if the specified needle is found in the specified haystack.
- */
-static int search (const char *haystack, const char *needle, int ignoreCase)
+static void do_grep(FILE *fp, char* needle, char *fileName, int tellName, int ignoreCase, int tellLine)
 {
+    char *cp;
+    long line = 0;
+    char haystack[BUF_SIZE];
 
-    if (ignoreCase == FALSE) {
-       haystack = strstr (haystack, needle);
-       if (haystack == NULL)
-           return FALSE;
-       return TRUE;
-    } else {
-       int i;
-       char needle1[BUF_SIZE];
-       char haystack1[BUF_SIZE];
-
-       strncpy( haystack1, haystack, sizeof(haystack1));
-       strncpy( needle1, needle, sizeof(needle1));
-       for( i=0; i<sizeof(haystack1) && haystack1[i]; i++)
-           haystack1[i]=tolower( haystack1[i]);
-       for( i=0; i<sizeof(needle1) && needle1[i]; i++)
-           needle1[i]=tolower( needle1[i]);
-       haystack = strstr (haystack1, needle1);
-       if (haystack == NULL)
-           return FALSE;
-       return TRUE;
+    while (fgets (haystack, sizeof (haystack), fp)) {
+       line++;
+       cp = &haystack[strlen (haystack) - 1];
+
+       if (*cp != '\n')
+           fprintf (stderr, "%s: Line too long\n", fileName);
+
+       if (find_match(haystack, needle, ignoreCase) == TRUE) {
+           if (tellName==TRUE)
+               printf ("%s:", fileName);
+
+           if (tellLine==TRUE)
+               printf ("%ld:", line);
+
+           fputs (haystack, stdout);
+       }
     }
 }
 
@@ -71,14 +74,13 @@ static int search (const char *haystack, const char *needle, int ignoreCase)
 extern int grep_main (int argc, char **argv)
 {
     FILE *fp;
-    const char *needle;
-    const char *name;
-    const char *cp;
-    int tellName=TRUE;
+    char *cp;
+    char *needle;
+    char *fileName;
+    int tellName=FALSE;
     int ignoreCase=FALSE;
     int tellLine=FALSE;
-    long line;
-    char buf[BUF_SIZE];
+
 
     ignoreCase = FALSE;
     tellLine = FALSE;
@@ -100,7 +102,7 @@ extern int grep_main (int argc, char **argv)
                break;
 
            case 'h':
-               tellName = FALSE;
+               tellName = TRUE;
                break;
 
            case 'n':
@@ -115,39 +117,24 @@ extern int grep_main (int argc, char **argv)
     needle = *argv++;
     argc--;
 
-    while (argc-- > 0) {
-       name = *argv++;
-
-       fp = fopen (name, "r");
-       if (fp == NULL) {
-           perror (name);
-           continue;
-       }
-
-       line = 0;
-
-       while (fgets (buf, sizeof (buf), fp)) {
-           line++;
-           cp = &buf[strlen (buf) - 1];
-
-           if (*cp != '\n')
-               fprintf (stderr, "%s: Line too long\n", name);
-
-           if (search (buf, needle, ignoreCase)==TRUE) {
-               if (tellName==TRUE)
-                   printf ("%s: ", name);
-
-               if (tellLine==TRUE)
-                   printf ("%ld: ", line);
+    if (argc==0) {
+       do_grep( stdin, needle, "stdin", FALSE, ignoreCase, tellLine);
+    } else {
+       while (argc-- > 0) {
+           fileName = *argv++;
 
-               fputs (buf, stdout);
+           fp = fopen (fileName, "r");
+           if (fp == NULL) {
+               perror (fileName);
+               continue;
            }
-       }
 
-       if (ferror (fp))
-           perror (name);
+           do_grep( fp, needle, fileName, tellName, ignoreCase, tellLine);
 
-       fclose (fp);
+           if (ferror (fp))
+               perror (fileName);
+           fclose (fp);
+       }
     }
     exit( TRUE);
 }