Print this page
2964 need POSIX 2008 locale object support
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gordon Ross <gordon.ross@nexenta.com>
Approved by: TBD
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/lib/libc/port/locale/gbk.c
+++ new/usr/src/lib/libc/port/locale/gbk.c
1 1 /*
2 + * Copyright 2013 Garrett D'Amore <garrett@damore.org>
2 3 * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
3 4 * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
4 5 * Copyright (c) 1993
5 6 * The Regents of the University of California. All rights reserved.
6 7 *
7 8 * This code is derived from software contributed to Berkeley by
8 9 * Paul Borman at Krystal Technologies.
9 10 *
10 11 * Redistribution and use in source and binary forms, with or without
11 12 * modification, are permitted provided that the following conditions
12 13 * are met:
13 14 * 1. Redistributions of source code must retain the above copyright
14 15 * notice, this list of conditions and the following disclaimer.
15 16 * 2. Redistributions in binary form must reproduce the above copyright
16 17 * notice, this list of conditions and the following disclaimer in the
17 18 * documentation and/or other materials provided with the distribution.
18 19 * 4. Neither the name of the University nor the names of its contributors
19 20 * may be used to endorse or promote products derived from this software
20 21 * without specific prior written permission.
21 22 *
22 23 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
23 24 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24 25 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
25 26 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
26 27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27 28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
↓ open down ↓ |
16 lines elided |
↑ open up ↑ |
28 29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
29 30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
30 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 33 * SUCH DAMAGE.
33 34 */
34 35
35 36 #include "lint.h"
36 37 #include <sys/types.h>
37 38 #include <errno.h>
38 -#include "runetype.h"
39 39 #include <stdlib.h>
40 40 #include <string.h>
41 41 #include <wchar.h>
42 42 #include "mblocal.h"
43 +#include "lctype.h"
43 44
44 45 static size_t _GBK_mbrtowc(wchar_t *_RESTRICT_KYWD,
45 46 const char *_RESTRICT_KYWD,
46 47 size_t, mbstate_t *_RESTRICT_KYWD);
47 48 static int _GBK_mbsinit(const mbstate_t *);
48 49 static size_t _GBK_wcrtomb(char *_RESTRICT_KYWD, wchar_t,
49 50 mbstate_t *_RESTRICT_KYWD);
51 +static size_t _GBK_mbsnrtowcs(wchar_t *_RESTRICT_KYWD,
52 + const char **_RESTRICT_KYWD, size_t, size_t,
53 + mbstate_t *_RESTRICT_KYWD);
54 +static size_t _GBK_wcsnrtombs(char *_RESTRICT_KYWD,
55 + const wchar_t **_RESTRICT_KYWD, size_t, size_t,
56 + mbstate_t *_RESTRICT_KYWD);
50 57
51 58 typedef struct {
52 59 wchar_t ch;
53 60 } _GBKState;
54 61
55 -int
56 -_GBK_init(_RuneLocale *rl)
62 +void
63 +_GBK_init(struct lc_ctype *lct)
57 64 {
58 -
59 - __mbrtowc = _GBK_mbrtowc;
60 - __wcrtomb = _GBK_wcrtomb;
61 - __mbsinit = _GBK_mbsinit;
62 - _CurrentRuneLocale = rl;
63 - __ctype[520] = 2;
64 - charset_is_ascii = 0;
65 - return (0);
65 + lct->lc_mbrtowc = _GBK_mbrtowc;
66 + lct->lc_wcrtomb = _GBK_wcrtomb;
67 + lct->lc_mbsinit = _GBK_mbsinit;
68 + lct->lc_mbsnrtowcs = _GBK_mbsnrtowcs;
69 + lct->lc_wcsnrtombs = _GBK_wcsnrtombs;
70 + lct->lc_max_mblen = 2;
71 + lct->lc_is_ascii = 0;
66 72 }
67 73
68 74 static int
69 75 _GBK_mbsinit(const mbstate_t *ps)
70 76 {
71 77
72 78 return (ps == NULL || ((const _GBKState *)ps)->ch == 0);
73 79 }
74 80
75 81 static int
76 82 _gbk_check(uint_t c)
77 83 {
78 84
79 85 c &= 0xff;
80 86 return ((c >= 0x81 && c <= 0xfe) ? 2 : 1);
81 87 }
82 88
83 89 static size_t
84 90 _GBK_mbrtowc(wchar_t *_RESTRICT_KYWD pwc, const char *_RESTRICT_KYWD s,
85 91 size_t n, mbstate_t *_RESTRICT_KYWD ps)
86 92 {
87 93 _GBKState *gs;
88 94 wchar_t wc;
89 95 size_t len;
90 96
91 97 gs = (_GBKState *)ps;
92 98
93 99 if ((gs->ch & ~0xFF) != 0) {
94 100 /* Bad conversion state. */
95 101 errno = EINVAL;
96 102 return ((size_t)-1);
97 103 }
98 104
99 105 if (s == NULL) {
100 106 s = "";
101 107 n = 1;
102 108 pwc = NULL;
103 109 }
104 110
105 111 if (n == 0)
106 112 /* Incomplete multibyte sequence */
107 113 return ((size_t)-2);
108 114
109 115 if (gs->ch != 0) {
110 116 if (*s == '\0') {
111 117 errno = EILSEQ;
112 118 return ((size_t)-1);
113 119 }
114 120 wc = (gs->ch << 8) | (*s & 0xFF);
115 121 if (pwc != NULL)
116 122 *pwc = wc;
117 123 gs->ch = 0;
118 124 return (1);
119 125 }
120 126
121 127 len = (size_t)_gbk_check(*s);
122 128 wc = *s++ & 0xff;
123 129 if (len == 2) {
124 130 if (n < 2) {
125 131 /* Incomplete multibyte sequence */
126 132 gs->ch = wc;
127 133 return ((size_t)-2);
128 134 }
129 135 if (*s == '\0') {
130 136 errno = EILSEQ;
131 137 return ((size_t)-1);
132 138 }
133 139 wc = (wc << 8) | (*s++ & 0xff);
134 140 if (pwc != NULL)
135 141 *pwc = wc;
136 142 return (2);
137 143 } else {
138 144 if (pwc != NULL)
139 145 *pwc = wc;
140 146 return (wc == L'\0' ? 0 : 1);
141 147 }
142 148 }
143 149
144 150 static size_t
145 151 _GBK_wcrtomb(char *_RESTRICT_KYWD s, wchar_t wc, mbstate_t *_RESTRICT_KYWD ps)
146 152 {
147 153 _GBKState *gs;
148 154
149 155 gs = (_GBKState *)ps;
150 156
151 157 if (gs->ch != 0) {
152 158 errno = EINVAL;
153 159 return ((size_t)-1);
154 160 }
155 161
↓ open down ↓ |
80 lines elided |
↑ open up ↑ |
156 162 if (s == NULL)
157 163 /* Reset to initial shift state (no-op) */
158 164 return (1);
159 165 if (wc & 0x8000) {
160 166 *s++ = (wc >> 8) & 0xff;
161 167 *s = wc & 0xff;
162 168 return (2);
163 169 }
164 170 *s = wc & 0xff;
165 171 return (1);
172 +}
173 +
174 +static size_t
175 +_GBK_mbsnrtowcs(wchar_t *_RESTRICT_KYWD dst, const char **_RESTRICT_KYWD src,
176 + size_t nms, size_t len, mbstate_t *_RESTRICT_KYWD ps)
177 +{
178 + return (__mbsnrtowcs_std(dst, src, nms, len, ps, _GBK_mbrtowc));
179 +}
180 +
181 +static size_t
182 +_GBK_wcsnrtombs(char *_RESTRICT_KYWD dst, const wchar_t **_RESTRICT_KYWD src,
183 + size_t nwc, size_t len, mbstate_t *_RESTRICT_KYWD ps)
184 +{
185 + return (__wcsnrtombs_std(dst, src, nwc, len, ps, _GBK_wcrtomb));
166 186 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX