aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-04-26 05:52:58 +0000
committerUlrich Drepper <drepper@redhat.com>2006-04-26 05:52:58 +0000
commitc61a9cfbc48e9d9b719b4bc26fa3d9ce3fbaa964 (patch)
tree269721de79babbea34af82232ddfe3e734e414bf
parent388df58d9be050a531948d5afb54d6104efa0845 (diff)
downloadglibc-c61a9cfbc48e9d9b719b4bc26fa3d9ce3fbaa964.zip
glibc-c61a9cfbc48e9d9b719b4bc26fa3d9ce3fbaa964.tar.gz
glibc-c61a9cfbc48e9d9b719b4bc26fa3d9ce3fbaa964.tar.bz2
[BZ #2420]
* stdlib/strfmon_l.c (__vstrfmon_l): Fix handling of ! modifier. * localedata/Makefile: Add rules to build and run tst-strfmon1. * localedata/tst-strfmon1.c: New file.
-rw-r--r--ChangeLog5
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/Makefile4
-rw-r--r--localedata/locales/es_UY2
-rw-r--r--localedata/tst-strfmon1.c42
-rw-r--r--stdlib/strfmon_l.c41
6 files changed, 76 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 684e94d..e3022a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-04-25 Ulrich Drepper <drepper@redhat.com>
+ [BZ #2420]
+ * stdlib/strfmon_l.c (__vstrfmon_l): Fix handling of ! modifier.
+ * localedata/Makefile: Add rules to build and run tst-strfmon1.
+ * localedata/tst-strfmon1.c: New file.
+
[BZ #2571]
* nscd/nscd_helper.c (__nscd_get_map_ref): Make mapptr argument a
volatile pointer so that the mapptr->mapped value is re-read after
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index de23e12..4eed4ec 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-25 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ #2376]
+ * locales/es_UY: Change curreny_symbol.
+
2006-04-24 Ulrich Drepper <drepper@redhat.com>
[BZ #2349]
diff --git a/localedata/Makefile b/localedata/Makefile
index db22cf1..db7094f 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -92,7 +92,8 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
tst_wctype tst_wcwidth
tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
- tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale
+ tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
+ tst-strfmon1
ifeq (yes,$(build-shared))
ifneq (no,$(PERL))
tests: $(objpfx)mtrace-tst-leaks
@@ -282,6 +283,7 @@ tst-digits-ENV = $(TEST_MBWC_ENV)
tst-mbswcs6-ENV = $(TEST_MBWC_ENV)
tst-xlocale1-ENV = $(TEST_MBWC_ENV)
tst-xlocale2-ENV = $(TEST_MBWC_ENV)
+tst-strfmon1-ENV = $(TEST_MBWC_ENV)
tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP
diff --git a/localedata/locales/es_UY b/localedata/locales/es_UY
index 36d18b1..50f8019 100644
--- a/localedata/locales/es_UY
+++ b/localedata/locales/es_UY
@@ -62,7 +62,7 @@ END LC_MESSAGES
LC_MONETARY
int_curr_symbol "<U0055><U0059><U0055><U0020>"
-currency_symbol "<U004E><U0024>"
+currency_symbol "<U0024>"
mon_decimal_point "<U002C>"
mon_thousands_sep "<U002E>"
mon_grouping 3;3
diff --git a/localedata/tst-strfmon1.c b/localedata/tst-strfmon1.c
new file mode 100644
index 0000000..e30aa1b
--- /dev/null
+++ b/localedata/tst-strfmon1.c
@@ -0,0 +1,42 @@
+#include <monetary.h>
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+
+static const struct
+{
+ const char *locale;
+ const char *expected;
+} tests[] =
+ {
+ { "de_DE.ISO-8859-1", "|-12,34 EUR|-12,34|" },
+ { "da_DK.ISO-8859-1", "|kr -12,34|-12,34|" },
+ { "zh_TW.EUC-TW", "|-NT$12.34|-12.34|" },
+ { "sv_SE.ISO-8859-1", "|-12,34 kr|-12,34|" }
+ };
+#define ntests (sizeof (tests) / sizeof (tests[0]))
+
+
+static int
+do_test (void)
+{
+ int res = 0;
+ for (int i = 0; i < ntests; ++i)
+ {
+ char buf[500];
+ if (setlocale (LC_ALL, tests[i].locale) == NULL)
+ {
+ printf ("failed to set locale %s\n", tests[i].locale);
+ res = 1;
+ continue;
+ }
+ strfmon (buf, sizeof (buf), "|%n|%!n|", -12.34, -12.34);
+ int fail = strcmp (buf, tests[i].expected) != 0;
+ printf ("%s%s\n", buf, fail ? " *** FAIL ***" : "");
+ res |= fail;
+ }
+ return res;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/stdlib/strfmon_l.c b/stdlib/strfmon_l.c
index f6d52e0..c9f3a47 100644
--- a/stdlib/strfmon_l.c
+++ b/stdlib/strfmon_l.c
@@ -486,23 +486,21 @@ __vstrfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format,
}
if (print_curr_symbol)
- {
- out_string (currency_symbol);
+ out_string (currency_symbol);
- if (sign_posn == 4)
- {
- if (sep_by_space == 2)
- out_char (space_char);
- out_string (sign_string);
- if (sep_by_space == 1)
- /* POSIX.2 and SUS are not clear on this case, but C99
- says a space follows the adjacent-symbol-and-sign */
- out_char (' ');
- }
- else
- if (sep_by_space == 1)
- out_char (space_char);
+ if (sign_posn == 4)
+ {
+ if (print_curr_symbol && sep_by_space == 2)
+ out_char (space_char);
+ out_string (sign_string);
+ if (sep_by_space == 1)
+ /* POSIX.2 and SUS are not clear on this case, but C99
+ says a space follows the adjacent-symbol-and-sign */
+ out_char (' ');
}
+ else
+ if (print_curr_symbol && sep_by_space == 1)
+ out_char (space_char);
}
else
if (sign_posn != 0 && sign_posn != 2 && sign_posn != 3
@@ -561,12 +559,13 @@ __vstrfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format,
|| (sign_posn == 0 && sep_by_space == 1))
out_char (space_char);
out_nstring (currency_symbol, currency_symbol_len);
- if (sign_posn == 4)
- {
- if (sep_by_space == 2)
- out_char (' ');
- out_string (sign_string);
- }
+ }
+
+ if (sign_posn == 4)
+ {
+ if (sep_by_space == 2)
+ out_char (' ');
+ out_string (sign_string);
}
}