ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use POSIX regcomp and regexec over obsolete BSD re_comp and re_exec

This commit is contained in:
Jeremy Huntwork 2012-05-13 17:28:32 +00:00
parent 1c935e725e
commit 596007ef6a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
text-utils/more.c
View File

@ -63,9 +63,7 @@
#include "widechar.h"
#include "closestream.h"
#define _REGEX_RE_COMP
#include <regex.h>
#undef _REGEX_RE_COMP
#ifndef XTABS
#define XTABS TAB3
@ -1584,21 +1582,24 @@ void search(char buf[], FILE *file, register int n)
register long line2 = startline;
register long line3 = startline;
register int lncount;
int saveln, rv;
int saveln, rv, rc;
char *s;
regex_t re;
context.line = saveln = Currline;
context.chrctr = startline;
lncount = 0;
if ((s = re_comp (buf)) != 0)
if (rc = regcomp (&re, buf, REG_NOSUB) != 0) {
regerror (rc, &re, s, sizeof s);
more_error (s);
}
while (!feof (file)) {
line3 = line2;
line2 = line1;
line1 = Ftell (file);
rdline (file);
lncount++;
if ((rv = re_exec (Line)) == 1) {
if ((rv = regexec (&re, Line, 0, NULL, 0)) == 0) {
if (--n == 0) {
if (lncount > 3 || (lncount > 1 && no_intty))
{
@ -1633,7 +1634,7 @@ void search(char buf[], FILE *file, register int n)
}
break;
}
} else if (rv == -1)
} else if (rv != REG_NOMATCH)
more_error (_("Regular expression botch"));
}
if (feof (file)) {