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

--- setlocale.c.orig	2008-01-24 17:13:46.000000000 -0800
+++ setlocale.c	2008-02-17 13:23:02.000000000 -0800
@@ -41,6 +41,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 $");
 
+#include "xlocale_private.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
@@ -56,7 +58,7 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
 #include "lmessages.h"	/* for __messages_load_locale() */
 #include "setlocale.h"
 #include "ldpart.h"
-#include "../stdtime/timelocal.h" /* for __time_load_locale() */
+#include "timelocal.h" /* for __time_load_locale() */
 
 /*
  * Category names for getenv()
@@ -99,15 +101,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)
 	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;
@@ -118,6 +123,7 @@ setlocale(category, locale)
 		return (category != LC_ALL ?
 		    current_categories[category] : currentlocale());
 
+	XL_LOCK(&__global_locale);
 	/*
 	 * Default to the current locale for everything.
 	 */
@@ -133,7 +139,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);
 			}
@@ -141,21 +147,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);
@@ -164,14 +170,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);
@@ -191,8 +197,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) {
@@ -205,11 +214,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 *
@@ -237,7 +250,7 @@ loadlocale(category)
 {
 	char *new = new_categories[category];
 	char *old = current_categories[category];
-	int (*func)(const char *);
+	int (*func)(const char *, locale_t);
 	int saved_errno;
 
 	if ((new[0] == '.' &&
@@ -280,15 +293,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);
 	}
 
 	return (NULL);
 }
 
-static const char *
+__private_extern__ const char *
 __get_locale_env(category)
         int category;
 {
@@ -315,7 +339,7 @@ __get_locale_env(category)
 /*
  * Detect locale storage location and store its value to _PathLocale variable
  */
-int
+__private_extern__ int
 __detect_path_locale(void)
 {
 	if (_PathLocale == NULL) {
Commit	Line	Data
34e8f829 A	1	--- setlocale.c.orig 2008-01-24 17:13:46.000000000 -0800
	2	+++ setlocale.c 2008-02-17 13:23:02.000000000 -0800
	3	@@ -41,6 +41,8 @@ static char sccsid[] = "@(#)setlocale.c
3d9156a7 A	4	#include <sys/cdefs.h>
	5	__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.50 2004/01/31 19:15:32 ache Exp $");
	6
	7	+#include "xlocale_private.h"
	8	+
	9	#include <sys/types.h>
	10	#include <sys/stat.h>
	11	#include <errno.h>
34e8f829	12	@@ -56,7 +58,7 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/
9385eb3d A	13	#include "lmessages.h" /* for __messages_load_locale() */
	14	#include "setlocale.h"
	15	#include "ldpart.h"
	16	-#include "../stdtime/timelocal.h" /* for __time_load_locale() */
	17	+#include "timelocal.h" /* for __time_load_locale() */
	18
	19	/*
	20	* Category names for getenv()
34e8f829	21	@@ -99,15 +101,18 @@ static char current_locale_string[_LC_LA
3d9156a7 A	22
	23	static char *currentlocale(void);
	24	static char *loadlocale(int);
	25	-static const char *__get_locale_env(int);
	26	+__private_extern__ const char *__get_locale_env(int);
34e8f829 A	27	+
34e8f829 A	28	+#define UNLOCK_AND_RETURN(x) {XL_UNLOCK(&__global_locale); return (x);}
3d9156a7 A	29
	30	char *
	31	setlocale(category, locale)
224c7076 A	32	int category;
	33	const char *locale;
	34	{
	35	- int i, j, len, saverr;
	36	+ int i, j, len, saverr, save__numeric_fp_cvt;
	37	const char env, r;
	38	+ locale_t save__lc_numeric_loc;
	39
	40	if (category < LC_ALL \|\| category >= _LC_LAST) {
	41	errno = EINVAL;
34e8f829 A	42	@@ -118,6 +123,7 @@ setlocale(category, locale)
	43	return (category != LC_ALL ?
	44	current_categories[category] : currentlocale());
	45
	46	+ XL_LOCK(&__global_locale);
	47	/*
	48	* Default to the current locale for everything.
	49	*/
	50	@@ -133,7 +139,7 @@ setlocale(category, locale)
	51	env = __get_locale_env(i);
	52	if (strlen(env) > ENCODING_LEN) {
	53	errno = EINVAL;
	54	- return (NULL);
	55	+ UNLOCK_AND_RETURN (NULL);
	56	}
	57	(void)strcpy(new_categories[i], env);
	58	}
	59	@@ -141,21 +147,21 @@ setlocale(category, locale)
	60	env = __get_locale_env(category);
	61	if (strlen(env) > ENCODING_LEN) {
	62	errno = EINVAL;
	63	- return (NULL);
	64	+ UNLOCK_AND_RETURN (NULL);
	65	}
	66	(void)strcpy(new_categories[category], env);
	67	}
	68	} else if (category != LC_ALL) {
	69	if (strlen(locale) > ENCODING_LEN) {
	70	errno = EINVAL;
	71	- return (NULL);
	72	+ UNLOCK_AND_RETURN (NULL);
	73	}
	74	(void)strcpy(new_categories[category], locale);
	75	} else {
	76	if ((r = strchr(locale, '/')) == NULL) {
	77	if (strlen(locale) > ENCODING_LEN) {
	78	errno = EINVAL;
	79	- return (NULL);
	80	+ UNLOCK_AND_RETURN (NULL);
	81	}
	82	for (i = 1; i < _LC_LAST; ++i)
	83	(void)strcpy(new_categories[i], locale);
	84	@@ -164,14 +170,14 @@ setlocale(category, locale)
	85	;
	86	if (!r[1]) {
	87	errno = EINVAL;
	88	- return (NULL); /* Hmm, just slashes... */
	89	+ UNLOCK_AND_RETURN (NULL); /* Hmm, just slashes... */
	90	}
	91	do {
	92	if (i == _LC_LAST)
	93	break; /* Too many slashes... */
	94	if ((len = r - locale) > ENCODING_LEN) {
	95	errno = EINVAL;
	96	- return (NULL);
	97	+ UNLOCK_AND_RETURN (NULL);
	98	}
	99	(void)strlcpy(new_categories[i], locale,
	100	len + 1);
	101	@@ -191,8 +197,11 @@ setlocale(category, locale)
	102	}
	103
224c7076	104	if (category != LC_ALL)
34e8f829 A	105	- return (loadlocale(category));
34e8f829 A	106	+ UNLOCK_AND_RETURN (loadlocale(category));
224c7076 A	107
	108	+ save__numeric_fp_cvt = __global_locale.__numeric_fp_cvt;
	109	+ save__lc_numeric_loc = __global_locale.__lc_numeric_loc;
	110	+ XL_RETAIN(save__lc_numeric_loc);
	111	for (i = 1; i < _LC_LAST; ++i) {
	112	(void)strcpy(saved_categories[i], current_categories[i]);
	113	if (loadlocale(i) == NULL) {
34e8f829	114	@@ -205,11 +214,15 @@ setlocale(category, locale)
224c7076 A	115	(void)loadlocale(j);
	116	}
	117	}
	118	+ __global_locale.__numeric_fp_cvt = save__numeric_fp_cvt;
	119	+ __global_locale.__lc_numeric_loc = save__lc_numeric_loc;
	120	+ XL_RELEASE(save__lc_numeric_loc);
	121	errno = saverr;
34e8f829 A	122	- return (NULL);
34e8f829 A	123	+ UNLOCK_AND_RETURN (NULL);
224c7076 A	124	}
224c7076 A	125	}
34e8f829	126	- return (currentlocale());
224c7076	127	+ XL_RELEASE(save__lc_numeric_loc);
34e8f829	128	+ UNLOCK_AND_RETURN (currentlocale());
224c7076 A	129	}
224c7076 A	130
34e8f829 A	131	static char *
34e8f829 A	132	@@ -237,7 +250,7 @@ loadlocale(category)
3d9156a7 A	133	{
	134	char *new = new_categories[category];
	135	char *old = current_categories[category];
	136	- int (func)(const char );
	137	+ int (func)(const char , locale_t);
	138	int saved_errno;
	139
	140	if ((new[0] == '.' &&
34e8f829	141	@@ -280,15 +293,26 @@ loadlocale(category)
3d9156a7 A	142	if (strcmp(new, old) == 0)
	143	return (old);
	144
	145	- if (func(new) != _LDP_ERROR) {
	146	+ if (func(new, &__global_locale) != _LDP_ERROR) {
	147	(void)strcpy(old, new);
224c7076 A	148	+ switch (category) {
	149	+ case LC_CTYPE:
	150	+ if (__global_locale.__numeric_fp_cvt == LC_NUMERIC_FP_SAME_LOCALE)
	151	+ __global_locale.__numeric_fp_cvt = LC_NUMERIC_FP_UNINITIALIZED;
	152	+ break;
	153	+ case LC_NUMERIC:
	154	+ __global_locale.__numeric_fp_cvt = LC_NUMERIC_FP_UNINITIALIZED;
	155	+ XL_RELEASE(__global_locale.__lc_numeric_loc);
	156	+ __global_locale.__lc_numeric_loc = NULL;
	157	+ break;
	158	+ }
3d9156a7 A	159	return (old);
3d9156a7 A	160	}
224c7076	161
3d9156a7 A	162	return (NULL);
	163	}
	164
	165	-static const char *
	166	+__private_extern__ const char *
	167	__get_locale_env(category)
	168	int category;
	169	{
34e8f829	170	@@ -315,7 +339,7 @@ __get_locale_env(category)
3d9156a7 A	171	/*
	172	* Detect locale storage location and store its value to _PathLocale variable
	173	*/
	174	-int
	175	+__private_extern__ int
	176	__detect_path_locale(void)
	177	{
	178	if (_PathLocale == NULL) {