diff options
| author | theraven <theraven@FreeBSD.org> | 2011-11-20 14:45:42 +0000 |
|---|---|---|
| committer | theraven <theraven@FreeBSD.org> | 2011-11-20 14:45:42 +0000 |
| commit | 0f6ef690b3118882121ed67561c7ce2660cfebe1 (patch) | |
| tree | 909189922493cddbeeac84af2e316dc897661311 /lib/libc/string/wcscoll.c | |
| parent | 18b29f3fb8abee5d57ed8f4a44f806bec7e0eeff (diff) | |
| download | FreeBSD-src-0f6ef690b3118882121ed67561c7ce2660cfebe1.zip FreeBSD-src-0f6ef690b3118882121ed67561c7ce2660cfebe1.tar.gz | |
Implement xlocale APIs from Darwin, mainly for use by libc++. This adds a
load of _l suffixed versions of various standard library functions that use
the global locale, making them take an explicit locale parameter. Also
adds support for per-thread locales. This work was funded by the FreeBSD
Foundation.
Please test any code you have that uses the C standard locale functions!
Reviewed by: das (gdtoa changes)
Approved by: dim (mentor)
Diffstat (limited to 'lib/libc/string/wcscoll.c')
| -rw-r--r-- | lib/libc/string/wcscoll.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/libc/string/wcscoll.c b/lib/libc/string/wcscoll.c index dbfbcfa..3c51015 100644 --- a/lib/libc/string/wcscoll.c +++ b/lib/libc/string/wcscoll.c @@ -2,6 +2,11 @@ * Copyright (c) 2002 Tim J. Robbins * All rights reserved. * + * Copyright (c) 2011 The FreeBSD Foundation + * All rights reserved. + * Portions of this software were developed by David Chisnall + * under sponsorship from the FreeBSD Foundation. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -41,12 +46,15 @@ static char *__mbsdup(const wchar_t *); * with extended character sets. */ int -wcscoll(const wchar_t *ws1, const wchar_t *ws2) +wcscoll_l(const wchar_t *ws1, const wchar_t *ws2, locale_t locale) { char *mbs1, *mbs2; int diff, sverrno; + FIX_LOCALE(locale); + struct xlocale_collate *table = + (struct xlocale_collate*)locale->components[XLC_COLLATE]; - if (__collate_load_error || MB_CUR_MAX > 1) + if (table->__collate_load_error || MB_CUR_MAX > 1) /* * Locale has no special collating order, could not be * loaded, or has an extended character set; do a fast binary @@ -67,7 +75,7 @@ wcscoll(const wchar_t *ws1, const wchar_t *ws2) return (wcscmp(ws1, ws2)); } - diff = strcoll(mbs1, mbs2); + diff = strcoll_l(mbs1, mbs2, locale); sverrno = errno; free(mbs1); free(mbs2); @@ -76,6 +84,12 @@ wcscoll(const wchar_t *ws1, const wchar_t *ws2) return (diff); } +int +wcscoll(const wchar_t *ws1, const wchar_t *ws2) +{ + return wcscoll_l(ws1, ws2, __get_locale()); +} + static char * __mbsdup(const wchar_t *ws) { |
