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

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.

1 files changed, 6 insertions, 0 deletions

diff --git a/contrib/tcsh/glob.c b/contrib/tcsh/glob.c
index 3680403288159..46dbd7cd6d4fb 100644
--- a/contrib/tcsh/glob.c
+++ b/contrib/tcsh/glob.c
@@ -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];