From owner-svn-src-head@freebsd.org  Wed Jul 13 10:01:32 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 5B786B97ECE;
 Wed, 13 Jul 2016 10:01:32 +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 254FF1BF4;
 Wed, 13 Jul 2016 10:01:32 +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 u6DA1VNX001038;
 Wed, 13 Jul 2016 10:01:31 GMT (envelope-from ache@FreeBSD.org)
Received: (from ache@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6DA1Vco001037;
 Wed, 13 Jul 2016 10:01:31 GMT (envelope-from ache@FreeBSD.org)
Message-Id: <201607131001.u6DA1Vco001037@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 10:01:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r302742 - head/contrib/one-true-awk
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 10:01:32 -0000

Author: ache
Date: Wed Jul 13 10:01:31 2016
New Revision: 302742
URL: https://svnweb.freebsd.org/changeset/base/302742

Log:
  After removing collation for [a-z] ranges in r302512, do it here too.
  
  I'll try to keep the change very minimal to not touch contribed code much.
  I'll send it upstream when it will be merged to main branches,
  but we need the change right now here.

Modified:
  head/contrib/one-true-awk/b.c

Modified: head/contrib/one-true-awk/b.c
==============================================================================
--- head/contrib/one-true-awk/b.c	Wed Jul 13 09:50:17 2016	(r302741)
+++ head/contrib/one-true-awk/b.c	Wed Jul 13 10:01:31 2016	(r302742)
@@ -296,7 +296,11 @@ static int collate_range_cmp(int a, int 
 		return 0;
 	s[0][0] = a;
 	s[1][0] = b;
+#ifdef __FreeBSD__
+	return (strcmp(s[0], s[1]));
+#else
 	return (strcoll(s[0], s[1]));
+#endif
 }
 
 char *cclenter(const char *argp)	/* add a character class */