Libc-498.tar.gz

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

diff --git a/locale/FreeBSD/setrunelocale.c.patch b/locale/FreeBSD/setrunelocale.c.patch
index b4ddcdba6027435981f4e036edbea25c8081f1bf..3638b2a1037f9787c1d5150c9ffef82f80220ae6 100644 (file)
--- a/locale/FreeBSD/setrunelocale.c.patch
+++ b/locale/FreeBSD/setrunelocale.c.patch
@@ -1,5 +1,5 @@
---- setrunelocale.c.orig       2004-11-25 11:38:19.000000000 -0800
-+++ setrunelocale.c    2005-02-17 10:00:02.000000000 -0800
+--- setrunelocale.c.orig       2007-02-13 00:16:13.000000000 -0800
++++ setrunelocale.c    2007-02-13 00:22:39.000000000 -0800
 @@ -37,6 +37,8 @@
  #include <sys/cdefs.h>
  __FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.44 2004/10/18 02:06:18 ache Exp $");
@@ -9,7 +9,7 @@
  #include <runetype.h>
  #include <errno.h>
  #include <limits.h>
-@@ -49,50 +51,43 @@
+@@ -49,67 +51,67 @@
  #include "mblocal.h"
  #include "setlocale.h"
  
@@ -35,6 +35,9 @@
 +extern int            _UTF2_init(struct __xlocale_st_runelocale *);   /* deprecated */
 +extern struct __xlocale_st_runelocale *_Read_RuneMagi(FILE *);
 +
++extern void spin_lock(int *);
++extern void spin_unlock(int *);
++
 +/* depreciated interfaces */
 +rune_t        sgetrune(const char *, size_t, char const **);
 +int   sputrune(rune_t, char *, size_t, char **);
@@ -64,6 +67,7 @@
 -          mbstate_t * __restrict);
 +      static struct __xlocale_st_runelocale *CachedRuneLocale;
 +      extern int __mb_cur_max;
++      static int cache_lock = 0;
  
        /*
         * The "C" and "POSIX" locale are always here.
@@ -86,9 +90,10 @@
                return (0);
        }
  
-@@ -100,14 +95,14 @@
+       /*
         * If the locale name is the same as our cache, use the cache.
         */
++      spin_lock(&cache_lock);
        if (CachedRuneLocale != NULL &&
 -          strcmp(encoding, ctype_encoding) == 0) {
 -              _CurrentRuneLocale = CachedRuneLocale;
@@ -106,10 +111,14 @@
 +                      _CurrentRuneLocale = &loc->__lc_ctype->_CurrentRuneLocale;
 +                      __mb_cur_max = loc->__lc_ctype->__mb_cur_max;
 +              }
++              spin_unlock(&cache_lock);
                return (0);
        }
++      spin_unlock(&cache_lock);
  
-@@ -124,63 +119,72 @@
+       /*
+        * Slurp the locale file into the cache.
+@@ -124,63 +126,74 @@
        if ((fp = fopen(name, "r")) == NULL)
                return (errno == 0 ? ENOENT : errno);
  
@@ -189,9 +198,11 @@
 -              Cached__wcrtomb = __wcrtomb;
 -              Cached__wcsnrtombs = __wcsnrtombs;
 -              (void)strcpy(ctype_encoding, encoding);
++              spin_lock(&cache_lock);
 +              XL_RELEASE(CachedRuneLocale);
 +              CachedRuneLocale = xrl;
 +              XL_RETAIN(CachedRuneLocale);
++              spin_unlock(&cache_lock);
        } else
 -              free(rl);
 +              XL_RELEASE(xrl);