d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve parsing of character and equivalence classes:

Browse Source 
[:*] and [=*] are parsed as `infinitely many repetitions of :' (or *)
instead of literal characters (SUSv3)
This commit is contained in:
Tim J. Robbins 2002-06-15 07:38:27 +00:00
parent 5f9c048ce7
commit 232a0ff51d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/tr/str.c
View File

@ -125,20 +125,25 @@ bracket(s)
switch (s->str[1]) {
case ':': /* "[:class:]" */
if ((p = strstr(s->str + 2, ":]")) == NULL)
if ((p = strchr(s->str + 2, ']')) == NULL)
return (0);
*p = '\0';
if (*(p - 1) != ':' || p - s->str < 4)
goto repeat;
*(p - 1) = '\0';
s->str += 2;
genclass(s);
s->str = p + 2;
s->str = p + 1;
return (1);
case '=': /* "[=equiv=]" */
if ((p = strstr(s->str + 2, "=]")) == NULL)
if ((p = strchr(s->str + 2, ']')) == NULL)
return (0);
if (*(p - 1) != '=' || p - s->str < 4)
goto repeat;
s->str += 2;
genequiv(s);
return (1);
default: /* "[\###*n]" or "[#*n]" */
repeat:
if ((p = strpbrk(s->str + 2, "*]")) == NULL)
return (0);
if (p[0] != '*' || index(p, ']') == NULL)