From 1822f70d12b85cf4be46c9cd7111a035394b0796 Mon Sep 17 00:00:00 2001 From: Hiltjo Posthuma Date: Sun, 16 Nov 2014 15:17:46 +0100 Subject: [PATCH] csplit, grep: use eregcomp --- csplit.c | 3 +-- grep.c | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/csplit.c b/csplit.c index cf9f902..bf61337 100644 --- a/csplit.c +++ b/csplit.c @@ -362,8 +362,7 @@ do_rexp(const char *expr) } else ofs = 0; - if (regcomp(&cre, re, REG_NOSUB) != 0) - eprintf("%s: bad regular expression'n", re); + eregcomp(&cre, re, REG_NOSUB); if (*expr == '/') /* /regexp/: Save results to a file. */ diff --git a/grep.c b/grep.c index ffa9b44..6c6215d 100644 --- a/grep.c +++ b/grep.c @@ -38,8 +38,7 @@ int main(int argc, char *argv[]) { struct pattern *pnode, *tmp; - int i, n, m, flags = REG_NOSUB, match = NoMatch; - char buf[BUFSIZ]; + int i, m, flags = REG_NOSUB, match = NoMatch; FILE *fp; TAILQ_INIT(&phead); @@ -83,10 +82,7 @@ main(int argc, char *argv[]) /* Compile regex for all search patterns */ TAILQ_FOREACH(pnode, &phead, entry) { - if ((n = regcomp(&pnode->preg, pnode->pattern, flags)) != 0) { - regerror(n, &pnode->preg, buf, sizeof buf); - enprintf(Error, "invalid pattern: %s\n", buf); - } + enregcomp(Error, &pnode->preg, pnode->pattern, flags); } many = (argc > 1); if (argc == 0) {