mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-16 03:19:54 +08:00
d47d5b850b
if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/include/langinfo.h (enum __nl_item): New type. Define all native values accessible through nl_langinfo. Define previously existing POSIX-compatible values as macros as well. * libc/include/stdlib.h (__mb_cur_max): Drop declaration. (__locale_mb_cur_max): Declare. (MB_CUR_MAX): Re-define calling __locale_mb_cur_max. * libc/locale/Makefile.am (ELIX_SOURCES): Add lctype.c. * libc/locale/Makefile.in: Regenerate. * libc/locale/lctype.c: New file to define and load LC_CTYPE category. * libc/locale/lctype.h: New file, matching header. * libc/locale/lmessages.c (_C_messages_locale): Add default values for wide char members. (__messages_load_locale): Add _C_messages_locale in call to __set_lc_messages_from_win. * libc/locale/lmessages.h (struct lc_messages_T): Add wide char members. * libc/locale/lmonetary.c (_C_monetary_locale): Add default values for wide char members. (__monetary_load_locale): Add _C_monetary_locale in call to __set_lc_monetary_from_win. * libc/locale/lmonetary.h (struct lc_monetary_T): Add wide char members. Add numerical values for international currency formatting per POSIX-1.2008, if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/locale/lnumeric.c (_C_numeric_locale): Add default values for wide char members. (__numeric_load_locale): Add _C_numeric_locale in call to __set_lc_numeric_from_win. * libc/locale/lnumeric.h (struct lc_numeric_T): Add wide char members. * libc/locale/locale.c (loadlocale): Return doing nothing if category locale didn't change. Convert category if chain to switch statement. Call __ctype_load_locale in LC_CTYPE case. (__locale_charset): Add (but disable for now) returning codeset from __get_current_ctype_locale. (__locale_mb_cur_max): Add (but disable for now) returning mb_cur_max from __get_current_ctype_locale. (__locale_msgcharset): Add returning codeset from __get_current_messages_locale. (_localeconv_r): Accommodate int_XXX values. * libc/locale/nl_langinfo.c (nl_ext): New array to define what is to be returned for non-POSIX values. (nl_Langinfo): Return correct codeset for each locale category. Return extended values if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/locale/timelocal.c (_C_time_locale): Add default values for wide char members. (__time_load_locale): Add _C_time_locale in call to __set_lc_time_from_win. * libc/locale/timelocal.h (struct lc_time_T): Add wide char members. * libc/stdio/vfwprintf.c (_VFWPRINTF_R): Use wide char decimal point and thousands_sep if __HAVE_LOCALE_INFO_EXTENDED__ is defined. * libc/time/strftime.c: Rework to accommodate availability of wide char strings in LC_TIME category if __HAVE_LOCALE_INFO_EXTENDED__ is defined.
110 lines
3.4 KiB
C
110 lines
3.4 KiB
C
/*
|
|
* Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <limits.h>
|
|
#include "lnumeric.h"
|
|
#include "ldpart.h"
|
|
|
|
extern int __nlocale_changed;
|
|
extern const char *__fix_locale_grouping_str(const char *);
|
|
|
|
#define LCNUMERIC_SIZE (sizeof(struct lc_numeric_T) / sizeof(char *))
|
|
|
|
static char numempty[] = { CHAR_MAX, '\0' };
|
|
|
|
static const struct lc_numeric_T _C_numeric_locale = {
|
|
".", /* decimal_point */
|
|
"", /* thousands_sep */
|
|
numempty /* grouping */
|
|
#ifdef __HAVE_LOCALE_INFO_EXTENDED__
|
|
, "ASCII", /* codeset */
|
|
L".", /* wdecimal_point */
|
|
L"", /* wthousands_sep */
|
|
#endif
|
|
};
|
|
|
|
static struct lc_numeric_T _numeric_locale;
|
|
static int _numeric_using_locale;
|
|
static char *_numeric_locale_buf;
|
|
|
|
int
|
|
__numeric_load_locale(const char *name , void *f_wctomb, const char *charset)
|
|
{
|
|
int ret;
|
|
|
|
#ifdef __CYGWIN__
|
|
extern int __set_lc_numeric_from_win (const char *,
|
|
const struct lc_numeric_T *,
|
|
struct lc_numeric_T *, char **,
|
|
void *, const char *);
|
|
int old_numeric_using_locale = _numeric_using_locale;
|
|
_numeric_using_locale = 0;
|
|
ret = __set_lc_numeric_from_win (name, &_C_numeric_locale,
|
|
&_numeric_locale, &_numeric_locale_buf,
|
|
f_wctomb, charset);
|
|
/* ret == -1: error, ret == 0: C/POSIX, ret > 0: valid */
|
|
if (ret < 0)
|
|
_numeric_using_locale = old_numeric_using_locale;
|
|
else
|
|
{
|
|
_numeric_using_locale = ret;
|
|
__nlocale_changed = 1;
|
|
ret = 0;
|
|
}
|
|
#else
|
|
__nlocale_changed = 1;
|
|
ret = __part_load_locale(name, &_numeric_using_locale,
|
|
_numeric_locale_buf, "LC_NUMERIC",
|
|
LCNUMERIC_SIZE, LCNUMERIC_SIZE,
|
|
(const char **)&_numeric_locale);
|
|
if (ret == 0 && _numeric_using_locale)
|
|
_numeric_locale.grouping =
|
|
__fix_locale_grouping_str(_numeric_locale.grouping);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
struct lc_numeric_T *
|
|
__get_current_numeric_locale(void) {
|
|
|
|
return (_numeric_using_locale
|
|
? &_numeric_locale
|
|
: (struct lc_numeric_T *)&_C_numeric_locale);
|
|
}
|
|
|
|
#ifdef LOCALE_DEBUG
|
|
void
|
|
numericdebug(void) {
|
|
printf( "decimal_point = %s\n"
|
|
"thousands_sep = %s\n"
|
|
"grouping = %s\n",
|
|
_numeric_locale.decimal_point,
|
|
_numeric_locale.thousands_sep,
|
|
_numeric_locale.grouping
|
|
);
|
|
}
|
|
#endif /* LOCALE_DEBUG */
|