X-Git-Url: https://git.saurik.com/apple/libc.git/blobdiff_plain/3d9156a7a519a5e3aa1b92e9d9d4b991f1aed7ff..7b00c0c43f52e9d27168e67a26aac19065cdb40c:/locale/FreeBSD/setlocale.c.patch

diff --git a/locale/FreeBSD/setlocale.c.patch b/locale/FreeBSD/setlocale.c.patch
index 4d52c4a..b782cac 100644
--- a/locale/FreeBSD/setlocale.c.patch
+++ b/locale/FreeBSD/setlocale.c.patch
@@ -1,15 +1,15 @@
---- setlocale.c.orig	2004-11-25 11:38:19.000000000 -0800
-+++ setlocale.c	2005-02-17 12:42:40.000000000 -0800
-@@ -41,6 +41,8 @@
+--- setlocale.c.orig	2009-11-09 15:05:25.000000000 -0800
++++ setlocale.c	2009-11-09 15:05:26.000000000 -0800
+@@ -37,6 +37,8 @@ static char sccsid[] = "@(#)setlocale.c	
  #include <sys/cdefs.h>
- __FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.50 2004/01/31 19:15:32 ache Exp $");
+ __FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.51 2007/01/09 00:28:00 imp Exp $");
  
 +#include "xlocale_private.h"
 +
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <errno.h>
-@@ -56,7 +58,7 @@
+@@ -52,7 +54,7 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
  #include "lmessages.h"	/* for __messages_load_locale() */
  #include "setlocale.h"
  #include "ldpart.h"
