fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

csplit, grep: use eregcomp

Browse Source
This commit is contained in:
Hiltjo Posthuma 2014-11-16 15:17:46 +01:00 committed by sin
parent 3fb0e50668
commit 1822f70d12
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
csplit.c
View File

@ -362,8 +362,7 @@ do_rexp(const char *expr)
} else } else
ofs = 0; ofs = 0;
if (regcomp(&cre, re, REG_NOSUB) != 0) eregcomp(&cre, re, REG_NOSUB);
eprintf("%s: bad regular expression'n", re);
if (*expr == '/') if (*expr == '/')
/* /regexp/: Save results to a file. */ /* /regexp/: Save results to a file. */

8
grep.c
View File

@ -38,8 +38,7 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
struct pattern *pnode, *tmp; struct pattern *pnode, *tmp;
int i, n, m, flags = REG_NOSUB, match = NoMatch; int i, m, flags = REG_NOSUB, match = NoMatch;
char buf[BUFSIZ];
FILE *fp; FILE *fp;
TAILQ_INIT(&phead); TAILQ_INIT(&phead);
@ -83,10 +82,7 @@ main(int argc, char *argv[])
/* Compile regex for all search patterns */ /* Compile regex for all search patterns */
TAILQ_FOREACH(pnode, &phead, entry) { TAILQ_FOREACH(pnode, &phead, entry) {
if ((n = regcomp(&pnode->preg, pnode->pattern, flags)) != 0) { enregcomp(Error, &pnode->preg, pnode->pattern, flags);
regerror(n, &pnode->preg, buf, sizeof buf);
enprintf(Error, "invalid pattern: %s\n", buf);
}
} }
many = (argc > 1); many = (argc > 1);
if (argc == 0) { if (argc == 0) {