Deleted Added
sdiff udiff text old ( 122283 ) new ( 128004 )
full compact
mskanji.c (122283) mskanji.c (128004)
1/*
1/*
2 * Copyright (c) 2002, 2003 Tim J. Robbins. All rights reserved.
2 * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
3 *
3 * ja_JP.SJIS locale table for BSD4.4/rune
4 * version 1.0
5 * (C) Sin'ichiro MIYATANI / Phase One, Inc
6 * May 12, 1995
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

--- 19 unchanged lines hidden (view full) ---

30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
32 * SUCH DAMAGE.
33 */
34
35#if defined(LIBC_SCCS) && !defined(lint)
36static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95";
37#endif /* LIBC_SCCS and not lint */
4 * ja_JP.SJIS locale table for BSD4.4/rune
5 * version 1.0
6 * (C) Sin'ichiro MIYATANI / Phase One, Inc
7 * May 12, 1995
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions
11 * are met:

--- 19 unchanged lines hidden (view full) ---

31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 */
35
36#if defined(LIBC_SCCS) && !defined(lint)
37static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95";
38#endif /* LIBC_SCCS and not lint */
38#include <sys/cdefs.h>
39__FBSDID("$FreeBSD: head/lib/libc/locale/mskanji.c 122283 2003-11-08 02:58:37Z tjr $");
39#include <sys/param.h>
40__FBSDID("$FreeBSD: head/lib/libc/locale/mskanji.c 128004 2004-04-07 10:48:19Z tjr $");
40
41
41#include <sys/types.h>
42#include <runetype.h>
43#include <stdlib.h>
42#include <runetype.h>
43#include <stdlib.h>
44#include <string.h>
44#include <wchar.h>
45
46extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
47 size_t, mbstate_t * __restrict);
45#include <wchar.h>
46
47extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
48 size_t, mbstate_t * __restrict);
49extern int (*__mbsinit)(const mbstate_t *);
48extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
49
50int _MSKanji_init(_RuneLocale *);
50extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
51
52int _MSKanji_init(_RuneLocale *);
51size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
53size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
52 mbstate_t * __restrict);
54 mbstate_t * __restrict);
53size_t _MSKanji_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
55int _MSKanji_mbsinit(const mbstate_t *);
56size_t _MSKanji_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
54
57
58typedef struct {
59 int count;
60 u_char bytes[2];
61} _MSKanjiState;
62
55int
56_MSKanji_init(_RuneLocale *rl)
57{
58
59 __mbrtowc = _MSKanji_mbrtowc;
60 __wcrtomb = _MSKanji_wcrtomb;
63int
64_MSKanji_init(_RuneLocale *rl)
65{
66
67 __mbrtowc = _MSKanji_mbrtowc;
68 __wcrtomb = _MSKanji_wcrtomb;
69 __mbsinit = _MSKanji_mbsinit;
61 _CurrentRuneLocale = rl;
62 __mb_cur_max = 2;
63 return (0);
64}
65
70 _CurrentRuneLocale = rl;
71 __mb_cur_max = 2;
72 return (0);
73}
74
75int
76_MSKanji_mbsinit(const mbstate_t *ps)
77{
78
79 return (ps == NULL || ((_MSKanjiState *)ps)->count == 0);
80}
81
66size_t
67_MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
82size_t
83_MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
68 mbstate_t * __restrict ps __unused)
84 mbstate_t * __restrict ps)
69{
85{
86 _MSKanjiState *ms;
70 wchar_t wc;
87 wchar_t wc;
71 int len;
88 int len, ocount;
89 size_t ncopy;
72
90
73 if (s == NULL)
74 /* Reset to initial shift state (no-op) */
75 return (0);
91 ms = (_MSKanjiState *)ps;
92
93 if (s == NULL) {
94 s = "";
95 n = 1;
96 pwc = NULL;
97 }
98
99 ncopy = MIN(MIN(n, MB_CUR_MAX), sizeof(ms->bytes) - ms->count);
100 memcpy(ms->bytes + ms->count, s, ncopy);
101 ocount = ms->count;
102 ms->count += ncopy;
103 s = (char *)ms->bytes;
104 n = ms->count;
105
76 if (n == 0)
77 /* Incomplete multibyte sequence */
78 return ((size_t)-2);
79 len = 1;
80 wc = *s++ & 0xff;
81 if ((wc > 0x80 && wc < 0xa0) || (wc >= 0xe0 && wc < 0xfd)) {
82 if (n < 2)
83 /* Incomplete multibyte sequence */
84 return ((size_t)-2);
85 wc = (wc << 8) | (*s++ & 0xff);
86 len = 2;
87 }
88 if (pwc != NULL)
89 *pwc = wc;
106 if (n == 0)
107 /* Incomplete multibyte sequence */
108 return ((size_t)-2);
109 len = 1;
110 wc = *s++ & 0xff;
111 if ((wc > 0x80 && wc < 0xa0) || (wc >= 0xe0 && wc < 0xfd)) {
112 if (n < 2)
113 /* Incomplete multibyte sequence */
114 return ((size_t)-2);
115 wc = (wc << 8) | (*s++ & 0xff);
116 len = 2;
117 }
118 if (pwc != NULL)
119 *pwc = wc;
90 return (wc == L'\0' ? 0 : len);
120 ms->count = 0;
121 return (wc == L'\0' ? 0 : len - ocount);
91}
92
93size_t
94_MSKanji_wcrtomb(char * __restrict s, wchar_t wc,
95 mbstate_t * __restrict ps __unused)
96{
97 int len, i;
98
99 if (s == NULL)
100 /* Reset to initial shift state (no-op) */
101 return (1);
122}
123
124size_t
125_MSKanji_wcrtomb(char * __restrict s, wchar_t wc,
126 mbstate_t * __restrict ps __unused)
127{
128 int len, i;
129
130 if (s == NULL)
131 /* Reset to initial shift state (no-op) */
132 return (1);
102
103 len = (wc > 0x100) ? 2 : 1;
104 for (i = len; i-- > 0; )
105 *s++ = wc >> (i << 3);
106 return (len);
107}
133 len = (wc > 0x100) ? 2 : 1;
134 for (i = len; i-- > 0; )
135 *s++ = wc >> (i << 3);
136 return (len);
137}