Loading...
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | --- setrunelocale.c.orig 2008-04-28 16:25:31.000000000 -0700 +++ setrunelocale.c 2008-04-28 17:02:02.000000000 -0700 @@ -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 $"); +#include "xlocale_private.h" + #include <runetype.h> #include <errno.h> #include <limits.h> @@ -49,67 +51,69 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/ #include "mblocal.h" #include "setlocale.h" -extern int _none_init(_RuneLocale *); -extern int _UTF8_init(_RuneLocale *); -extern int _EUC_init(_RuneLocale *); -extern int _GB18030_init(_RuneLocale *); -extern int _GB2312_init(_RuneLocale *); -extern int _GBK_init(_RuneLocale *); -extern int _BIG5_init(_RuneLocale *); -extern int _MSKanji_init(_RuneLocale *); -extern _RuneLocale *_Read_RuneMagi(FILE *); - -static int __setrunelocale(const char *); +extern int _none_init(struct __xlocale_st_runelocale *); +extern int _UTF8_init(struct __xlocale_st_runelocale *); +extern int _EUC_init(struct __xlocale_st_runelocale *); +extern int _GB18030_init(struct __xlocale_st_runelocale *); +extern int _GB2312_init(struct __xlocale_st_runelocale *); +extern int _GBK_init(struct __xlocale_st_runelocale *); +extern int _BIG5_init(struct __xlocale_st_runelocale *); +extern int _MSKanji_init(struct __xlocale_st_runelocale *); +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 *); + +#ifdef LEGACY_RUNE_APIS +/* depreciated interfaces */ +rune_t sgetrune(const char *, size_t, char const **); +int sputrune(rune_t, char *, size_t, char **); +#endif /* LEGACY_RUNE_APIS */ -static int -__setrunelocale(const char *encoding) +__private_extern__ int +__setrunelocale(const char *encoding, locale_t loc) { FILE *fp; char name[PATH_MAX]; + struct __xlocale_st_runelocale *xrl; _RuneLocale *rl; int saverr, ret; - static char ctype_encoding[ENCODING_LEN + 1]; - static _RuneLocale *CachedRuneLocale; - static int Cached__mb_cur_max; - static size_t (*Cached__mbrtowc)(wchar_t * __restrict, - const char * __restrict, size_t, mbstate_t * __restrict); - static size_t (*Cached__wcrtomb)(char * __restrict, wchar_t, - mbstate_t * __restrict); - static int (*Cached__mbsinit)(const mbstate_t *); - static size_t (*Cached__mbsnrtowcs)(wchar_t * __restrict, - const char ** __restrict, size_t, size_t, mbstate_t * __restrict); - static size_t (*Cached__wcsnrtombs)(char * __restrict, - const wchar_t ** __restrict, size_t, size_t, - 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. */ if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) { - _CurrentRuneLocale = &_DefaultRuneLocale; - __mb_cur_max = 1; - __mbrtowc = _none_mbrtowc; - __mbsinit = _none_mbsinit; - __mbsnrtowcs = _none_mbsnrtowcs; - __wcrtomb = _none_wcrtomb; - __wcsnrtombs = _none_wcsnrtombs; + XL_RELEASE(loc->__lc_ctype); + loc->__lc_ctype = &_DefaultRuneXLocale; + /* no need to retain _DefaultRuneXLocale */ + if (loc == &__global_locale) { + _CurrentRuneLocale = &loc->__lc_ctype->_CurrentRuneLocale; + __mb_cur_max = loc->__lc_ctype->__mb_cur_max; + } return (0); } /* * 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; - __mb_cur_max = Cached__mb_cur_max; - __mbrtowc = Cached__mbrtowc; - __mbsinit = Cached__mbsinit; - __mbsnrtowcs = Cached__mbsnrtowcs; - __wcrtomb = Cached__wcrtomb; - __wcsnrtombs = Cached__wcsnrtombs; + strcmp(encoding, CachedRuneLocale->__ctype_encoding) == 0) { + XL_RELEASE(loc->__lc_ctype); + loc->__lc_ctype = CachedRuneLocale; + XL_RETAIN(loc->__lc_ctype); + if (loc == &__global_locale) { + _CurrentRuneLocale = &loc->__lc_ctype->_CurrentRuneLocale; + __mb_cur_max = loc->__lc_ctype->__mb_cur_max; + } + spin_unlock(&cache_lock); return (0); } + spin_unlock(&cache_lock); /* * Slurp the locale file into the cache. @@ -124,63 +128,81 @@ __setrunelocale(const char *encoding) if ((fp = fopen(name, "r")) == NULL) return (errno == 0 ? ENOENT : errno); - if ((rl = _Read_RuneMagi(fp)) == NULL) { + if ((xrl = _Read_RuneMagi(fp)) == NULL) { saverr = (errno == 0 ? EFTYPE : errno); (void)fclose(fp); return (saverr); } (void)fclose(fp); - __mbrtowc = NULL; - __mbsinit = NULL; - __mbsnrtowcs = __mbsnrtowcs_std; - __wcrtomb = NULL; - __wcsnrtombs = __wcsnrtombs_std; + xrl->__mbrtowc = NULL; + xrl->__mbsinit = NULL; + xrl->__mbsnrtowcs = __mbsnrtowcs_std; + xrl->__wcrtomb = NULL; + xrl->__wcsnrtombs = __wcsnrtombs_std; + + rl = &xrl->_CurrentRuneLocale; + +#ifdef LEGACY_RUNE_APIS + /* provide backwards compatibility (depreciated interface) */ + rl->__sputrune = sputrune; + rl->__sgetrune = sgetrune; +#else /* LEGACY_RUNE_APIS */ rl->__sputrune = NULL; rl->__sgetrune = NULL; +#endif /* LEGACY_RUNE_APIS */ + if (strcmp(rl->__encoding, "NONE") == 0) - ret = _none_init(rl); + ret = _none_init(xrl); else if (strcmp(rl->__encoding, "UTF-8") == 0) - ret = _UTF8_init(rl); + ret = _UTF8_init(xrl); else if (strcmp(rl->__encoding, "EUC") == 0) - ret = _EUC_init(rl); + ret = _EUC_init(xrl); else if (strcmp(rl->__encoding, "GB18030") == 0) - ret = _GB18030_init(rl); + ret = _GB18030_init(xrl); else if (strcmp(rl->__encoding, "GB2312") == 0) - ret = _GB2312_init(rl); + ret = _GB2312_init(xrl); else if (strcmp(rl->__encoding, "GBK") == 0) - ret = _GBK_init(rl); + ret = _GBK_init(xrl); else if (strcmp(rl->__encoding, "BIG5") == 0) - ret = _BIG5_init(rl); + ret = _BIG5_init(xrl); else if (strcmp(rl->__encoding, "MSKanji") == 0) - ret = _MSKanji_init(rl); + ret = _MSKanji_init(xrl); + else if (strcmp(rl->__encoding, "UTF2") == 0) + ret = _UTF2_init(xrl); else ret = EFTYPE; if (ret == 0) { - if (CachedRuneLocale != NULL) { - /* See euc.c */ - if (strcmp(CachedRuneLocale->__encoding, "EUC") == 0) - free(CachedRuneLocale->__variable); - free(CachedRuneLocale); + (void)strcpy(xrl->__ctype_encoding, encoding); + XL_RELEASE(loc->__lc_ctype); + loc->__lc_ctype = xrl; + if (loc == &__global_locale) { + _CurrentRuneLocale = &loc->__lc_ctype->_CurrentRuneLocale; + __mb_cur_max = loc->__lc_ctype->__mb_cur_max; } - CachedRuneLocale = _CurrentRuneLocale; - Cached__mb_cur_max = __mb_cur_max; - Cached__mbrtowc = __mbrtowc; - Cached__mbsinit = __mbsinit; - Cached__mbsnrtowcs = __mbsnrtowcs; - 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); return (ret); } +#ifdef LEGACY_RUNE_APIS int -__wrap_setrunelocale(const char *locale) +setrunelocale(const char *encoding) +{ + return __setrunelocale(encoding, &__global_locale); +} +#endif /* LEGACY_RUNE_APIS */ + +__private_extern__ int +__wrap_setrunelocale(const char *locale, locale_t loc) { - int ret = __setrunelocale(locale); + int ret = __setrunelocale(locale, loc); if (ret != 0) { errno = ret; |