Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Jul 2016 10:01:31 +0000 (UTC)
From:      "Andrey A. Chernov" <ache@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r302742 - head/contrib/one-true-awk
Message-ID:  <201607131001.u6DA1Vco001037@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607131001.u6DA1Vco001037>