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

When translating and -C is specified, behave as if the complemented set was

Browse Source 
in the locale collating order as required by SUSv3.
This commit is contained in:
Tim J. Robbins 2002-07-29 23:42:00 +00:00
parent e5f8bd9418
commit 6e9c52b638
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.bin/tr/tr.c
View File

@ -101,6 +101,7 @@ static int string1[NCHARS] = {
STR s1 = { STRING1, NORMAL, 0, OOBCH, { 0, OOBCH }, NULL, NULL }; STR s1 = { STRING1, NORMAL, 0, OOBCH, { 0, OOBCH }, NULL, NULL };
STR s2 = { STRING2, NORMAL, 0, OOBCH, { 0, OOBCH }, NULL, NULL }; STR s2 = { STRING2, NORMAL, 0, OOBCH, { 0, OOBCH }, NULL, NULL };
static int charcoll(const void *, const void *);
static void setup(int *, char *, STR *, int, int); static void setup(int *, char *, STR *, int, int);
static void usage(void); static void usage(void);
@ -109,6 +110,7 @@ main(argc, argv)
int argc; int argc;
char **argv; char **argv;
{ {
static int collorder[NCHARS], tmpmap[NCHARS];
int ch, cnt, lastch, *p; int ch, cnt, lastch, *p;
int Cflag, cflag, dflag, sflag, isstring2; int Cflag, cflag, dflag, sflag, isstring2;
@ -249,6 +251,19 @@ main(argc, argv)
*p = cnt; *p = cnt;
} }
} }
if (Cflag) {
/*
* Generate a table for locale single-byte collating element
* ordering and use it to reorder string1 as required by
* IEEE Std. 1003.1-2001.
*/
for (ch = 0; ch < NCHARS; ch++)
collorder[ch] = ch;
mergesort(collorder, NCHARS, sizeof(*collorder), charcoll);
for (ch = 0; ch < NCHARS; ch++)
tmpmap[ch] = string1[collorder[ch]];
memcpy(string1, tmpmap, sizeof(tmpmap));
}
if (sflag) if (sflag)
for (lastch = OOBCH; (ch = getchar()) != EOF;) { for (lastch = OOBCH; (ch = getchar()) != EOF;) {
@ -286,6 +301,17 @@ setup(string, arg, str, cflag, Cflag)
string[cnt] = !string[cnt] && ISCHAR(cnt); string[cnt] = !string[cnt] && ISCHAR(cnt);
} }
static int
charcoll(const void *a, const void *b)
{
char sa[2], sb[2];
sa[0] = *(const int *)a;
sb[0] = *(const int *)b;
sa[1] = sb[1] = '\0';
return (strcoll(sa, sb));
}
static void static void
usage() usage()
{ {