Remove misguided klude around for 2.4.x-test* brokenness. Al Viro
[oweals/busybox.git] / grep.c
diff --git a/grep.c b/grep.c
index 84bb99667373720d1fcbb0108a89988d691e2ca7..c43ad013401d74538d271908f8af9fa91e8b7ddf 100644 (file)
--- a/grep.c
+++ b/grep.c
@@ -1,9 +1,8 @@
 /*
- * Mini grep implementation for busybox
+ * Mini grep implementation for busybox using libc regex.
  *
- *
- * Copyright (C) 1999 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999,2000 by Lineo, inc.
+ * Written by Mark Whitley <markw@lineo.com>, <markw@enol.com>
  *
  * 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
  *
  */
 
-#include "internal.h"
-#include "regexp.h"
 #include <stdio.h>
-#include <dirent.h>
+#include <stdlib.h>
+#include <unistd.h> /* for getopt() */
+#include <regex.h>
+#include <string.h> /* for strerror() */
 #include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <time.h>
-#include <ctype.h>
+#include "internal.h"
+
+extern int optind; /* in unistd.h */
+extern int errno;  /* for use with strerror() */
 
 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"
-#if defined BB_REGEXP
-"This version of grep matches full regular expresions.\n";
-#else
-"This version of grep matches strings (not regular expresions).\n";
+       "grep [-ihHnqvs] pattern [files...]\n"
+#ifndef BB_FEATURE_TRIVIAL_HELP
+       "\nSearch for PATTERN in each FILE or standard input.\n\n"
+       "Options:\n"
+       "\t-H\tprefix output lines with filename where match was found\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"
+       "\t-q\tbe quiet. Returns 0 if result was found, 1 otherwise\n"
+       "\t-v\tselect non-matching lines\n"
+       "\t-s\tsuppress file open/read error messages\n\n"
 #endif
+       ;
+
+/* options */
+static int ignore_case       = 0;
+static int print_filename    = 0;
+static int print_line_num    = 0;
+static int be_quiet          = 0;
+static int invert_search     = 0;
+static int suppress_err_msgs = 0;
 
+/* globals */
+static regex_t regex; /* storage space for compiled regular expression */
+static int nmatches = 0; /* keeps track of the number of matches */
+static char *cur_file = NULL; /* the current file we are reading */
+
+
+static void print_matched_line(char *line, int linenum)
+{
+       if (print_filename)
+               printf("%s:", cur_file);
+       if (print_line_num)
+               printf("%i:", linenum);
+
+       printf("%s", line);
+}
 
