*: add -Wunused-parameter; fix resulting breakage
[oweals/busybox.git] / findutils / grep.c
index e41f1a3be46e54fef943c2b50d7c37de8e847c55..c4cfcb8527abbf14e597deaddb990fcc7d92a1cb 100644 (file)
+/* vi: set sw=4 ts=4: */
 /*
  * Mini grep implementation for busybox using libc regex.
  *
  * Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley
  * Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
+/* BB_AUDIT SUSv3 defects - unsupported option -x.  */
+/* BB_AUDIT GNU defects - always acts as -a.  */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/grep.html */
 /*
- * Apr 2004 by Vladimir Oleynik <dzo@simtreas.ru> -
+ * 2004,2006 (C) Vladimir Oleynik <dzo@simtreas.ru> -
  * correction "-e pattern1 -e pattern2" logic and more optimizations.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <string.h>
-#include <errno.h>
-#include "busybox.h"
-#include "xregex.h"
+ * precompiled regex
+ */
+/*
+ * (C) 2006 Jac Goudsmit added -o option
+ */
 
+#include "libbb.h"
+#include "xregex.h"
 
 /* options */
-#define GREP_OPTS "lnqvscFiHhe:f:L"
-#define GREP_OPT_l (1<<0)
-static char print_files_with_matches;
-#define GREP_OPT_n (1<<1)
-static char print_line_num;
-#define GREP_OPT_q (1<<2)
-static char be_quiet;
-#define GREP_OPT_v (1<<3)
-typedef char invert_search_t;
-static invert_search_t invert_search;
-#define GREP_OPT_s (1<<4)
-static char suppress_err_msgs;
-#define GREP_OPT_c (1<<5)
-static char print_match_counts;
-#define GREP_OPT_F (1<<6)
-static char fgrep_flag;
-#define GREP_OPT_i (1<<7)
-#define GREP_OPT_H (1<<8)
-#define GREP_OPT_h (1<<9)
-#define GREP_OPT_e (1<<10)
-#define GREP_OPT_f (1<<11)
-#define GREP_OPT_L (1<<12)
-static char print_files_without_matches;
-#ifdef CONFIG_FEATURE_GREP_CONTEXT
-#define GREP_OPT_CONTEXT "A:B:C"
-#define GREP_OPT_A (1<<13)
-#define GREP_OPT_B (1<<14)
-#define GREP_OPT_C (1<<15)
-#define GREP_OPT_E (1<<16)
-#else
-#define GREP_OPT_CONTEXT ""
-#define GREP_OPT_E (1<<13)
-#endif
-#ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS
-# define OPT_EGREP "E"
-#else
-# define OPT_EGREP ""
+#define OPTSTR_GREP \
+       "lnqvscFiHhe:f:Lorm:" \
+       USE_FEATURE_GREP_CONTEXT("A:B:C:") \
+       USE_FEATURE_GREP_EGREP_ALIAS("E") \
+       USE_DESKTOP("w") \
+       "aI"
+/* ignored: -a "assume all files to be text" */
+/* ignored: -I "assume binary files have no matches" */
+
+enum {
+       OPTBIT_l, /* list matched file names only */
+       OPTBIT_n, /* print line# */
+       OPTBIT_q, /* quiet - exit(0) of first match */
+       OPTBIT_v, /* invert the match, to select non-matching lines */
+       OPTBIT_s, /* suppress errors about file open errors */
+       OPTBIT_c, /* count matches per file (suppresses normal output) */
+       OPTBIT_F, /* literal match */
+       OPTBIT_i, /* case-insensitive */
+       OPTBIT_H, /* force filename display */
+       OPTBIT_h, /* inhibit filename display */
+       OPTBIT_e, /* -e PATTERN */
+       OPTBIT_f, /* -f FILE_WITH_PATTERNS */
+       OPTBIT_L, /* list unmatched file names only */
+       OPTBIT_o, /* show only matching parts of lines */
+       OPTBIT_r, /* recurse dirs */
+       OPTBIT_m, /* -m MAX_MATCHES */
+       USE_FEATURE_GREP_CONTEXT(    OPTBIT_A ,) /* -A NUM: after-match context */
+       USE_FEATURE_GREP_CONTEXT(    OPTBIT_B ,) /* -B NUM: before-match context */
+       USE_FEATURE_GREP_CONTEXT(    OPTBIT_C ,) /* -C NUM: -A and -B combined */
+       USE_FEATURE_GREP_EGREP_ALIAS(OPTBIT_E ,) /* extended regexp */
+       USE_DESKTOP(                 OPTBIT_w ,) /* whole word match */
+       OPT_l = 1 << OPTBIT_l,
+       OPT_n = 1 << OPTBIT_n,
+       OPT_q = 1 << OPTBIT_q,
+       OPT_v = 1 << OPTBIT_v,
+       OPT_s = 1 << OPTBIT_s,
+       OPT_c = 1 << OPTBIT_c,
+       OPT_F = 1 << OPTBIT_F,
+       OPT_i = 1 << OPTBIT_i,
+       OPT_H = 1 << OPTBIT_H,
+       OPT_h = 1 << OPTBIT_h,
+       OPT_e = 1 << OPTBIT_e,
+       OPT_f = 1 << OPTBIT_f,
+       OPT_L = 1 << OPTBIT_L,
+       OPT_o = 1 << OPTBIT_o,
+       OPT_r = 1 << OPTBIT_r,
+       OPT_m = 1 << OPTBIT_m,
+       OPT_A = USE_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_A)) + 0,
+       OPT_B = USE_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_B)) + 0,
+       OPT_C = USE_FEATURE_GREP_CONTEXT(    (1 << OPTBIT_C)) + 0,
+       OPT_E = USE_FEATURE_GREP_EGREP_ALIAS((1 << OPTBIT_E)) + 0,
+       OPT_w = USE_DESKTOP(                 (1 << OPTBIT_w)) + 0,
+};
+
+#define PRINT_FILES_WITH_MATCHES    (option_mask32 & OPT_l)
+#define PRINT_LINE_NUM              (option_mask32 & OPT_n)
+#define BE_QUIET                    (option_mask32 & OPT_q)
+#define SUPPRESS_ERR_MSGS           (option_mask32 & OPT_s)
+#define PRINT_MATCH_COUNTS          (option_mask32 & OPT_c)
+#define FGREP_FLAG                  (option_mask32 & OPT_F)
+#define PRINT_FILES_WITHOUT_MATCHES (option_mask32 & OPT_L)
+
+struct globals {
+       int max_matches;
+       int reflags;
+       smalluint invert_search;
+       smalluint print_filename;
+       smalluint open_errors;
+#if ENABLE_FEATURE_GREP_CONTEXT
+       smalluint did_print_line;
+       int lines_before;
+       int lines_after;
+       char **before_buf;
+       int last_line_printed;
 #endif
-
-static int reflags;
-static int print_filename;
-
-#ifdef CONFIG_FEATURE_GREP_CONTEXT
-static int lines_before;
-static int lines_after;
-static char **before_buf;
-static int last_line_printed;
-#endif /* CONFIG_FEATURE_GREP_CONTEXT */
-
-/* globals used internally */
-static llist_t *pattern_head;   /* growable list of patterns to match */
-static char *cur_file;          /* the current file we are reading */
+       /* globals used internally */
+       llist_t *pattern_head;   /* growable list of patterns to match */
+       const char *cur_file;    /* the current file we are reading */
+};
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() \
+       do { \
+               struct G_sizecheck { \
+                       char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
+               }; \
+       } while (0)
+#define max_matches       (G.max_matches         )
+#define reflags           (G.reflags             )
+#define invert_search     (G.invert_search       )
+#define print_filename    (G.print_filename      )
+#define open_errors       (G.open_errors         )
+#define did_print_line    (G.did_print_line      )
+#define lines_before      (G.lines_before        )
+#define lines_after       (G.lines_after         )
+#define before_buf        (G.before_buf          )
+#define last_line_printed (G.last_line_printed   )
+#define pattern_head      (G.pattern_head        )
+#define cur_file          (G.cur_file            )
+
+
+typedef struct grep_list_data_t {
+       char *pattern;
+       regex_t preg;
+#define PATTERN_MEM_A 1
+#define COMPILED 2
+       int flg_mem_alocated_compiled;
+} grep_list_data_t;
 
 
 static void print_line(const char *line, int linenum, char decoration)
 {
-#ifdef CONFIG_FEATURE_GREP_CONTEXT
+#if ENABLE_FEATURE_GREP_CONTEXT
+       /* Happens when we go to next file, immediately hit match
+        * and try to print prev context... from prev file! Don't do it */
+       if (linenum < 1)
+               return;
        /* possibly print the little '--' separator */
-       if ((lines_before || lines_after) && last_line_printed &&
-                       last_line_printed < linenum - 1) {
+       if ((lines_before || lines_after) && did_print_line &&
+                       last_line_printed != linenum - 1) {
                puts("--");
        }
+       /* guard against printing "--" before first line of first file */
+       did_print_line = 1;
        last_line_printed = linenum;
 #endif
-       if (print_filename > 0)
+       if (print_filename)
                printf("%s%c", cur_file, decoration);
-       if (print_line_num)
+       if (PRINT_LINE_NUM)
                printf("%i%c", linenum, decoration);
-       puts(line);
+       /* Emulate weird GNU grep behavior with -ov */
+       if ((option_mask32 & (OPT_v|OPT_o)) != (OPT_v|OPT_o))
+               puts(line);
 }
 
-
 static int grep_file(FILE *file)
 {
        char *line;
-       invert_search_t ret;
+       smalluint found;
        int linenum = 0;
        int nmatches = 0;
-#ifdef CONFIG_FEATURE_GREP_CONTEXT
+       regmatch_t regmatch;
+#if ENABLE_FEATURE_GREP_CONTEXT
        int print_n_lines_after = 0;
        int curpos = 0; /* track where we are in the circular 'before' buffer */
        int idx = 0; /* used for iteration through the circular buffer */
-#endif /* CONFIG_FEATURE_GREP_CONTEXT */
+#else
+       enum { print_n_lines_after = 0 };
+#endif /* ENABLE_FEATURE_GREP_CONTEXT */
 
-       while ((line = bb_get_chomped_line_from_file(file)) != NULL) {
+       while ((line = xmalloc_getline(file)) != NULL) {
                llist_t *pattern_ptr = pattern_head;
+               grep_list_data_t *gl = gl; /* for gcc */
 
                linenum++;
-               ret = 0;
+               found = 0;
                while (pattern_ptr) {
-                       if (fgrep_flag) {
-                               ret = strstr(line, pattern_ptr->data) != NULL;
+                       gl = (grep_list_data_t *)pattern_ptr->data;
+                       if (FGREP_FLAG) {
+                               found |= (strstr(line, gl->pattern) != NULL);
                        } else {
-                               /*
-                                * test for a postitive-assertion match (regexec returns success (0)
-                                * and the user did not specify invert search), or a negative-assertion
-                                * match (regexec returns failure (REG_NOMATCH) and the user specified
-                                * invert search)
-                                */
-                               regex_t regex;
-                               xregcomp(&regex, pattern_ptr->data, reflags);
-                               ret |= regexec(&regex, line, 0, NULL, 0) == 0;
-                               regfree(&regex);
+                               if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
+                                       gl->flg_mem_alocated_compiled |= COMPILED;
+                                       xregcomp(&(gl->preg), gl->pattern, reflags);
+                               }
+                               regmatch.rm_so = 0;
+                               regmatch.rm_eo = 0;
+                               if (regexec(&(gl->preg), line, 1, &regmatch, 0) == 0) {
+                                       if (!(option_mask32 & OPT_w))
+                                               found = 1;
+                                       else {
+                                               char c = ' ';
+                                               if (regmatch.rm_so)
+                                                       c = line[regmatch.rm_so - 1];
+                                               if (!isalnum(c) && c != '_') {
+                                                       c = line[regmatch.rm_eo];
+                                                       if (!c || (!isalnum(c) && c != '_'))
+                                                               found = 1;
+                                               }
+                                       }
+                               }
                        }
+                       /* If it's non-inverted search, we can stop
+                        * at first match */
+                       if (found && !invert_search)
+                               goto do_found;
                        pattern_ptr = pattern_ptr->link;
                } /* while (pattern_ptr) */
 
-               if ((ret ^ invert_search)) {
-
-                       if (print_files_with_matches || be_quiet)
-                               free(line);
-
-                       /* if we found a match but were told to be quiet, stop here */
-                               if (be_quiet || print_files_without_matches)
-                               return -1;
+               if (found ^ invert_search) {
+ do_found:
+                       /* keep track of matches */
+                       nmatches++;
+
+                       /* quiet/print (non)matching file names only? */
+                       if (option_mask32 & (OPT_q|OPT_l|OPT_L)) {
+                               free(line); /* we don't need line anymore */
+                               if (BE_QUIET) {
+                                       /* manpage says about -q:
+                                        * "exit immediately with zero status
+                                        * if any match is found,
+                                        * even if errors were detected" */
+                                       exit(0);
+                               }
+                               /* if we're just printing filenames, we stop after the first match */
+                               if (PRINT_FILES_WITH_MATCHES) {
+                                       puts(cur_file);
+                                       /* fall through to "return 1" */
+                               }
+                               /* OPT_L aka PRINT_FILES_WITHOUT_MATCHES: return early */
+                               return 1; /* one match */
+                       }
 
-                               /* keep track of matches */
-                               nmatches++;
+#if ENABLE_FEATURE_GREP_CONTEXT
+                       /* Were we printing context and saw next (unwanted) match? */
+                       if ((option_mask32 & OPT_m) && nmatches > max_matches)
+                               break;
+#endif
 
-                               /* if we're just printing filenames, we stop after the first match */
-                               if (print_files_with_matches)
-                                       break;
-
-                               /* print the matched line */
-                               if (print_match_counts == 0) {
-#ifdef CONFIG_FEATURE_GREP_CONTEXT
-                                       int prevpos = (curpos == 0) ? lines_before - 1 : curpos - 1;
-
-                                       /* if we were told to print 'before' lines and there is at least
-                                        * one line in the circular buffer, print them */
-                                       if (lines_before && before_buf[prevpos] != NULL) {
-                                               int first_buf_entry_line_num = linenum - lines_before;
-
-                                               /* advance to the first entry in the circular buffer, and
-                                                * figure out the line number is of the first line in the
-                                                * buffer */
-                                               idx = curpos;
-                                               while (before_buf[idx] == NULL) {
-                                                       idx = (idx + 1) % lines_before;
-                                                       first_buf_entry_line_num++;
-                                               }
+                       /* print the matched line */
+                       if (PRINT_MATCH_COUNTS == 0) {
+#if ENABLE_FEATURE_GREP_CONTEXT
+                               int prevpos = (curpos == 0) ? lines_before - 1 : curpos - 1;
+
+                               /* if we were told to print 'before' lines and there is at least
+                                * one line in the circular buffer, print them */
+                               if (lines_before && before_buf[prevpos] != NULL) {
+                                       int first_buf_entry_line_num = linenum - lines_before;
+
+                                       /* advance to the first entry in the circular buffer, and
+                                        * figure out the line number is of the first line in the
+                                        * buffer */
+                                       idx = curpos;
+                                       while (before_buf[idx] == NULL) {
+                                               idx = (idx + 1) % lines_before;
+                                               first_buf_entry_line_num++;
+                                       }
 
-                                               /* now print each line in the buffer, clearing them as we go */
-                                               while (before_buf[idx] != NULL) {
-                                                       print_line(before_buf[idx], first_buf_entry_line_num, '-');
-                                                       free(before_buf[idx]);
-                                                       before_buf[idx] = NULL;
-                                                       idx = (idx + 1) % lines_before;
-                                                       first_buf_entry_line_num++;
-                                               }
+                                       /* now print each line in the buffer, clearing them as we go */
+                                       while (before_buf[idx] != NULL) {
+                                               print_line(before_buf[idx], first_buf_entry_line_num, '-');
+                                               free(before_buf[idx]);
+                                               before_buf[idx] = NULL;
+                                               idx = (idx + 1) % lines_before;
+                                               first_buf_entry_line_num++;
                                        }
+                               }
 
-                                       /* make a note that we need to print 'after' lines */
-                                       print_n_lines_after = lines_after;
-#endif /* CONFIG_FEATURE_GREP_CONTEXT */
+                               /* make a note that we need to print 'after' lines */
+                               print_n_lines_after = lines_after;
+#endif
+                               if (option_mask32 & OPT_o) {
+                                       if (FGREP_FLAG) {
+                                               /* -Fo just prints the pattern
+                                                * (unless -v: -Fov doesnt print anything at all) */
+                                               if (found)
+                                                       print_line(gl->pattern, linenum, ':');
+                                       } else {
+                                               line[regmatch.rm_eo] = '\0';
+                                               print_line(line + regmatch.rm_so, linenum, ':');
+                                       }
+                               } else {
                                        print_line(line, linenum, ':');
                                }
                        }
-#ifdef CONFIG_FEATURE_GREP_CONTEXT
-                       else { /* no match */
-                               /* Add the line to the circular 'before' buffer */
-                               if(lines_before) {
-                                       free(before_buf[curpos]);
-                                       before_buf[curpos] = bb_xstrdup(line);
-                                       curpos = (curpos + 1) % lines_before;
-                               }
-                       }
-
+               }
+#if ENABLE_FEATURE_GREP_CONTEXT
+               else { /* no match */
                        /* if we need to print some context lines after the last match, do so */
-                       if (print_n_lines_after && (last_line_printed != linenum)) {
+                       if (print_n_lines_after) {
                                print_line(line, linenum, '-');
                                print_n_lines_after--;
+                       } else if (lines_before) {
+                               /* Add the line to the circular 'before' buffer */
+                               free(before_buf[curpos]);
+                               before_buf[curpos] = line;
+                               curpos = (curpos + 1) % lines_before;
+                               /* avoid free(line) - we took line */
+                               line = NULL;
                        }
-#endif /* CONFIG_FEATURE_GREP_CONTEXT */
+               }
+
+#endif /* ENABLE_FEATURE_GREP_CONTEXT */
                free(line);
-       }
 
+               /* Did we print all context after last requested match? */
+               if ((option_mask32 & OPT_m)
+                && !print_n_lines_after && nmatches == max_matches)
+                       break;
+       }
 
        /* special-case file post-processing for options where we don't print line
         * matches, just filenames and possibly match counts */
 
        /* grep -c: print [filename:]count, even if count is zero */
-       if (print_match_counts) {
-               if (print_filename > 0)
+       if (PRINT_MATCH_COUNTS) {
+               if (print_filename)
                        printf("%s:", cur_file);
-                   printf("%d\n", nmatches);
-       }
-
-       /* grep -l: print just the filename, but only if we grepped the line in the file  */
-       if (print_files_with_matches && nmatches > 0) {
-               puts(cur_file);
+               printf("%d\n", nmatches);
        }
 
-       /* grep -L: print just the filename, but only if we didn't grep the line in the file  */
-       if (print_files_without_matches && nmatches == 0) {
+       /* grep -L: print just the filename */
+       if (PRINT_FILES_WITHOUT_MATCHES) {
+               /* nmatches is zero, no need to check it:
+                * we return 1 early if we detected a match
+                * and PRINT_FILES_WITHOUT_MATCHES is set */
                puts(cur_file);
        }
 
        return nmatches;
 }
 
+#if ENABLE_FEATURE_CLEAN_UP
+#define new_grep_list_data(p, m) add_grep_list_data(p, m)
+static char *add_grep_list_data(char *pattern, int flg_used_mem)
+#else
+#define new_grep_list_data(p, m) add_grep_list_data(p)
+static char *add_grep_list_data(char *pattern)
+#endif
+{
+       grep_list_data_t *gl = xzalloc(sizeof(*gl));
+       gl->pattern = pattern;
+#if ENABLE_FEATURE_CLEAN_UP
+       gl->flg_mem_alocated_compiled = flg_used_mem;
+#else
+       /*gl->flg_mem_alocated_compiled = 0;*/
+#endif
+       return (char *)gl;
+}
+
 static void load_regexes_from_file(llist_t *fopt)
 {
        char *line;
        FILE *f;
 
-       while(fopt) {
+       while (fopt) {
                llist_t *cur = fopt;
                char *ffile = cur->data;
 
                fopt = cur->link;
                free(cur);
-               f = bb_xfopen(ffile, "r");
-               while ((line = bb_get_chomped_line_from_file(f)) != NULL) {
-                       pattern_head = llist_add_to(pattern_head, line);
+               f = xfopen(ffile, "r");
+               while ((line = xmalloc_getline(f)) != NULL) {
+                       llist_add_to(&pattern_head,
+                               new_grep_list_data(line, PATTERN_MEM_A));
                }
        }
 }
 
+static int file_action_grep(const char *filename, struct stat *statbuf ATTRIBUTE_UNUSED, void* matched, int depth ATTRIBUTE_UNUSED)
+{
+       FILE *file = fopen(filename, "r");
+       if (file == NULL) {
+               if (!SUPPRESS_ERR_MSGS)
+                       bb_simple_perror_msg(filename);
+               open_errors = 1;
+               return 0;
+       }
+       cur_file = filename;
+       *(int*)matched += grep_file(file);
+       fclose(file);
+       return 1;
+}
 
-extern int grep_main(int argc, char **argv)
+static int grep_dir(const char *dir)
+{
+       int matched = 0;
+       recursive_action(dir,
+               /* recurse=yes */ ACTION_RECURSE |
+               /* followLinks=no */
+               /* depthFirst=yes */ ACTION_DEPTHFIRST,
+               /* fileAction= */ file_action_grep,
+               /* dirAction= */ NULL,
+               /* userData= */ &matched,
+               /* depth= */ 0);
+       return matched;
+}
+
+int grep_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int grep_main(int argc, char **argv)
 {
        FILE *file;
        int matched;
-       unsigned long opt;
+       char *mopt;
        llist_t *fopt = NULL;
-       int error_open_count = 0;
 
        /* do normal option parsing */
-#ifdef CONFIG_FEATURE_GREP_CONTEXT
-  {
-       char *junk;
+#if ENABLE_FEATURE_GREP_CONTEXT
        char *slines_after;
        char *slines_before;
        char *Copt;
 
-       bb_opt_complementally = "H-h:e*:f*:C-AB";
-       opt = bb_getopt_ulflags(argc, argv,
-               GREP_OPTS GREP_OPT_CONTEXT OPT_EGREP,
-               &pattern_head, &fopt,
+       opt_complementary = "H-h:e::f::C-AB";
+       getopt32(argv,
+               OPTSTR_GREP,
+               &pattern_head, &fopt, &mopt,
                &slines_after, &slines_before, &Copt);
 
-       if(opt & GREP_OPT_C) {
-               /* C option unseted A and B options, but next -A or -B
-                  may be ovewrite own option */
-               if(!(opt & GREP_OPT_A))         /* not overwtited */
+       if (option_mask32 & OPT_C) {
+               /* -C unsets prev -A and -B, but following -A or -B
+                  may override it */
+               if (!(option_mask32 & OPT_A)) /* not overridden */
                        slines_after = Copt;
-               if(!(opt & GREP_OPT_B))         /* not overwtited */
+               if (!(option_mask32 & OPT_B)) /* not overridden */
                        slines_before = Copt;
-               opt |= GREP_OPT_A|GREP_OPT_B;   /* set for parse now */
+               option_mask32 |= OPT_A|OPT_B; /* for parser */
        }
-       if(opt & GREP_OPT_A) {
-               lines_after = strtoul(slines_after, &junk, 10);
-                               if(*junk != '\0')
-                                       bb_error_msg_and_die("invalid context length argument");
+       if (option_mask32 & OPT_A) {
+               lines_after = xatoi_u(slines_after);
        }
-       if(opt & GREP_OPT_B) {
-               lines_before = strtoul(slines_before, &junk, 10);
-                               if(*junk != '\0')
-                                       bb_error_msg_and_die("invalid context length argument");
-               }
-       /* sanity checks after parse may be invalid numbers ;-) */
-       if ((opt & (GREP_OPT_c|GREP_OPT_q|GREP_OPT_l|GREP_OPT_L))) {
-               opt &= ~GREP_OPT_n;
+       if (option_mask32 & OPT_B) {
+               lines_before = xatoi_u(slines_before);
+       }
+       /* sanity checks */
+       if (option_mask32 & (OPT_c|OPT_q|OPT_l|OPT_L)) {
+               option_mask32 &= ~OPT_n;
                lines_before = 0;
                lines_after = 0;
-       } else if(lines_before > 0)
-               before_buf = (char **)xcalloc(lines_before, sizeof(char *));
-       }
+       } else if (lines_before > 0)
+               before_buf = xzalloc(lines_before * sizeof(char *));
 #else
        /* with auto sanity checks */
-       bb_opt_complementally = "H-h:e*:f*:c-n:q-n:l-n";
-       opt = bb_getopt_ulflags(argc, argv, GREP_OPTS OPT_EGREP,
-               &pattern_head, &fopt);
-
+       opt_complementary = "H-h:e::f::c-n:q-n:l-n";
+       getopt32(argv, OPTSTR_GREP,
+               &pattern_head, &fopt, &mopt);
 #endif
-       print_files_with_matches = opt & GREP_OPT_l;
-       print_files_without_matches = (opt & GREP_OPT_L) != 0;
-       print_line_num = opt & GREP_OPT_n;
-       be_quiet = opt & GREP_OPT_q;
-       invert_search = (opt & GREP_OPT_v) != 0;        /* 0 | 1 */
-       suppress_err_msgs = opt & GREP_OPT_s;
-       print_match_counts = opt & GREP_OPT_c;
-       fgrep_flag = opt & GREP_OPT_F;
-       if(opt & GREP_OPT_H)
-               print_filename++;
-       if(opt & GREP_OPT_h)
-               print_filename--;
-       if(opt & GREP_OPT_f)
+       if (option_mask32 & OPT_m) {
+               max_matches = xatoi_u(mopt);
+       }
+       invert_search = ((option_mask32 & OPT_v) != 0); /* 0 | 1 */
+
+       if (pattern_head != NULL) {
+               /* convert char **argv to grep_list_data_t */
+               llist_t *cur;
+
+               for (cur = pattern_head; cur; cur = cur->link)
+                       cur->data = new_grep_list_data(cur->data, 0);
+       }
+       if (option_mask32 & OPT_f)
                load_regexes_from_file(fopt);
 
-#ifdef CONFIG_FEATURE_GREP_FGREP_ALIAS
-       if(bb_applet_name[0] == 'f')
-               fgrep_flag = 1;
-#endif
+       if (ENABLE_FEATURE_GREP_FGREP_ALIAS && applet_name[0] == 'f')
+               option_mask32 |= OPT_F;
 
-#ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS
-       if(bb_applet_name[0] == 'e' || (opt & GREP_OPT_E))
-               reflags = REG_EXTENDED | REG_NOSUB;
-       else
-#endif
+       if (!(option_mask32 & (OPT_o | OPT_w)))
                reflags = REG_NOSUB;
 
-       if(opt & GREP_OPT_i)
+       if (ENABLE_FEATURE_GREP_EGREP_ALIAS
+        && (applet_name[0] == 'e' || (option_mask32 & OPT_E))
+       ) {
+               reflags |= REG_EXTENDED;
+       }
+
+       if (option_mask32 & OPT_i)
                reflags |= REG_ICASE;
 
        argv += optind;
@@ -346,61 +484,73 @@ extern int grep_main(int argc, char **argv)
        /* if we didn't get a pattern from a -e and no command file was specified,
         * argv[optind] should be the pattern. no pattern, no worky */
        if (pattern_head == NULL) {
+               char *pattern;
                if (*argv == NULL)
                        bb_show_usage();
-               else {
-                       pattern_head = llist_add_to(pattern_head, *argv++);
-                       argc--;
-               }
+               pattern = new_grep_list_data(*argv++, 0);
+               llist_add_to(&pattern_head, pattern);
+               argc--;
        }
 
        /* argv[(optind)..(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) {
-               print_filename++;
+        * there is more than one file to grep, we will print the filenames. */
+       if (argc > 1)
+               print_filename = 1;
+       /* -H / -h of course override */
+       if (option_mask32 & OPT_H)
+               print_filename = 1;
+       if (option_mask32 & OPT_h)
+               print_filename = 0;
 
        /* If no files were specified, or '-' was specified, take input from
         * stdin. Otherwise, we grep through all the files specified. */
-       } else if (argc == 0) {
-               argc++;
-       }
        matched = 0;
-       while (argc--) {
+       do {
                cur_file = *argv++;
-               if(!cur_file || (*cur_file == '-' && !cur_file[1])) {
-                       cur_file = "-";
-                       file = stdin;
+               file = stdin;
+               if (!cur_file || (*cur_file == '-' && !cur_file[1])) {
+                       cur_file = "(standard input)";
                } else {
+                       if (option_mask32 & OPT_r) {
+                               struct stat st;
+                               if (stat(cur_file, &st) == 0 && S_ISDIR(st.st_mode)) {
+                                       if (!(option_mask32 & OPT_h))
+                                               print_filename = 1;
+                                       matched += grep_dir(cur_file);
+                                       goto grep_done;
+                               }
+                       }
+                       /* else: fopen(dir) will succeed, but reading won't */
                        file = fopen(cur_file, "r");
-               }
                        if (file == NULL) {
-                               if (!suppress_err_msgs)
-                                       bb_perror_msg("%s", cur_file);
-                               error_open_count++;
-               } else {
-                       matched += grep_file(file);
-                       if(matched < 0) {
-                               /* we found a match but were told to be quiet, stop here and
-                               * return success */
-                               break;
+                               if (!SUPPRESS_ERR_MSGS)
+                                       bb_simple_perror_msg(cur_file);
+                               open_errors = 1;
+                               continue;
                        }
-                       fclose(file);
                }
-       }
+               matched += grep_file(file);
+               fclose_if_not_stdin(file);
+ grep_done: ;
+       } while (--argc > 0);
 
-#ifdef CONFIG_FEATURE_CLEAN_UP
        /* destroy all the elments in the pattern list */
-       while (pattern_head) {
-               llist_t *pattern_head_ptr = pattern_head;
-
-               pattern_head = pattern_head->link;
-               free(pattern_head_ptr);
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               while (pattern_head) {
+                       llist_t *pattern_head_ptr = pattern_head;
+                       grep_list_data_t *gl = (grep_list_data_t *)pattern_head_ptr->data;
+
+                       pattern_head = pattern_head->link;
+                       if ((gl->flg_mem_alocated_compiled & PATTERN_MEM_A))
+                               free(gl->pattern);
+                       if ((gl->flg_mem_alocated_compiled & COMPILED))
+                               regfree(&(gl->preg));
+                       free(gl);
+                       free(pattern_head_ptr);
+               }
        }
-#endif
-
-       if(be_quiet && matched)
-               return 0;
-       if(error_open_count)
+       /* 0 = success, 1 = failed, 2 = error */
+       if (open_errors)
                return 2;
-       return !matched; /* invert return value 0 = success, 1 = failed */
+       return !matched; /* invert return value: 0 = success, 1 = failed */
 }