From 36302d21c96539c3a2482ceece2957c17824b477 Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Thu, 14 Jul 2016 09:37:16 +0000 Subject: [PATCH] Back out non-collating [a-z] ranges. Instead of changing the whole course to another POSIX-permitted way for consistency and uniformity I decide to completely ignore missing regex fucntionality and focus on fixing bugs in what we have now, too many small obstacles we have choicing other way, counting ports. Corresponding libc changes are backed out in r302824. --- contrib/tcsh/glob.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/contrib/tcsh/glob.c b/contrib/tcsh/glob.c index 46dbd7cd6d4f..368040328815 100644 --- a/contrib/tcsh/glob.c +++ b/contrib/tcsh/glob.c @@ -142,23 +142,17 @@ 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];