/*
* Mini grep implementation for busybox using libc regex.
*
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Mark Whitley <markw@lineo.com>, <markw@codepoet.org>
+ * 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/
+/*
+ * Apr 2004 by Vladimir Oleynik <dzo@simtreas.ru> -
+ * correction "-e pattern1 -e pattern2" logic and more optimizations.
+*/
#include <stdio.h>
#include <stdlib.h>
#include <getopt.h>
-#include <regex.h>
-#include <string.h> /* for strerror() */
+#include <string.h>
#include <errno.h>
#include "busybox.h"
+#include "xregex.h"
-extern int optind; /* in unistd.h */
-extern int errno; /* for use with strerror() */
-extern void xregcomp(regex_t *preg, const char *regex, int cflags); /* in busybox.h */
-
/* options */
-static int reflags = REG_NOSUB;
-static int print_filename = 0;
-static int print_line_num = 0;
-static int print_match_counts = 0;
-static int be_quiet = 0;
-static int invert_search = 0;
-static int suppress_err_msgs = 0;
-static int print_files_with_matches = 0;
-
-#ifdef BB_FEATURE_GREP_CONTEXT
-extern char *optarg; /* in getopt.h */
-static int lines_before = 0;
-static int lines_after = 0;
-static char **before_buf = NULL;
-static int last_line_printed = 0;
-#endif /* BB_FEATURE_GREP_CONTEXT */
+#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 ""
+#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 regex_t *regexes = NULL; /* growable array of compiled regular expressions */
-static int nregexes = 0; /* number of elements in above arrary */
-static int matched; /* keeps track of whether we ever matched */
-static char *cur_file = NULL; /* the current file we are reading */
+static llist_t *pattern_head; /* growable list of patterns to match */
+static char *cur_file; /* the current file we are reading */
static void print_line(const char *line, int linenum, char decoration)
{
-#ifdef BB_FEATURE_GREP_CONTEXT
- /* possibly print the little '--' seperator */
+#ifdef CONFIG_FEATURE_GREP_CONTEXT
+ /* possibly print the little '--' separator */
if ((lines_before || lines_after) && last_line_printed &&
last_line_printed < linenum - 1) {
puts("--");
}
last_line_printed = linenum;
#endif
- if (print_filename)
+ if (print_filename > 0)
printf("%s%c", cur_file, decoration);
if (print_line_num)
printf("%i%c", linenum, decoration);
}
-static void grep_file(FILE *file)
+static int grep_file(FILE *file)
{
- char *line = NULL;
- int ret;
+ char *line;
+ invert_search_t ret;
int linenum = 0;
int nmatches = 0;
- int i;
-#ifdef BB_FEATURE_GREP_CONTEXT
+#ifdef CONFIG_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 /* BB_FEATURE_GREP_CONTEXT */
+#endif /* CONFIG_FEATURE_GREP_CONTEXT */
+
+ while ((line = bb_get_chomped_line_from_file(file)) != NULL) {
+ llist_t *pattern_ptr = pattern_head;
- while ((line = get_line_from_file(file)) != NULL) {
- chomp(line);
linenum++;
+ ret = 0;
+ while (pattern_ptr) {
+ if (fgrep_flag) {
+ ret = strstr(line, pattern_ptr->data) != 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(®ex, pattern_ptr->data, reflags);
+ ret |= regexec(®ex, line, 0, NULL, 0) == 0;
+ regfree(®ex);
+ }
+ pattern_ptr = pattern_ptr->link;
+ } /* while (pattern_ptr) */
- for (i = 0; i < nregexes; i++) {
- /*
- * 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)
- */
- ret = regexec(®exes[i], line, 0, NULL, 0);
- if ((ret == 0 && !invert_search) || (ret == REG_NOMATCH && invert_search)) {
-
- /* if we found a match but were told to be quiet, stop here and
- * return success */
- if (be_quiet)
- exit(0);
+ 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;
/* keep track of matches */
nmatches++;
/* print the matched line */
if (print_match_counts == 0) {
-#ifdef BB_FEATURE_GREP_CONTEXT
+#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
/* make a note that we need to print 'after' lines */
print_n_lines_after = lines_after;
-#endif /* BB_FEATURE_GREP_CONTEXT */
+#endif /* CONFIG_FEATURE_GREP_CONTEXT */
print_line(line, linenum, ':');
}
}
-#ifdef BB_FEATURE_GREP_CONTEXT
+#ifdef CONFIG_FEATURE_GREP_CONTEXT
else { /* no match */
/* Add the line to the circular 'before' buffer */
if(lines_before) {
- if(before_buf[curpos])
- free(before_buf[curpos]);
- before_buf[curpos] = strdup(line);
+ free(before_buf[curpos]);
+ before_buf[curpos] = bb_xstrdup(line);
curpos = (curpos + 1) % lines_before;
}
}
print_line(line, linenum, '-');
print_n_lines_after--;
}
-#endif /* BB_FEATURE_GREP_CONTEXT */
- } /* for */
+#endif /* CONFIG_FEATURE_GREP_CONTEXT */
free(line);
}
/* grep -c: print [filename:]count, even if count is zero */
if (print_match_counts) {
- if (print_filename)
+ if (print_filename > 0)
printf("%s:", cur_file);
- printf("%d\n", nmatches);
+ printf("%d\n", nmatches);
}
/* grep -l: print just the filename, but only if we grepped the line in the file */
puts(cur_file);
}
+ /* 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) {
+ puts(cur_file);
+ }
- /* remember if we matched */
- if (nmatches != 0)
- matched = 1;
-}
-
-
-static void add_regex(const char *restr)
-{
- regexes = xrealloc(regexes, sizeof(regex_t) * (++nregexes));
- xregcomp(®exes[nregexes-1], restr, reflags);
+ return nmatches;
}
-
-static void load_regexes_from_file(const char *filename)
+static void load_regexes_from_file(llist_t *fopt)
{
char *line;
- FILE *f = xfopen(filename, "r");
- while ((line = get_line_from_file(f)) != NULL) {
- chomp(line);
- add_regex(line);
- free(line);
- }
-}
+ FILE *f;
+ while(fopt) {
+ llist_t *cur = fopt;
+ char *ffile = cur->data;
-#ifdef BB_FEATURE_CLEAN_UP
-static void destroy_regexes()
-{
- if (regexes == NULL)
- return;
-
- /* destroy all the elments in the array */
- while (--nregexes >= 0) {
- regfree(regexes[nregexes]);
- free(regexes[nregexes]);
+ 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);
+ }
}
}
-#endif
extern int grep_main(int argc, char **argv)
{
- int opt;
-#ifdef BB_FEATURE_GREP_CONTEXT
- char *junk;
-#endif
-
-#ifdef BB_FEATURE_CLEAN_UP
- /* destroy command strings on exit */
- if (atexit(destroy_regexes) == -1)
- perror_msg_and_die("atexit");
-#endif
+ FILE *file;
+ int matched;
+ unsigned long opt;
+ llist_t *fopt = NULL;
+ int error_open_count = 0;
/* do normal option parsing */
- while ((opt = getopt(argc, argv, "iHhlnqvsce:f:"
-#ifdef BB_FEATURE_GREP_CONTEXT
-"A:B:C:"
-#endif
-)) > 0) {
- switch (opt) {
- case 'i':
- reflags |= REG_ICASE;
- break;
- case 'l':
- print_files_with_matches++;
- 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;
- case 'c':
- print_match_counts++;
- break;
- case 'e':
- add_regex(optarg);
- break;
- case 'f':
- load_regexes_from_file(optarg);
- break;
-#ifdef BB_FEATURE_GREP_CONTEXT
- case 'A':
- lines_after = strtoul(optarg, &junk, 10);
- if(*junk != '\0')
- error_msg_and_die("invalid context length argument");
- break;
- case 'B':
- lines_before = strtoul(optarg, &junk, 10);
+#ifdef CONFIG_FEATURE_GREP_CONTEXT
+ {
+ char *junk;
+ 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,
+ &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 */
+ slines_after = Copt;
+ if(!(opt & GREP_OPT_B)) /* not overwtited */
+ slines_before = Copt;
+ opt |= GREP_OPT_A|GREP_OPT_B; /* set for parse now */
+ }
+ if(opt & GREP_OPT_A) {
+ lines_after = strtoul(slines_after, &junk, 10);
if(*junk != '\0')
- error_msg_and_die("invalid context length argument");
- before_buf = (char **)calloc(lines_before, sizeof(char *));
- break;
- case 'C':
- lines_after = lines_before = strtoul(optarg, &junk, 10);
+ bb_error_msg_and_die("invalid context length argument");
+ }
+ if(opt & GREP_OPT_B) {
+ lines_before = strtoul(slines_before, &junk, 10);
if(*junk != '\0')
- error_msg_and_die("invalid context length argument");
- before_buf = (char **)calloc(lines_before, sizeof(char *));
- break;
-#endif /* BB_FEATURE_GREP_CONTEXT */
- default:
- show_usage();
+ 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;
+ lines_before = 0;
+ lines_after = 0;
+ } else if(lines_before > 0)
+ before_buf = (char **)xcalloc(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);
+
+#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)
+ load_regexes_from_file(fopt);
+
+#ifdef CONFIG_FEATURE_GREP_FGREP_ALIAS
+ if(bb_applet_name[0] == 'f')
+ fgrep_flag = 1;
+#endif
+
+#ifdef CONFIG_FEATURE_GREP_EGREP_ALIAS
+ if(bb_applet_name[0] == 'e' || (opt & GREP_OPT_E))
+ reflags = REG_EXTENDED | REG_NOSUB;
+ else
+#endif
+ reflags = REG_NOSUB;
+
+ if(opt & GREP_OPT_i)
+ reflags |= REG_ICASE;
+
+ argv += optind;
+ argc -= optind;
/* 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 (nregexes == 0) {
- if (argv[optind] == NULL)
- show_usage();
+ if (pattern_head == NULL) {
+ if (*argv == NULL)
+ bb_show_usage();
else {
- add_regex(argv[optind]);
- optind++;
+ pattern_head = llist_add_to(pattern_head, *argv++);
+ argc--;
}
}
- /* sanity checks */
- if (print_match_counts || be_quiet || print_files_with_matches) {
- print_line_num = 0;
-#ifdef BB_FEATURE_GREP_CONTEXT
- lines_before = 0;
- lines_after = 0;
-#endif
- }
-
/* 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) - (optind) > 0)
+ if (argc > 1) {
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] == NULL || (strcmp(argv[optind], "-") == 0)) {
- grep_file(stdin);
+ } else if (argc == 0) {
+ argc++;
}
- else {
- int i;
- FILE *file;
- for (i = optind; i < argc; i++) {
- cur_file = argv[i];
+ matched = 0;
+ while (argc--) {
+ cur_file = *argv++;
+ if(!cur_file || (*cur_file == '-' && !cur_file[1])) {
+ cur_file = "-";
+ file = stdin;
+ } else {
file = fopen(cur_file, "r");
+ }
if (file == NULL) {
if (!suppress_err_msgs)
- perror_msg("%s", cur_file);
- }
- else {
- grep_file(file);
- fclose(file);
+ 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;
}
+ fclose(file);
}
}
+#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);
+ }
+#endif
+
+ if(be_quiet)
+ return error_open_count ? 2 : 0;
return !matched; /* invert return value 0 = success, 1 = failed */
}
projects / oweals / busybox.git / blobdiff