d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strfmon: Trim the SPACE from international currency symbol

Browse Source 
The international currency symbol (int_curr_symbol) has a mandatory
SPACE character as the last character.

Trim this space after reading it, otherwise this extra space will always
be printed when displaying the int_curr_symbol.

Fixes the output when the international currency format is selected
(%i).

    Locale         Format    Before           After
    en_US.UTF-8    [%i]      [USD 123.45]     [USD123.45]
    fr_FR.UTF-8    [%i]      [123,45 EUR ]    [123,45 EUR]

Note that the en_US.UTF-8 locale states that no space should be printed
between the currency symbol and the value (sep_by_space = 0).

Reviewed by:	kib
PR:	267282
Github PR:	#619
MFC after:	1 week
This commit is contained in:
Jose Luis Duran 2022-10-21 13:13:27 -03:00 committed by Konstantin Belousov
parent 9e03b903e3
commit 6da51e19e3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/stdlib/strfmon.c
View File

@ -240,8 +240,10 @@ vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc,
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
if (currency_symbol != NULL &&
strlen(currency_symbol) > 3)
strlen(currency_symbol) > 3) {
space_char = currency_symbol[3];
currency_symbol[3] = '\0';
}
} else
currency_symbol = strdup(lc->currency_symbol);

4
lib/libc/tests/stdlib/strfmon_test.c
View File

@ -195,8 +195,8 @@ ATF_TC_BODY(strfmon_international_currency_code, tc)
const char *locale;
const char *expected;
} tests[] = {
{ "en_US.UTF-8", "[USD 123.45]" }, /* XXX */
{ "de_DE.UTF-8", "[123,45 EUR ]" }, /* XXX */
{ "en_US.UTF-8", "[USD123.45]" },
{ "de_DE.UTF-8", "[123,45 EUR]" },
{ "C", "[123.45]" },
};
size_t i;