Print this page
2964 need POSIX 2008 locale object support
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/lib/libc/port/locale/localeconv.c
+++ new/usr/src/lib/libc/port/locale/localeconv.c
1 1 /*
2 2 * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
3 3 * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
4 4 * Copyright (c) 1991, 1993
5 5 * The Regents of the University of California. All rights reserved.
6 6 *
7 + * Copyright (c) 2011 The FreeBSD Foundation
8 + * All rights reserved.
9 + * Portions of this software were developed by David Chisnall
10 + * under sponsorship from the FreeBSD Foundation.
11 + *
7 12 * Redistribution and use in source and binary forms, with or without
8 13 * modification, are permitted provided that the following conditions
9 14 * are met:
10 15 * 1. Redistributions of source code must retain the above copyright
11 16 * notice, this list of conditions and the following disclaimer.
12 17 * 2. Redistributions in binary form must reproduce the above copyright
13 18 * notice, this list of conditions and the following disclaimer in the
14 19 * documentation and/or other materials provided with the distribution.
15 20 * 4. Neither the name of the University nor the names of its contributors
16 21 * may be used to endorse or promote products derived from this software
17 22 * without specific prior written permission.
18 23 *
19 24 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
20 25 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21 26 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22 27 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23 28 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 29 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 30 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 34 * SUCH DAMAGE.
30 35 */
31 36
32 37 #ifndef _LCONV_C99
33 38 #define _LCONV_C99 /* so we get all the extensions */
34 39 #endif
35 40
36 41 #include "lint.h"
37 42 #include <locale.h>
38 43 #include "lmonetary.h"
39 44 #include "lnumeric.h"
|
↓ open down ↓ |
23 lines elided |
↑ open up ↑ |
40 45
41 46 /*
42 47 * The localeconv() function constructs a struct lconv from the current
43 48 * monetary and numeric locales.
44 49 *
45 50 * Because localeconv() may be called many times (especially by library
46 51 * routines like printf() & strtod()), the approprate members of the
47 52 * lconv structure are computed only when the monetary or numeric
48 53 * locale has been changed.
49 54 */
50 -int __mlocale_changed = 1;
51 -int __nlocale_changed = 1;
52 55
53 56 /*
54 57 * Return the current locale conversion.
55 58 */
56 59 struct lconv *
57 -localeconv(void)
60 +localeconv_l(locale_t loc)
58 61 {
59 - static struct lconv ret;
62 + FIX_LOCALE(loc);
63 + struct lconv *ret = &loc->lconv;
60 64
61 - if (__mlocale_changed) {
65 + if (loc->monetary_locale_changed) {
62 66 /* LC_MONETARY part */
63 67 struct lc_monetary_T *mptr;
64 68
65 -#define M_ASSIGN_STR(NAME) (ret.NAME = (char *)mptr->NAME)
66 -#define M_ASSIGN_CHAR(NAME) (ret.NAME = mptr->NAME[0])
69 +#define M_ASSIGN_STR(NAME) (ret->NAME = (char *)mptr->NAME)
70 +#define M_ASSIGN_CHAR(NAME) (ret->NAME = mptr->NAME[0])
67 71
68 - mptr = __get_current_monetary_locale();
72 + mptr = __get_current_monetary_locale(loc);
69 73 M_ASSIGN_STR(int_curr_symbol);
70 74 M_ASSIGN_STR(currency_symbol);
71 75 M_ASSIGN_STR(mon_decimal_point);
72 76 M_ASSIGN_STR(mon_thousands_sep);
73 77 M_ASSIGN_STR(mon_grouping);
74 78 M_ASSIGN_STR(positive_sign);
75 79 M_ASSIGN_STR(negative_sign);
76 80 M_ASSIGN_CHAR(int_frac_digits);
77 81 M_ASSIGN_CHAR(frac_digits);
78 82 M_ASSIGN_CHAR(p_cs_precedes);
79 83 M_ASSIGN_CHAR(p_sep_by_space);
|
↓ open down ↓ |
1 lines elided |
↑ open up ↑ |
80 84 M_ASSIGN_CHAR(n_cs_precedes);
81 85 M_ASSIGN_CHAR(n_sep_by_space);
82 86 M_ASSIGN_CHAR(p_sign_posn);
83 87 M_ASSIGN_CHAR(n_sign_posn);
84 88 M_ASSIGN_CHAR(int_p_cs_precedes);
85 89 M_ASSIGN_CHAR(int_n_cs_precedes);
86 90 M_ASSIGN_CHAR(int_p_sep_by_space);
87 91 M_ASSIGN_CHAR(int_n_sep_by_space);
88 92 M_ASSIGN_CHAR(int_p_sign_posn);
89 93 M_ASSIGN_CHAR(int_n_sign_posn);
90 - __mlocale_changed = 0;
94 + loc->monetary_locale_changed = 0;
91 95 }
92 96
93 - if (__nlocale_changed) {
97 + if (loc->numeric_locale_changed) {
94 98 /* LC_NUMERIC part */
95 99 struct lc_numeric_T *nptr;
96 100
97 -#define N_ASSIGN_STR(NAME) (ret.NAME = (char *)nptr->NAME)
101 +#define N_ASSIGN_STR(NAME) (ret->NAME = (char *)nptr->NAME)
98 102
99 - nptr = __get_current_numeric_locale();
103 + nptr = __get_current_numeric_locale(loc);
100 104 N_ASSIGN_STR(decimal_point);
101 105 N_ASSIGN_STR(thousands_sep);
102 106 N_ASSIGN_STR(grouping);
103 - __nlocale_changed = 0;
107 + loc->numeric_locale_changed = 0;
104 108 }
105 109
106 - return (&ret);
110 + return (ret);
111 +}
112 +
113 +struct lconv *
114 +localeconv(void)
115 +{
116 + return (localeconv_l(__get_locale()));
107 117 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX