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

use strcoll() where it is easy to sort german ss and similar properly

Browse Source
This commit is contained in:
ache 1999-02-13 13:05:04 +00:00
parent 8883e5d538
commit 4124fd16f0
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/usr.bin/sort/sort.c
View File

@ -240,21 +240,7 @@ init_collates(void)
}
}
}
static int
collcmp (const unsigned char *p1, const unsigned char *p2, size_t n)
{
int r;
if (n != 0) {
do {
if ((r = COLLDIFF (*p1++, *p2++)) != 0)
return r;
} while (--n != 0);
}
return (0);
}
#endif
#endif /* __FreeBSD__ */
static void
usage (int status)
@ -1187,7 +1173,7 @@ keycompare (const struct line *a, const struct line *b)
}
else
#ifdef __FreeBSD__
diff = collcmp (texta, textb, min (lena, lenb));
diff = strcoll (texta, textb);
#else
diff = memcmp (texta, textb, min (lena, lenb));
#endif
@ -1231,21 +1217,21 @@ compare (register const struct line *a, register const struct line *b)
{
char *ap = a->text, *bp = b->text;
#ifdef __FreeBSD__
diff = COLLDIFF (*ap, *bp);
#else
#ifndef __FreeBSD__
diff = UCHAR (*ap) - UCHAR (*bp);
#endif
if (diff == 0)
{
#endif
#ifdef __FreeBSD__
diff = collcmp (ap, bp, mini);
diff = strcoll (ap, bp);
#else
diff = memcmp (ap, bp, mini);
#endif
if (diff == 0)
diff = tmpa - tmpb;
#ifndef __FreeBSD__
}
#endif
}
return reverse ? -diff : diff;