From owner-svn-src-projects@freebsd.org Sun Aug 9 21:32:06 2015 Return-Path: Delivered-To: svn-src-projects@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 6388099E1A2 for ; Sun, 9 Aug 2015 21:32:06 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 55365AD; Sun, 9 Aug 2015 21:32:06 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t79LW68K049147; Sun, 9 Aug 2015 21:32:06 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t79LW6fZ049146; Sun, 9 Aug 2015 21:32:06 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201508092132.t79LW6fZ049146@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 9 Aug 2015 21:32:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r286557 - projects/collation/lib/libc/regex X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Aug 2015 21:32:06 -0000 Author: bapt Date: Sun Aug 9 21:32:05 2015 New Revision: 286557 URL: https://svnweb.freebsd.org/changeset/base/286557 Log: Revert r286465. Retesting it showed that it just works. it might have been a local issue in my previous tests. Modified: projects/collation/lib/libc/regex/regcomp.c Modified: projects/collation/lib/libc/regex/regcomp.c ============================================================================== --- projects/collation/lib/libc/regex/regcomp.c Sun Aug 9 20:41:44 2015 (r286556) +++ projects/collation/lib/libc/regex/regcomp.c Sun Aug 9 21:32:05 2015 (r286557) @@ -38,13 +38,6 @@ * @(#)regcomp.c 8.5 (Berkeley) 3/20/94 */ -/* - * This implementation currently only works with C locale - * It's definitely limited by UCHAR_MAX, but not even ISO-8859 charsets - * are working. The forced changing of locale to C for the comparison - * is considered a workaround until a better solution is found. - */ - #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)regcomp.c 8.5 (Berkeley) 3/20/94"; #endif /* LIBC_SCCS and not lint */ @@ -775,9 +768,8 @@ p_b_term(struct parse *p, cset *cs) char c; wint_t start, finish; wint_t i; - locale_t loc = &__xlocale_C_locale; /* see note under license */ struct xlocale_collate *table = - (struct xlocale_collate*)loc->components[XLC_COLLATE]; + (struct xlocale_collate*)__get_locale()->components[XLC_COLLATE]; /* classify what we've got */ switch ((MORE()) ? PEEK() : '\0') {