Libc-391.tar.gz

[apple/libc.git] / locale / FreeBSD / lnumeric.c.patch

diff --git a/locale/FreeBSD/lnumeric.c.patch b/locale/FreeBSD/lnumeric.c.patch
index 545cfef774c42cbf6616f43e23117eb040afc5a5..02982896ac0c1d7185555e78db19502626fed841 100644 (file)
--- a/locale/FreeBSD/lnumeric.c.patch
+++ b/locale/FreeBSD/lnumeric.c.patch
@@ -1,11 +1,125 @@
---- lnumeric.c.orig    Tue May 20 15:21:44 2003
-+++ lnumeric.c Wed Jun 11 13:13:11 2003
-@@ -54,7 +54,7 @@
+--- lnumeric.c.orig    2004-11-25 11:38:17.000000000 -0800
++++ lnumeric.c 2005-03-16 23:02:09.000000000 -0800
+@@ -27,12 +27,14 @@
+ #include <sys/cdefs.h>
+ __FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.16 2003/06/26 10:46:16 phantom Exp $");
+ 
++#include "xlocale_private.h"
++
+ #include <limits.h>
++#include <string.h>
+ 
+ #include "ldpart.h"
+ #include "lnumeric.h"
+ 
+-extern int __nlocale_changed;
+ extern const char *__fix_locale_grouping_str(const char *);
+ 
+ #define LCNUMERIC_SIZE (sizeof(struct lc_numeric_T) / sizeof(char *))
+@@ -45,49 +47,85 @@
+       numempty        /* grouping */
+ };
+ 
+-static struct lc_numeric_T _numeric_locale;
+-static int    _numeric_using_locale;
+-static char   *_numeric_locale_buf;
+-
+-int
+-__numeric_load_locale(const char *name)
++__private_extern__ int
++__numeric_load_locale(const char *name, locale_t loc)
+ {
        int ret;
++      struct __xlocale_st_numeric *xp;
++      static struct __xlocale_st_numeric *cache = NULL;
++
++      /* 'name' must be already checked. */
++      if (strcmp(name, "C") == 0 || strcmp(name, "POSIX") == 0) {
++              if (!loc->_numeric_using_locale)
++                      return (_LDP_CACHE);
++              loc->_numeric_using_locale = 0;
++              XL_RELEASE(loc->__lc_numeric);
++              loc->__lc_numeric = NULL;
++              loc->__nlocale_changed = 1;
++              return (_LDP_CACHE);
++      }
++
++      if (loc->_numeric_using_locale && strcmp(name, loc->__lc_numeric->_numeric_locale_buf) == 0)
++              return (_LDP_CACHE);
++      /*
++       * If the locale name is the same as our cache, use the cache.
++       */
++      if (cache && cache->_numeric_locale_buf && strcmp(name, cache->_numeric_locale_buf) == 0) {
++              loc->_numeric_using_locale = 1;
++              XL_RELEASE(loc->__lc_numeric);
++              loc->__lc_numeric = cache;
++              XL_RETAIN(loc->__lc_numeric);
++              loc->__nlocale_changed = 1;
++              return (_LDP_CACHE);
++      }
++      if ((xp = (struct __xlocale_st_numeric *)malloc(sizeof(*xp))) == NULL)
++              return _LDP_ERROR;
++      xp->__refcount = 1;
++      xp->__free_extra = (__free_extra_t)__ldpart_free_extra;
++      xp->_numeric_locale_buf = NULL;
  
-       ret = __part_load_locale(name, &_numeric_using_locale,
--              _numeric_locale_buf, "LC_NUMERIC",
-+              &_numeric_locale_buf, "LC_NUMERIC",
+-      ret = __part_load_locale(name, &_numeric_using_locale,
+-              &_numeric_locale_buf, "LC_NUMERIC",
++      ret = __part_load_locale(name, &loc->_numeric_using_locale,
++              &xp->_numeric_locale_buf, "LC_NUMERIC",
                LCNUMERIC_SIZE, LCNUMERIC_SIZE,
-               (const char **)&_numeric_locale);
+-              (const char **)&_numeric_locale);
++              (const char **)&xp->_numeric_locale);
        if (ret != _LDP_ERROR)
+-              __nlocale_changed = 1;
++              loc->__nlocale_changed = 1;
++      else
++              free(xp);
+       if (ret == _LDP_LOADED) {
+               /* Can't be empty according to C99 */
+-              if (*_numeric_locale.decimal_point == '\0')
+-                      _numeric_locale.decimal_point =
++              if (*xp->_numeric_locale.decimal_point == '\0')
++                      xp->_numeric_locale.decimal_point =
+                           _C_numeric_locale.decimal_point;
+-              _numeric_locale.grouping =
+-                  __fix_locale_grouping_str(_numeric_locale.grouping);
++              xp->_numeric_locale.grouping =
++                  __fix_locale_grouping_str(xp->_numeric_locale.grouping);
++              XL_RELEASE(loc->__lc_numeric);
++              loc->__lc_numeric = xp;
++              XL_RELEASE(cache);
++              cache = xp;
++              XL_RETAIN(cache);
+       }
+       return (ret);
+ }
+ 
+-struct lc_numeric_T *
+-__get_current_numeric_locale(void)
++__private_extern__ struct lc_numeric_T *
++__get_current_numeric_locale(locale_t loc)
+ {
+-      return (_numeric_using_locale
+-              ? &_numeric_locale
++      return (loc->_numeric_using_locale
++              ? &loc->__lc_numeric->_numeric_locale
+               : (struct lc_numeric_T *)&_C_numeric_locale);
+ }
+ 
+ #ifdef LOCALE_DEBUG
+ void
+ numericdebug(void) {
++locale_t loc = __current_locale();
+ printf(       "decimal_point = %s\n"
+       "thousands_sep = %s\n"
+       "grouping = %s\n",
+-      _numeric_locale.decimal_point,
+-      _numeric_locale.thousands_sep,
+-      _numeric_locale.grouping
++      loc->__lc_numeric->_numeric_locale.decimal_point,
++      loc->__lc_numeric->_numeric_locale.thousands_sep,
++      loc->__lc_numeric->_numeric_locale.grouping
+ );
+ }
+ #endif /* LOCALE_DEBUG */