From owner-svn-src-head@freebsd.org  Wed Jul 13 16:49:49 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CEFE9B976AA;
 Wed, 13 Jul 2016 16:49:49 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9B38B14EE;
 Wed, 13 Jul 2016 16:49:49 +0000 (UTC)
 (envelope-from ache@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6DGnmrc055814;
 Wed, 13 Jul 2016 16:49:48 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6DGnm1d055813;
 Wed, 13 Jul 2016 16:49:48 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201607131649.u6DGnm1d055813@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ache set sender to
 ache@FreeBSD.org using -f
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Wed, 13 Jul 2016 16:49:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302777 - head/contrib/tcsh
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jul 2016 16:49:49 -0000

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];