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

After removing collation for [a-z] ranges in r302512, mimic system

Browse Source 
glob() here too.

I try to keep the change minimal to not touch contribed code much.
I'll send it upstream when it will be merged to the main branches,
but we need this change now here.
This commit is contained in:
ache 2016-07-13 16:49:48 +00:00
parent 6c5ab8a438
commit 394ebb5296
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/tcsh/glob.c
View File

@ -142,17 +142,23 @@ globcharcoll(__Char c1, __Char c2, int cs)
c1 = towlower(c1);
c2 = towlower(c2);
} else {
#ifndef __FreeBSD__
/* This should not be here, but I'll rather leave it in than engage in
a LC_COLLATE flamewar about a shell I don't use... */
if (iswlower(c1) && iswupper(c2))
return (1);
if (iswupper(c1) && iswlower(c2))
return (-1);
#endif
}
s1[0] = c1;
s2[0] = c2;
s1[1] = s2[1] = '\0';
#ifdef __FreeBSD__
return wcscmp(s1, s2);
#else
return wcscoll(s1, s2);
#endif
# else /* not WIDE_STRINGS */
char s1[2], s2[2];