Bug 51504
| Summary: | New file: src/share/mklocale/zh_CN.GBK.src | ||
|---|---|---|---|
| Product: | Base System | Reporter: | statue <statue> |
| Component: | conf | Assignee: | Andrey A. Chernov <ache> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | 4.7-PRERELEASE | ||
| Hardware: | Any | ||
| OS: | Any | ||
|
Description
statue
2003-04-28 19:30:12 UTC
--- zh_CN.GBK.src.orig Tue Apr 29 02:39:53 2003 +++ zh_CN.GBK.src Tue Apr 29 02:35:55 2003 @@ -103,7 +103,10 @@ MAPLOWER < 0xa7a1 - 0xa7c1 : 0xa7d1 > < 0xa7d1 - 0xa7f1 : 0xa7d1 > MAPUPPER < 0xa7a1 - 0xa7c1 : 0xa7a1 > < 0xa7d1 - 0xa7f1 : 0xa7a1 > -SPECIAL 0xa840 - 0xa87e 0xa880 - 0xa895 0xa8a1 - 0xa8c0 +PUNCT 0xa840 - 0xa853 +SPECIAL 0xa854 - 0xa877 /* Box drawings */ +PUNCT 0xa878 - 0xa87e 0xa880 - 0xa895 +SPECIAL 0xa8a1 - 0xa8c0 PHONOGRAM 0xa8c5 - 0xa8e9 /* Pin yin */ TODIGIT < 0xa940 - 0xa948 : 1 > SPECIAL 0xa949 - 0xa95a 0xa95c 0xa960 - 0xa97e 0xa980 - 0xa996 @@ -146,7 +149,7 @@ IDEOGRAM 0xcc40 - 0xcc7e 0xcc80 - 0xccfe IDEOGRAM 0xcd40 - 0xcd7e 0xcd80 - 0xcdfe IDEOGRAM 0xce40 - 0xce7e 0xce80 - 0xcefe -IDEOGRAM 0xcf40 - 0xcf7e 0xcf80 - 0xcfd3 +IDEOGRAM 0xcf40 - 0xcf7e 0xcf80 - 0xcffe IDEOGRAM 0xd040 - 0xd07e 0xd080 - 0xd0fe IDEOGRAM 0xd140 - 0xd17e 0xd180 - 0xd1fe IDEOGRAM 0xd240 - 0xd27e 0xd280 - 0xd2fe On Tue, Apr 29, 2003 at 02:24:46 +0800, Statue wrote: > >Synopsis: New file: src/share/mklocale/zh_CN.GBK.src What GBK encoding is? Could you please point to some standard documents describing it in English? > ENCODING "GBK" Such encoding name is not supported by libc runes code. It means your locale is not ever tested. about GBK: http://www.debian.org/doc/manuals/intro-i18n/ch-codes.en.html#s-othercodes-gbk http://www.iana.org/assignments/charset-reg/GBK http://tru64unix.compaq.co.jp/document/v51b/DOCS/HTML/MAN/MAN5/0176____.HTM I don't know how to test GBK locale, could you help me? thanks. Regards, --- lib/libc/locale/Makefile.inc.orig Wed Apr 30 18:34:26 2003
+++ lib/libc/locale/Makefile.inc Wed Apr 30 18:35:04 2003
@@ -9,7 +9,7 @@
ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mbrune.c \
mskanji.c nl_langinfo.c nomacros.c none.c rune.c \
runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \
- tolower.c toupper.c utf2.c utf8.c
+ tolower.c toupper.c utf2.c utf8.c gbk.c
.if ${LIB} == "c"
MAN+= ctype.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
--- lib/libc/locale/gbk.c.orig Wed Apr 30 18:56:09 2003
+++ lib/libc/locale/gbk.c Wed Apr 30 18:53:19 2003
@@ -0,0 +1,119 @@
+/*-
+ * Copyright (c) 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Paul Borman at Krystal Technologies.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)gbk.c 8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+
+#include <rune.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+rune_t _GBK_sgetrune __P((const char *, size_t, char const **));
+int _GBK_sputrune __P((rune_t, char *, size_t, char **));
+
+int
+_GBK_init(rl)
+ _RuneLocale *rl;
+{
+ rl->sgetrune = _GBK_sgetrune;
+ rl->sputrune = _GBK_sputrune;
+ _CurrentRuneLocale = rl;
+ __mb_cur_max = 2;
+ return (0);
+}
+
+static inline int
+_gbk_check(c)
+ u_int c;
+{
+ c &= 0xff;
+ return ((c >= 0x80 && c <= 0xfe) ? 2 : 1);
+}
+
+rune_t
+_GBK_sgetrune(string, n, result)
+ const char *string;
+ size_t n;
+ char const **result;
+{
+ rune_t rune = 0;
+ int len;
+
+ if (n < 1 || (len = _gbk_check(*string)) > n) {
+ if (result)
+ *result = string;
+ return (_INVALID_RUNE);
+ }
+ while (--len >= 0)
+ rune = (rune << 8) | ((u_int)(*string++) & 0xff);
+ if (result)
+ *result = string;
+ return rune;
+}
+
+int
+_GBK_sputrune(c, string, n, result)
+ rune_t c;
+ char *string, **result;
+ size_t n;
+{
+ if (c & 0x8000) {
+ if (n >= 2) {
+ string[0] = (c >> 8) & 0xff;
+ string[1] = c & 0xff;
+ if (result)
+ *result = string + 2;
+ return (2);
+ }
+ }
+ else {
+ if (n >= 1) {
+ *string = c & 0xff;
+ if (result)
+ *result = string + 1;
+ return (1);
+ }
+ }
+ if (result)
+ *result = string;
+ return (0);
+
+}
--- lib/libc/locale/setrunelocale.c.orig Wed Apr 30 18:35:31 2003
+++ lib/libc/locale/setrunelocale.c Wed Apr 30 18:36:14 2003
@@ -139,6 +139,8 @@
ret = _BIG5_init(rl);
else if (strcmp(rl->encoding, "MSKanji") == 0)
ret = _MSKanji_init(rl);
+ else if (strcmp(rl->encoding, "GBK") == 0)
+ ret = _GBK_init(rl);
else
ret = EFTYPE;
if (ret == 0) {
Responsible Changed From-To: freebsd-bugs->ache Over to locale guru. State Changed From-To: open->patched Committed into -current State Changed From-To: patched->closed RELENG_4 is now out of support, so this PR is obsolete. |
