This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Complete display of LC_MONETARY
- From: Andreas Schwab <schwab at suse dot de>
- To: OndÅej BÃlka <neleai at seznam dot cz>
- Cc: libc-alpha at sourceware dot org
- Date: Mon, 18 Nov 2013 17:41:09 +0100
- Subject: Re: [PATCH] Complete display of LC_MONETARY
- Authentication-results: sourceware.org; auth=none
- References: <mvm4n7hrb3i dot fsf at hawking dot suse dot de> <20131118162740 dot GB3928 at domone dot podge>
It needs an amendment, the C locale has a bad value for conversion_rate.
Andreas.
* locale/programs/locale.c (show_info): Decode wordarray elements.
* locale/categories.def (LC_MONETARY): Add element for
_NL_MONETARY_CRNCYSTR.
* locale/C-monetary.c (conversion_rate): New variable.
(_nl_C_LC_MONETARY): Use it for _NL_MONETARY_CONVERSION_RATE
element.
---
locale/C-monetary.c | 3 ++-
locale/categories.def | 1 +
locale/programs/locale.c | 18 ++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/locale/C-monetary.c b/locale/C-monetary.c
index 3246ff5..9c36c76 100644
--- a/locale/C-monetary.c
+++ b/locale/C-monetary.c
@@ -22,6 +22,7 @@
``LC_MONETARY Category Definition in the POSIX Locale'',
with additions from ISO 14652, section 4.4. */
static const char not_available[] = "\377";
+static const uint32_t conversion_rate[] = { 1, 1 };
const struct __locale_data _nl_C_LC_MONETARY attribute_hidden =
{
@@ -74,7 +75,7 @@ const struct __locale_data _nl_C_LC_MONETARY attribute_hidden =
{ .word = 99991231 },
{ .word = 10101 },
{ .word = 99991231 },
- { .word = 1 },
+ { .string = (const char *) conversion_rate },
{ .word = (unsigned int) L'\0' },
{ .word = (unsigned int) L'\0' },
{ .string = _nl_C_codeset }
diff --git a/locale/categories.def b/locale/categories.def
index 8c25378..e1172e9 100644
--- a/locale/categories.def
+++ b/locale/categories.def
@@ -156,6 +156,7 @@ DEFINE_CATEGORY
DEFINE_ELEMENT (N_SEP_BY_SPACE, "n_sep_by_space", std, byte, 0, 2)
DEFINE_ELEMENT (P_SIGN_POSN, "p_sign_posn", std, byte, 0, 4)
DEFINE_ELEMENT (N_SIGN_POSN, "n_sign_posn", std, byte, 0, 4)
+ DEFINE_ELEMENT (_NL_MONETARY_CRNCYSTR, "crncystr", std, string)
DEFINE_ELEMENT (__INT_P_CS_PRECEDES, "int_p_cs_precedes", std, byte, 0, 1)
DEFINE_ELEMENT (__INT_P_SEP_BY_SPACE, "int_p_sep_by_space", std, byte, 0, 2)
DEFINE_ELEMENT (__INT_N_CS_PRECEDES, "int_n_cs_precedes", std, byte, 0, 1)
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index c0bdb6c..d2b28d0 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -927,6 +927,24 @@ show_info (const char *name)
printf ("%d\n", val.word);
}
break;
+ case wordarray:
+ {
+ int first = 1;
+ union { unsigned int *wordarray; char *string; } val;
+ int cnt;
+
+ val.string = nl_langinfo (item->item_id);
+ if (show_keyword_name)
+ printf ("%s=", item->name);
+
+ for (cnt = 0; cnt < item->max; ++cnt)
+ {
+ printf ("%s%d", first ? "" : ";", val.wordarray[cnt]);
+ first = 0;
+ }
+ putchar ('\n');
+ }
+ break;
case wstring:
case wstringarray:
case wstringlist:
--
1.8.4.3
--
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."