From owner-svn-src-head@freebsd.org  Thu Jul 14 09:40:44 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 1FF32B92464;
 Thu, 14 Jul 2016 09:40:44 +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 E52131DA9;
 Thu, 14 Jul 2016 09:40:43 +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 u6E9ehCY033094;
 Thu, 14 Jul 2016 09:40:43 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6E9ehgs033093;
 Thu, 14 Jul 2016 09:40:43 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201607140940.u6E9ehgs033093@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: Thu, 14 Jul 2016 09:40:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302831 - 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: Thu, 14 Jul 2016 09:40:44 -0000

Author: ache
Date: Thu Jul 14 09:40:42 2016
New Revision: 302831
URL: https://svnweb.freebsd.org/changeset/base/302831

Log:
  To mimic system glob, we definitely don't need manual upper/lower hack.
  The author clearly disagree in the comment, so this patch will be not
  submitted upstream.

Modified:
  head/contrib/tcsh/glob.c

Modified: head/contrib/tcsh/glob.c
==============================================================================
--- head/contrib/tcsh/glob.c	Thu Jul 14 09:37:16 2016	(r302830)
+++ head/contrib/tcsh/glob.c	Thu Jul 14 09:40:42 2016	(r302831)
@@ -142,12 +142,14 @@ 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;