summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2002-11-01 21:40:30 +0000
committerManuel Novoa III <mjn3@codepoet.org>2002-11-01 21:40:30 +0000
commit4623f030d9683fe7d835d2f73605ab35b4271a8c (patch)
tree4c0261be1cfec74b0d7d71a4f66fc5d215ae7ef3
parentc8bd5766b25332150742aba6b1fc8cac540e9225 (diff)
Work around glibc brain-damage regarding nl_langinfo and {mon_}grouping
entries.
-rw-r--r--extra/locale/gen_locale.c87
1 files changed, 85 insertions, 2 deletions
diff --git a/extra/locale/gen_locale.c b/extra/locale/gen_locale.c
index 9b2576e50..047b843dc 100644
--- a/extra/locale/gen_locale.c
+++ b/extra/locale/gen_locale.c
@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <limits.h>
#include <assert.h>
#include <locale.h>
#include <langinfo.h>
@@ -547,7 +548,48 @@ static int lc_numeric_uniq;
static void lc_numeric_S(int X, int k)
{
int j, m;
- j = addstring(nl_langinfo(X));
+ char buf[256];
+ char *e;
+ char *s;
+ char c;
+
+ s = nl_langinfo(X);
+ if (X == GROUPING) {
+ if (s) {
+ if ((*s == CHAR_MAX) || (*s == -1)) { /* stupid glibc... :-( */
+ s = "";
+ }
+ e = s;
+ c = 0;
+ while (*e) { /* find end of string */
+ if (*e == CHAR_MAX) {
+ c = CHAR_MAX;
+ ++e;
+ break;
+ }
+ ++e;
+ }
+ if ((e - s) > sizeof(buf)) {
+ printf("grouping specifier too long\n");
+ exit(EXIT_FAILURE);
+ }
+ strncpy(buf, s, (e-s));
+ e = buf + (e-s);
+ *e = 0; /* Make sure we're null-terminated. */
+
+ if (c != CHAR_MAX) { /* remove duplicate repeats */
+ while (e > buf) {
+ --e;
+ if (*e != e[-1]) {
+ break;
+ }
+ }
+ *++e = 0;
+ }
+ s = buf;
+ }
+ }
+ j = addstring(s);
for (m=0 ; m < lc_numeric_count[k] ; m++) {
if (lc_numeric_item[k][m] == j) {
break;
@@ -692,7 +734,48 @@ static void lc_monetary_C(int X, int k)
static void lc_monetary_S(int X, int k)
{
int j, m;
- j = addstring(nl_langinfo(X));
+ char buf[256];
+ char *e;
+ char *s;
+ char c;
+
+ s = nl_langinfo(X);
+ if (X == MON_GROUPING) {
+ if (s) {
+ if ((*s == CHAR_MAX) || (*s == -1)) { /* stupid glibc... :-( */
+ s = "";
+ }
+ e = s;
+ c = 0;
+ while (*e) { /* find end of string */
+ if (*e == CHAR_MAX) {
+ c = CHAR_MAX;
+ ++e;
+ break;
+ }
+ ++e;
+ }
+ if ((e - s) > sizeof(buf)) {
+ printf("mon_grouping specifier too long\n");
+ exit(EXIT_FAILURE);
+ }
+ strncpy(buf, s, (e-s));
+ e = buf + (e-s);
+ *e = 0; /* Make sure we're null-terminated. */
+
+ if (c != CHAR_MAX) { /* remove duplicate repeats */
+ while (e > buf) {
+ --e;
+ if (*e != e[-1]) {
+ break;
+ }
+ }
+ *++e = 0;
+ }
+ s = buf;
+ }
+ }
+ j = addstring(s);
for (m=0 ; m < lc_monetary_count[k] ; m++) {
if (lc_monetary_item[k][m] == j) {
break;