Libc-1082.50.1.tar.gz

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

diff --git a/locale/FreeBSD/setlocale.c b/locale/FreeBSD/setlocale.c
index 9729e54426733f6ed3585645345e581afe9d73ce..c65d189188a08702b9836742446b93eb81fd1e18 100644 (file)
--- a/locale/FreeBSD/setlocale.c
+++ b/locale/FreeBSD/setlocale.c
@@ -59,7 +59,7 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.51 2007/01/09 00:28:00 i
 /*
  * Category names for getenv()
  */
 /*
  * Category names for getenv()
  */

-static char *categories[_LC_LAST] = {
+static const char * const categories[_LC_LAST] = {

     "LC_ALL",
     "LC_COLLATE",
     "LC_CTYPE",
     "LC_ALL",
     "LC_COLLATE",
     "LC_CTYPE",


@@ -93,8 +93,6 @@ char  *_PathLocale;
 static char new_categories[_LC_LAST][ENCODING_LEN + 1];
 static char saved_categories[_LC_LAST][ENCODING_LEN + 1];
 
 static char new_categories[_LC_LAST][ENCODING_LEN + 1];
 static char saved_categories[_LC_LAST][ENCODING_LEN + 1];
 

-static char current_locale_string[_LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1)];
-

 static char    *currentlocale(void);
 static char    *loadlocale(int);
 __private_extern__ const char *__get_locale_env(int);
 static char    *currentlocale(void);
 static char    *loadlocale(int);
 __private_extern__ const char *__get_locale_env(int);


@@ -226,7 +224,17 @@ currentlocale()
 {
        int i;
 
 {
        int i;
 

-       (void)strcpy(current_locale_string, current_categories[1]);
+       size_t bufsiz = _LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1);
+       static char *current_locale_string = NULL;
+       
+       if (current_locale_string == NULL) {
+               current_locale_string = malloc(bufsiz);
+               if (current_locale_string == NULL) {
+                       return NULL;
+               }
+       }
+       
+       (void)strlcpy(current_locale_string, current_categories[1], bufsiz);

 
        for (i = 2; i < _LC_LAST; ++i)
                if (strcmp(current_categories[1], current_categories[i])) {
 
        for (i = 2; i < _LC_LAST; ++i)
                if (strcmp(current_categories[1], current_categories[i])) {