commit 1822f70d12b85cf4be46c9cd7111a035394b0796
parent 3fb0e50668571a9a546cd2c88bc11a0478c35e54
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date: Sun, 16 Nov 2014 15:17:46 +0100
csplit, grep: use eregcomp
Diffstat:
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git 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
@@ -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) {