Make localeconv() actual function. Now it will use LC_MONETARY/LC_NUMERIC

information to fill return structure. Remove unused anymore stub.

1 files changed, 65 insertions, 9 deletions

diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
index f3172af..16fa539 100644
--- a/lib/libc/locale/localeconv.c
+++ b/lib/libc/locale/localeconv.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2001 Alexey Zelkin
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
@@ -10,13 +11,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -32,10 +26,33 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
+#if 0
 static char sccsid[] = "@(#)localeconv.c	8.1 (Berkeley) 6/4/93";
+#endif
+static char rcsid[] = "$FreeBSD$";
 #endif /* LIBC_SCCS and not lint */
 
 #include <locale.h>
+#include <stdlib.h>
+#include "lmonetary.h"
+#include "lnumeric.h"
+
+/* 
+ * The localeconv() function constructs a struct lconv from the current
+ * monetary and numeric locales.
+ *
+ * Because localeconv() may be called many times (especially by library
+ * routines like printf() & strtod()), the approprate members of the 
+ * lconv structure are computed only when the monetary or numeric 
+ * locale has been changed.
+ */
+int __mlocale_changed = 1;
+int __nlocale_changed = 1;
+
+static char
+cnv(char *str) {
+	return (char)strtol(str, NULL, 10);
+}
 
 /*
  * Return the current locale conversion.
@@ -43,7 +60,46 @@ static char sccsid[] = "@(#)localeconv.c	8.1 (Berkeley) 6/4/93";
 struct lconv *
 localeconv()
 {
-	extern struct lconv *__lconv;
+    static struct lconv ret;
+
+    if (__mlocale_changed) {
+	/* LC_MONETARY part */
+        struct lc_monetary_T * mptr; 
+
+#define M_ASSIGN_STR(NAME) (ret.NAME = (char*)mptr->NAME)
+#define M_ASSIGN_CHAR(NAME) (ret.NAME = cnv((char*)mptr->NAME))
+
+	mptr = __get_current_monetary_locale();
+	M_ASSIGN_STR(int_curr_symbol);
+	M_ASSIGN_STR(currency_symbol);
+	M_ASSIGN_STR(mon_decimal_point);
+	M_ASSIGN_STR(mon_thousands_sep);
+	M_ASSIGN_STR(mon_grouping);
+	M_ASSIGN_STR(positive_sign);
+	M_ASSIGN_STR(negative_sign);
+	M_ASSIGN_CHAR(int_frac_digits);
+	M_ASSIGN_CHAR(frac_digits);
+	M_ASSIGN_CHAR(p_cs_precedes);
+	M_ASSIGN_CHAR(p_sep_by_space);
+	M_ASSIGN_CHAR(n_cs_precedes);
+	M_ASSIGN_CHAR(n_sep_by_space);
+	M_ASSIGN_CHAR(p_sign_posn);
+	M_ASSIGN_CHAR(n_sign_posn);
+	__mlocale_changed = 0;
+    }
+
+    if (__nlocale_changed) {
+	/* LC_NUMERIC part */
+        struct lc_numeric_T * nptr; 
+
+#define N_ASSIGN_STR(NAME) (ret.NAME = (char*)nptr->NAME)
+
+	nptr = __get_current_numeric_locale();
+	N_ASSIGN_STR(decimal_point);
+	N_ASSIGN_STR(thousands_sep);
+	N_ASSIGN_STR(grouping);
+	__nlocale_changed = 0;
+    }
 
-	return (__lconv);
+    return (&ret);
 }