@@ -18,16 +18,118 @@
  
  /*
   * Category names for getenv()
-@@ -99,7 +101,7 @@
+@@ -95,15 +97,18 @@ static char current_locale_string[_LC_LA
  
  static char	*currentlocale(void);
  static char	*loadlocale(int);
 -static const char *__get_locale_env(int);
 +__private_extern__ const char *__get_locale_env(int);
++
++#define	UNLOCK_AND_RETURN(x)	{XL_UNLOCK(&__global_locale); return (x);}
  
  char *
  setlocale(category, locale)
-@@ -237,7 +239,7 @@
+ 	int category;
+ 	const char *locale;
+ {
+-	int i, j, len, saverr;
++	int i, j, len, saverr, save__numeric_fp_cvt;
+         const char *env, *r;
++	locale_t save__lc_numeric_loc;
+ 
+ 	if (category < LC_ALL || category >= _LC_LAST) {
+ 		errno = EINVAL;
+@@ -114,6 +119,7 @@ setlocale(category, locale)
+ 		return (category != LC_ALL ?
+ 		    current_categories[category] : currentlocale());
+ 
++	XL_LOCK(&__global_locale);
+ 	/*
+ 	 * Default to the current locale for everything.
+ 	 */
+@@ -129,7 +135,7 @@ setlocale(category, locale)
+ 				env = __get_locale_env(i);
+ 				if (strlen(env) > ENCODING_LEN) {
+ 					errno = EINVAL;
+-					return (NULL);
++					UNLOCK_AND_RETURN (NULL);
+ 				}
+ 				(void)strcpy(new_categories[i], env);
+ 			}
+@@ -137,21 +143,21 @@ setlocale(category, locale)
+ 			env = __get_locale_env(category);
+ 			if (strlen(env) > ENCODING_LEN) {
+ 				errno = EINVAL;
+-				return (NULL);
++				UNLOCK_AND_RETURN (NULL);
+ 			}
+ 			(void)strcpy(new_categories[category], env);
+ 		}
+ 	} else if (category != LC_ALL) {
+ 		if (strlen(locale) > ENCODING_LEN) {
+ 			errno = EINVAL;
+-			return (NULL);
++			UNLOCK_AND_RETURN (NULL);
+ 		}
+ 		(void)strcpy(new_categories[category], locale);
+ 	} else {
+ 		if ((r = strchr(locale, '/')) == NULL) {
+ 			if (strlen(locale) > ENCODING_LEN) {
+ 				errno = EINVAL;
+-				return (NULL);
++				UNLOCK_AND_RETURN (NULL);
+ 			}
+ 			for (i = 1; i < _LC_LAST; ++i)
+ 				(void)strcpy(new_categories[i], locale);
+@@ -160,14 +166,14 @@ setlocale(category, locale)
+ 				;
+ 			if (!r[1]) {
+ 				errno = EINVAL;
+-				return (NULL);	/* Hmm, just slashes... */
++				UNLOCK_AND_RETURN (NULL);	/* Hmm, just slashes... */
+ 			}
+ 			do {
+ 				if (i == _LC_LAST)
+ 					break;  /* Too many slashes... */
+ 				if ((len = r - locale) > ENCODING_LEN) {
+ 					errno = EINVAL;
+-					return (NULL);
++					UNLOCK_AND_RETURN (NULL);
+ 				}
+ 				(void)strlcpy(new_categories[i], locale,
+ 					      len + 1);
+@@ -187,8 +193,11 @@ setlocale(category, locale)
+ 	}
+ 
+ 	if (category != LC_ALL)
+-		return (loadlocale(category));
++		UNLOCK_AND_RETURN (loadlocale(category));
+ 
++	save__numeric_fp_cvt = __global_locale.__numeric_fp_cvt;
++	save__lc_numeric_loc = __global_locale.__lc_numeric_loc;
++	XL_RETAIN(save__lc_numeric_loc);
+ 	for (i = 1; i < _LC_LAST; ++i) {
+ 		(void)strcpy(saved_categories[i], current_categories[i]);
+ 		if (loadlocale(i) == NULL) {
+@@ -201,11 +210,15 @@ setlocale(category, locale)
+ 					(void)loadlocale(j);
+ 				}
+ 			}
++			__global_locale.__numeric_fp_cvt = save__numeric_fp_cvt;
++			__global_locale.__lc_numeric_loc = save__lc_numeric_loc;
++			XL_RELEASE(save__lc_numeric_loc);
+ 			errno = saverr;
+-			return (NULL);
++			UNLOCK_AND_RETURN (NULL);
+ 		}
+ 	}
+-	return (currentlocale());
++	XL_RELEASE(save__lc_numeric_loc);
++	UNLOCK_AND_RETURN (currentlocale());
+ }
+ 
+ static char *
+@@ -233,7 +246,7 @@ loadlocale(category)
  {
  	char *new = new_categories[category];
  	char *old = current_categories[category];
@@ -36,16 +138,27 @@
  	int saved_errno;
  
  	if ((new[0] == '.' &&
-@@ -280,7 +282,7 @@
+@@ -276,15 +289,26 @@ loadlocale(category)
  	if (strcmp(new, old) == 0)
  		return (old);
  
 -	if (func(new) != _LDP_ERROR) {
 +	if (func(new, &__global_locale) != _LDP_ERROR) {
  		(void)strcpy(old, new);
++		switch (category) {
++		case LC_CTYPE:
++			if (__global_locale.__numeric_fp_cvt == LC_NUMERIC_FP_SAME_LOCALE)
++				__global_locale.__numeric_fp_cvt = LC_NUMERIC_FP_UNINITIALIZED;
++			break;
++		case LC_NUMERIC:
++			__global_locale.__numeric_fp_cvt = LC_NUMERIC_FP_UNINITIALIZED;
++			XL_RELEASE(__global_locale.__lc_numeric_loc);
++			__global_locale.__lc_numeric_loc = NULL;
++			break;
++		}
  		return (old);
  	}
-@@ -288,7 +290,7 @@
+ 
  	return (NULL);
  }
  
@@ -54,7 +167,7 @@
  __get_locale_env(category)
          int category;
  {
-@@ -315,7 +317,7 @@
+@@ -311,7 +335,7 @@ __get_locale_env(category)
  /*
   * Detect locale storage location and store its value to _PathLocale variable
   */