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

Back out [:upper:] and [:lower:] classes sorting, it is not required

Browse Source 
by POSIX and gains nothing with current code.
This commit is contained in:
Andrey A. Chernov 2003-08-05 07:59:46 +00:00
parent 8ad968ee96
commit 035944c3b6
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,7 +198,7 @@ genclass(s)
{ {
int cnt, (*func)(int); int cnt, (*func)(int);
CLASS *cp, tmp; CLASS *cp, tmp;
int *p, n; int *p;
tmp.name = s->str; tmp.name = s->str;
if ((cp = (CLASS *)bsearch(&tmp, classes, sizeof(classes) / if ((cp = (CLASS *)bsearch(&tmp, classes, sizeof(classes) /
@ -211,18 +211,15 @@ genclass(s)
if ((func)(cnt)) if ((func)(cnt))
*p++ = cnt; *p++ = cnt;
*p = OOBCH; *p = OOBCH;
n = p - cp->set;
s->cnt = 0; s->cnt = 0;
s->set = cp->set; s->set = cp->set;
if (strcmp(s->str, "upper") == 0) if (strcmp(s->str, "upper") == 0)
s->state = SET_UPPER; s->state = SET_UPPER;
else if (strcmp(s->str, "lower") == 0) { else if (strcmp(s->str, "lower") == 0)
s->state = SET_LOWER; s->state = SET_LOWER;
} else else
s->state = SET; s->state = SET;
if ((s->state == SET_LOWER || s->state == SET_UPPER) && n > 1)
mergesort(s->set, n, sizeof(*(s->set)), charcoll);
} }
static int static int