aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-09 10:05:22 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-09 10:05:22 +0000
commit7be688b58fb2e5fea5db003d9ea72c4d779e65c6 (patch)
tree144ea8057c9d5264737b36a7792081f6619e0acf /stdio-common
parentff136edd32fb0d55d73032ff3d565794e601a398 (diff)
downloadglibc-7be688b58fb2e5fea5db003d9ea72c4d779e65c6.tar
glibc-7be688b58fb2e5fea5db003d9ea72c4d779e65c6.tar.gz
glibc-7be688b58fb2e5fea5db003d9ea72c4d779e65c6.tar.bz2
glibc-7be688b58fb2e5fea5db003d9ea72c4d779e65c6.zip
Update.
* stdio-common/_i18n_number.h: Support printing localized decimal point and thousand separator. * wctype/wctrans.c: Add __wctrans alias. * include/wctype.h: Declare __wctrans. Based on a patch by Hamed Malek.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/_i18n_number.h57
1 files changed, 51 insertions, 6 deletions
diff --git a/stdio-common/_i18n_number.h b/stdio-common/_i18n_number.h
index 046657cc28..0043b04470 100644
--- a/stdio-common/_i18n_number.h
+++ b/stdio-common/_i18n_number.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 2000.
@@ -17,18 +17,49 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <wchar.h>
+#include <wctype.h>
+
#include "../locale/outdigits.h"
#include "../locale/outdigitswc.h"
static CHAR_T *
_i18n_number_rewrite (CHAR_T *w, CHAR_T *rear_ptr)
{
- CHAR_T *src, *s;
+#ifdef COMPILE_WPRINTF
+ wint_t wdecimal = L'\0';
+ wint_t wthousands = L'\0';
+# define decimal NULL
+# define thousands NULL
+#else
+# define wdecimal L'\0'
+# define wthousands L'\0'
+ char decimal[MB_LEN_MAX];
+ char thousands[MB_LEN_MAX];
+#endif
+
+ /* "to_outpunct" is a map from ASCII decimal point and thousands-sep
+ to their equivalent in locale. This is defined for locales which
+ use extra decimal point and thousands-sep. */
+ wctrans_t map = __wctrans ("to_outpunct");
+ if (map != NULL)
+ {
+ mbstate_t state;
+ memset (&state, '\0', sizeof (state));
+
+ if (__wcrtomb (decimal, wdecimal, &state) == (size_t) -1)
+ memcpy (decimal, ".", 2);
+
+ memset (&state, '\0', sizeof (state));
+
+ if (__wcrtomb (thousands, wthousands, &state) == (size_t) -1)
+ memcpy (thousands, ",", 2);
+ }
/* Copy existing string so that nothing gets overwritten. */
- src = (CHAR_T *) alloca ((rear_ptr - w) * sizeof (CHAR_T));
- s = (CHAR_T *) __mempcpy (src, w,
- (rear_ptr - w) * sizeof (CHAR_T));
+ CHAR_T *src = (CHAR_T *) alloca ((rear_ptr - w) * sizeof (CHAR_T));
+ CHAR_T *s = (CHAR_T *) __mempcpy (src, w,
+ (rear_ptr - w) * sizeof (CHAR_T));
w = rear_ptr;
/* Process all characters in the string. */
@@ -41,8 +72,22 @@ _i18n_number_rewrite (CHAR_T *w, CHAR_T *rear_ptr)
else
*--w = (CHAR_T) outdigitwc_value (*s - '0');
}
- else
+ else if (__builtin_expect (map == NULL, 1) || (*s != '.' && *s != ','))
*--w = *s;
+ else
+ {
+ if (sizeof (CHAR_T) == 1)
+ {
+ const char *outpunct = *s == '.' ? decimal : thousands;
+ size_t dlen = strlen (outpunct);
+
+ w -= dlen;
+ while (dlen-- > 0)
+ w[dlen] = outpunct[dlen];
+ }
+ else
+ *--w = *s == '.' ? (CHAR_T) wdecimal : (CHAR_T) wthousands;
+ }
}
return w;