Date: Sun, 9 Aug 2015 21:32:06 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r286557 - projects/collation/lib/libc/regex Message-ID: <201508092132.t79LW6fZ049146@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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') {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508092132.t79LW6fZ049146>