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

Follow alphabetical order more closely, now ISO8859-1 characters

Browse Source 
sorted properly too.
This commit is contained in:
Andrey A. Chernov 1996-06-09 18:55:57 +00:00
parent 1ffa43c082
commit 9cca9761a6
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,12 +201,25 @@ colldiff (unsigned char A, unsigned char B)
{
static unsigned char s1[2], s2[2];
if (isascii(A) || isascii(B) || !isalpha(A) || !isalpha(B))
if (A == B)
return (0);
if (isascii(A) && isascii(B) || !isalpha(A) && !isalpha(B))
return ((int)A - (int)B);
if (isupper(A) && islower(B))
return (-1);
else if (islower(A) && isupper(B))
return (1);
if (isalpha(A) && !isalpha(B)) {
if (isupper(A))
return ('A' - (int)B);
else
return ('a' - (int)B);
} else if (isalpha(B) && !isalpha(A)) {
if (isupper(B))
return ((int)A - 'A');
else
return ((int)A - 'a');
}
s1[0] = A;
s2[0] = B;
return strcoll(s1, s2);