From df5f6ba1159f8c1af500fa1b8eb9c9646e4de2a6 Mon Sep 17 00:00:00 2001 From: Mark Whitley Date: Tue, 11 Jul 2000 16:53:56 +0000 Subject: Applied patch from Matt Kraai which does the following: - adds case-insensitive matching in sed s/// epxressions - consolodates common regcomp code in grep & sed into bb_regcomp and put in utility.c - cleans up a bunch of cruft --- grep.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'grep.c') diff --git a/grep.c b/grep.c index 8d2c915be..dec365f05 100644 --- a/grep.c +++ b/grep.c @@ -104,7 +104,6 @@ extern int grep_main(int argc, char **argv) { int opt; int reflags; - int ret; /* do special-case option parsing */ if (argv[1] && (strcmp(argv[1], "--help") == 0)) @@ -147,20 +146,8 @@ extern int grep_main(int argc, char **argv) reflags = REG_NOSUB | REG_NEWLINE; if (ignore_case) reflags |= REG_ICASE; - if ((ret = regcomp(®ex, argv[optind], reflags)) != 0) { - int errmsgsz = regerror(ret, ®ex, NULL, 0); - char *errmsg = malloc(errmsgsz); - if (errmsg == NULL) { - fprintf(stderr, "grep: memory error\n"); - regfree(®ex); - exit(1); - } - regerror(ret, ®ex, errmsg, errmsgsz); - fprintf(stderr, "grep: %s\n", errmsg); - free(errmsg); - regfree(®ex); + if (bb_regcomp(®ex, argv[optind], reflags) != 0) exit(1); - } /* 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 */ -- cgit v1.2.3