svn commit: r302777 - head/contrib/tcsh

[Andrey A. Chernov]

Author: ache
Date: Wed Jul 13 16:49:48 2016
New Revision: 302777
URL: https://svnweb.freebsd.org/changeset/base/302777

Log:
  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.

Modified:
  head/contrib/tcsh/glob.c

Modified: head/contrib/tcsh/glob.c
==============================================================================
--- head/contrib/tcsh/glob.c	Wed Jul 13 16:45:26 2016	(r302776)
+++ head/contrib/tcsh/glob.c	Wed Jul 13 16:49:48 2016	(r302777)
@@ -142,17 +142,23 @@ globcharcoll(__Char c1, __Char c2, int c
 	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];