Skip to content
Permalink
Browse files

strfmon_l: Use specified locale for number formatting [BZ #19633]

  • Loading branch information...
Florian Weimer
Florian Weimer committed Apr 4, 2016
1 parent 5cd7af0 commit 985fc132f23dbb83de76c5af9e783ef1b5900148
Showing with 301 additions and 25 deletions.
  1. +18 −0 ChangeLog
  2. +4 −0 include/printf.h
  3. +21 −0 locale/localeinfo.h
  4. +33 −19 stdio-common/printf_fp.c
  5. +4 −2 stdlib/Makefile
  6. +1 −4 stdlib/strfmon_l.c
  7. +220 −0 stdlib/tst-strfmon_l.c
@@ -1,3 +1,21 @@
2016-04-04 Florian Weimer <fweimer@redhat.com>

[BZ #19633]
Use specified locale for number formatting in strfmon_l.
* locale/localeinfo.h (__nl_lookup, _nl_lookup_wstr)
(__nl_lookup_word): New inline functions.
* include/printf.h (__print_fp_l): Declare.
* stdio-common/printf_fp.c (___printf_fp_l): Renamed from
___printf_fp. Add locale argument. Replace _NL_CURRENT with
_nl_lookup and _NL_CURRENT_WORD with _nl_lookup_word.
(___printf_fp): New function.
* stdlib/strfmon_l.c (__printf_fp): Remove declaration.
(__vstrfmon_l): Call __printf_fp_l instead of printf_fp.
* stdlib/tst-strfmon_l.c (do_test): New test.
* stdlib/Makefile (tests): Add kt.
(LOCALES): Build additional locales.
(tst-strfmon_l.out): Require locales.

2016-04-03 H.J. Lu <hongjiu.lu@intel.com>

* sysdeps/x86_64/multiarch/memmove-avx-unaligned-erms.S: Skip
@@ -1,12 +1,16 @@
#ifndef _PRINTF_H

#include <stdio-common/printf.h>
#include <xlocale.h>

/* Now define the internal interfaces. */
extern int __printf_fphex (FILE *, const struct printf_info *,
const void *const *);
extern int __printf_fp (FILE *, const struct printf_info *,
const void *const *);
libc_hidden_proto (__printf_fp)
extern int __printf_fp_l (FILE *, locale_t, const struct printf_info *,
const void *const *);
libc_hidden_proto (__printf_fp_l)

#endif
@@ -299,6 +299,27 @@ extern __thread struct __locale_data *const *_nl_current_##category \

#endif

/* Extract CATEGORY locale's string for ITEM. */
static inline const char *
_nl_lookup (locale_t l, int category, int item)
{
return l->__locales[category]->values[_NL_ITEM_INDEX (item)].string;
}

/* Extract CATEGORY locale's wide string for ITEM. */
static inline const wchar_t *
_nl_lookup_wstr (locale_t l, int category, int item)
{
return (wchar_t *) l->__locales[category]
->values[_NL_ITEM_INDEX (item)].wstr;
}

/* Extract the CATEGORY locale's word for ITEM. */
static inline uint32_t
_nl_lookup_word (locale_t l, int category, int item)
{
return l->__locales[category]->values[_NL_ITEM_INDEX (item)].word;
}

/* Default search path if no LOCPATH environment variable. */
extern const char _nl_default_locale_path[] attribute_hidden;
@@ -209,9 +209,9 @@ hack_digit (struct hack_digit_param *p)
}

int
___printf_fp (FILE *fp,
const struct printf_info *info,
const void *const *args)
___printf_fp_l (FILE *fp, locale_t loc,
const struct printf_info *info,
const void *const *args)
{
/* The floating-point value to output. */
union
@@ -263,18 +263,19 @@ ___printf_fp (FILE *fp,
/* Figure out the decimal point character. */
if (info->extra == 0)
{
decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
decimalwc = _NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_DECIMAL_POINT_WC);
decimal = _nl_lookup (loc, LC_NUMERIC, DECIMAL_POINT);
decimalwc = _nl_lookup_word
(loc, LC_NUMERIC, _NL_NUMERIC_DECIMAL_POINT_WC);
}
else
{
decimal = _NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT);
decimal = _nl_lookup (loc, LC_MONETARY, MON_DECIMAL_POINT);
if (*decimal == '\0')
decimal = _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
decimalwc = _NL_CURRENT_WORD (LC_MONETARY,
decimal = _nl_lookup (loc, LC_NUMERIC, DECIMAL_POINT);
decimalwc = _nl_lookup_word (loc, LC_MONETARY,
_NL_MONETARY_DECIMAL_POINT_WC);
if (decimalwc == L'\0')
decimalwc = _NL_CURRENT_WORD (LC_NUMERIC,
decimalwc = _nl_lookup_word (loc, LC_NUMERIC,
_NL_NUMERIC_DECIMAL_POINT_WC);
}
/* The decimal point character must not be zero. */
@@ -284,9 +285,9 @@ ___printf_fp (FILE *fp,
if (info->group)
{
if (info->extra == 0)
grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
grouping = _nl_lookup (loc, LC_NUMERIC, GROUPING);
else
grouping = _NL_CURRENT (LC_MONETARY, MON_GROUPING);
grouping = _nl_lookup (loc, LC_MONETARY, MON_GROUPING);

if (*grouping <= 0 || *grouping == CHAR_MAX)
grouping = NULL;
@@ -296,19 +297,20 @@ ___printf_fp (FILE *fp,
if (wide)
{
if (info->extra == 0)
thousands_sepwc =
_NL_CURRENT_WORD (LC_NUMERIC, _NL_NUMERIC_THOUSANDS_SEP_WC);
thousands_sepwc = _nl_lookup_word
(loc, LC_NUMERIC, _NL_NUMERIC_THOUSANDS_SEP_WC);
else
thousands_sepwc =
_NL_CURRENT_WORD (LC_MONETARY,
_nl_lookup_word (loc, LC_MONETARY,
_NL_MONETARY_THOUSANDS_SEP_WC);
}
else
{
if (info->extra == 0)
thousands_sep = _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
thousands_sep = _nl_lookup (loc, LC_NUMERIC, THOUSANDS_SEP);
else
thousands_sep = _NL_CURRENT (LC_MONETARY, MON_THOUSANDS_SEP);
thousands_sep = _nl_lookup
(loc, LC_MONETARY, MON_THOUSANDS_SEP);
}

if ((wide && thousands_sepwc == L'\0')
@@ -1171,9 +1173,11 @@ ___printf_fp (FILE *fp,
size_t decimal_len;
size_t thousands_sep_len;
wchar_t *copywc;
size_t factor = (info->i18n
? _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX)
: 1);
size_t factor;
if (info->i18n)
factor = _nl_lookup_word (loc, LC_CTYPE, _NL_CTYPE_MB_CUR_MAX);
else
factor = 1;

decimal_len = strlen (decimal);

@@ -1244,8 +1248,18 @@ ___printf_fp (FILE *fp,
}
return done;
}
ldbl_hidden_def (___printf_fp_l, __printf_fp_l)
ldbl_strong_alias (___printf_fp_l, __printf_fp_l)

int
___printf_fp (FILE *fp, const struct printf_info *info,
const void *const *args)
{
return ___printf_fp_l (fp, _NL_CURRENT_LOCALE, info, args);
}
ldbl_hidden_def (___printf_fp, __printf_fp)
ldbl_strong_alias (___printf_fp, __printf_fp)


/* Return the number of extra grouping characters that will be inserted
into a number with INTDIG_MAX integer digits. */
@@ -76,7 +76,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
tst-secure-getenv tst-strtod-overflow tst-strtod-round \
tst-tininess tst-strtod-underflow tst-tls-atexit \
tst-setcontext3 tst-tls-atexit-nodelete \
tst-strtol-locale tst-strtod-nan-locale
tst-strtol-locale tst-strtod-nan-locale tst-strfmon_l
tests-static := tst-secure-getenv

modules-names = tst-tls-atexit-lib
@@ -126,7 +126,8 @@ include ../Rules

ifeq ($(run-built-tests),yes)
LOCALES := cs_CZ.UTF-8 de_DE.UTF-8 en_US.ISO-8859-1 tr_TR.UTF-8 \
tr_TR.ISO-8859-9
tr_TR.ISO-8859-9 tg_TJ.UTF-8 te_IN.UTF-8 bn_IN.UTF-8 \
el_GR.UTF-8
include ../gen-locales.mk

$(objpfx)bug-strtod2.out: $(gen-locales)
@@ -137,6 +138,7 @@ $(objpfx)tst-strtod4.out: $(gen-locales)
$(objpfx)tst-strtod5.out: $(gen-locales)
$(objpfx)tst-strtol-locale.out: $(gen-locales)
$(objpfx)tst-strtod-nan-locale.out: $(gen-locales)
$(objpfx)tst-strfmon_l.out: $(gen-locales)
endif

# Testdir has to be named stdlib and needs to be writable
@@ -68,9 +68,6 @@
#define _NL_CURRENT(category, item) \
(current->values[_NL_ITEM_INDEX (item)].string)

extern int __printf_fp (FILE *, const struct printf_info *,
const void *const *);
libc_hidden_proto (__printf_fp)
/* This function determines the number of digit groups in the output.
The definition is in printf_fp.c. */
extern unsigned int __guess_grouping (unsigned int intdig_max,
@@ -532,7 +529,7 @@ __vstrfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format,
info.extra = 1; /* This means use values from LC_MONETARY. */

ptr = &fpnum;
done = __printf_fp (&f._sbf._f, &info, &ptr);
done = __printf_fp_l (&f._sbf._f, loc, &info, &ptr);
if (done < 0)
return -1;

Oops, something went wrong.

0 comments on commit 985fc13

Please sign in to comment.
You can’t perform that action at this time.