-static void do_grep(FILE *fp, char* needle, char *fileName, int tellName, int ignoreCase, int tellLine)
+static void grep_file(FILE *file)
 {
-    char *cp;
-    long line = 0;
-    char haystack[BUF_SIZE];
+       char *line = NULL;
+       int ret;
+       int linenum = 0;
 
-    while (fgets (haystack, sizeof (haystack), fp)) {
-       line++;
-       cp = &haystack[strlen (haystack) - 1];
+       while ((line = get_line_from_file(file)) != NULL) {
+               linenum++;
+               ret = regexec(&regex, line, 0, NULL, 0);
+               if (ret == 0 && !invert_search) { /* match */
 
-       if (*cp != '\n')
-           fprintf (stderr, "%s: Line too long\n", fileName);
+                       /* if we found a match but were told to be quiet, stop here and
+                        * return success */
+                       if (be_quiet) {
+                               regfree(&regex);
+                               exit(0);
+                       }
 
-       if (find_match(haystack, needle, ignoreCase) == TRUE) {
-           if (tellName==TRUE)
-               printf ("%s:", fileName);
+                       nmatches++;
 
-           if (tellLine==TRUE)
-               printf ("%ld:", line);
+                       print_matched_line(line, linenum);
 
-           fputs (haystack, stdout);
+               } else if (ret == REG_NOMATCH && invert_search) {
+                       print_matched_line(line, linenum);
+               }
+
+               free(line);
        }
-    }
 }
 
-
-extern int grep_main (int argc, char **argv)
+extern int grep_main(int argc, char **argv)
 {
-    FILE *fp;
-    char *cp;
-    char *needle;
-    char *fileName;
-    int tellName=FALSE;
-    int ignoreCase=FALSE;
-    int tellLine=FALSE;
-
-
-    ignoreCase = FALSE;
-    tellLine = FALSE;
-
-    argc--;
-    argv++;
-    if (argc < 1) {
-       usage(grep_usage);
-    }
-
-    if (**argv == '-') {
-       argc--;
-       cp = *argv++;
-
-       while (*++cp)
-           switch (*cp) {
-           case 'i':
-               ignoreCase = TRUE;
-               break;
-
-           case 'h':
-               tellName = TRUE;
-               break;
-
-           case 'n':
-               tellLine = TRUE;
-               break;
-
-           default:
-               usage(grep_usage);
-           }
-    }
+       int opt;
+       int reflags;
+       int ret;
 
-    needle = *argv++;
-    argc--;
-
-    if (argc==0) {
-       do_grep( stdin, needle, "stdin", FALSE, ignoreCase, tellLine);
-    } else {
-       while (argc-- > 0) {
-           fileName = *argv++;
+       /* do special-case option parsing */
+       if (argv[1] && (strcmp(argv[1], "--help") == 0))
+               usage(grep_usage);
 
-           fp = fopen (fileName, "r");
-           if (fp == NULL) {
-               perror (fileName);
-               continue;
-           }
+       /* do normal option parsing */
+       while ((opt = getopt(argc, argv, "iHhnqvs")) > 0) {
+               switch (opt) {
+                       case 'i':
+                               ignore_case++;
+                               break;
+                       case 'H':
+                               print_filename++;
+                               break;
+                       case 'h':
+                               print_filename--;
+                               break;
+                       case 'n':
+                               print_line_num++;
+                               break;
+                       case 'q':
+                               be_quiet++;
+                               break;
+                       case 'v':
+                               invert_search++;
+                               break;
+                       case 's':
+                               suppress_err_msgs++;
+                               break;
+               }
+       }
 
-           do_grep( fp, needle, fileName, tellName, ignoreCase, tellLine);
+       /* argv[optind] should be the regex pattern; no pattern, no worky */
+       if (argv[optind] == NULL)
+               usage(grep_usage);
 
-           if (ferror (fp))
-               perror (fileName);
-           fclose (fp);
+       /* compile the regular expression */
+       reflags = REG_NOSUB; /* we're not going to mess with sub-expressions */
+       if (ignore_case)
+               reflags |= REG_ICASE;
+       if ((ret = regcomp(&regex, argv[optind], reflags)) != 0) {
+               int errmsgsz = regerror(ret, &regex, NULL, 0);
+               char *errmsg = malloc(errmsgsz);
+               if (errmsg == NULL) {
+                       fprintf(stderr, "grep: memory error\n");
+                       regfree(&regex);
+                       exit(1);
+               }
+               regerror(ret, &regex, errmsg, errmsgsz);
+               fprintf(stderr, "grep: %s\n", errmsg);
+               free(errmsg);
+               regfree(&regex);
+               exit(1);
        }
-    }
-    exit( TRUE);
-}
 
+       /* argv[(optind+1)..(argc-1)] should be names of file to grep through. If
+        * there is more than one file to grep, we will print the filenames */
+       if ((argc-1) - (optind+1) > 0)
+               print_filename++;
+
+       /* If no files were specified, or '-' was specified, take input from
+        * stdin. Otherwise, we grep through all the files specified. */
+       if (argv[optind+1] == NULL || (strcmp(argv[optind+1], "-") == 0)) {
+               grep_file(stdin);
+       } else {
+               int i;
+               FILE *file;
+               for (i = optind + 1; i < argc; i++) {
+                       cur_file = argv[i];
+                       file = fopen(cur_file, "r");
+                       if (file == NULL) {
+                               if (!suppress_err_msgs)
+                                       fprintf(stderr, "grep: %s: %s\n", cur_file, strerror(errno));
+                       } else {
+                               grep_file(file);
+                               fclose(file);
+                       }
+               }
+       }
 
-/* END CODE */
+       regfree(&regex);
 
+       if (nmatches == 0)
+               return 1;
 
+       return 0;
+}