Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcfe0179

Browse files
committed
Ok, here is the modified encoding table (column1 is the standard name,
2 is our "official" name, and 3 is alias). If there's no objection, Iwill change them.ASCIISQL_ASCIIUTF-8UNICODEUTF_8MULE-INTERNALMULE_INTERNALISO-8859-1LATIN1ISO_8859_1ISO-8859-2LATIN2ISO_8859_2ISO-8859-3LATIN3ISO_8859_3ISO-8859-4LATIN4ISO_8859_4ISO-8859-5ISO_8859_5ISO-8859-6ISO_8859_6ISO-8859-7ISO_8859_7ISO-8859-8ISO_8859_8ISO-8859-9LATIN5ISO_8859_9ISO-8859-10LATIN6ISO_8859_10ISO-8859-13LATIN7ISO_8859_13ISO-8859-14LATIN8ISO_8859_14ISO-8859-15LATIN9ISO_8859_15ISO-8859-16LATIN10ISO_8859_16
1 parent2bb6b98 commitcfe0179

File tree

5 files changed

+55
-52
lines changed

5 files changed

+55
-52
lines changed

‎configure

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -895,16 +895,16 @@ if test x"${enable_multibyte+set}" = xset; then
895895
enable_multibyte=yes
896896

897897
case$enablevalin
898-
SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT|ISO_8859_5|ISO_8859_6|ISO_8859_7|ISO_8859_8|ISO_8859_10|ISO_8859_13|ISO_8859_14|ISO_8859_15|ISO_8859_16)
898+
SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|LATIN6|LATIN7|LATIN8|LATIN9|LATIN10|KOI8|WIN|ALT|ISO_8859_5|ISO_8859_6|ISO_8859_7|ISO_8859_8)
899899
MULTIBYTE=$enableval;;
900900
*)
901901
{echo"configure: error: argument to --enable-multibyte must be one of:
902902
SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW,
903903
UNICODE, MULE_INTERNAL,
904904
LATIN1, LATIN2, LATIN3, LATIN4, LATIN5,
905+
LATIN6, LATIN7, LATIN8, LATIN9, LATIN10,
905906
KOI8, WIN, ALT,
906-
ISO_8859_6, ISO_8859_7, ISO_8859_8,
907-
ISO_8859_10, ISO_8859_13, ISO_8859_14, ISO_8859_15, ISO_8859_16
907+
ISO_8859_5, ISO_8859_6, ISO_8859_7, ISO_8859_8
908908
Or do not specify an argument to the option to use the default."1>&2;exit 1; };;
909909
esac
910910

@@ -2718,7 +2718,7 @@ echo "using CPPFLAGS=$CPPFLAGS"
27182718
echo"using LDFLAGS=$LDFLAGS"
27192719

27202720

2721-
forac_proginmawkgawk nawk awk
2721+
forac_progin gawk mawk nawk awk
27222722
do
27232723
# Extract the first word of "$ac_prog", so it can be a program name with args.
27242724
set dummy$ac_prog; ac_word=$2
@@ -5542,7 +5542,7 @@ else
55425542
int main() {
55435543
55445544
/* Ultrix mips cc rejects this. */
5545-
typedef int charset[2]; const charset x;
5545+
typedef int charset[2]; const charset x={0,0};
55465546
/* SunOS 4.1.1 cc rejects this. */
55475547
char const *const *ccp;
55485548
char **p;
@@ -5617,7 +5617,7 @@ for ac_kw in inline __inline__ __inline; do
56175617
#include "confdefs.h"
56185618
56195619
int main() {
5620-
}$ac_kw foo() {
5620+
}$ac_kwintfoo() {
56215621
; return 0; }
56225622
EOF
56235623
if { (evalecho configure:5624:\"$ac_compile\")1>&5; (eval$ac_compile)2>&5; };then

‎configure.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,17 @@ PGAC_ARG_OPTARG(enable, multibyte, [ --enable-multibyte enable multibyte c
179179
[MULTIBYTE=SQL_ASCII],
180180
[
181181
case $enableval in
182-
SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|KOI8|WIN|ALT|ISO_8859_5|ISO_8859_6|ISO_8859_7|ISO_8859_8|ISO_8859_10|ISO_8859_13|ISO_8859_14|ISO_8859_15|ISO_8859_16)
182+
SQL_ASCII|EUC_JP|EUC_CN|EUC_KR|EUC_TW|UNICODE|MULE_INTERNAL|LATIN1|LATIN2|LATIN3|LATIN4|LATIN5|LATIN6|LATIN7|LATIN8|LATIN9|LATIN10|KOI8|WIN|ALT|ISO_8859_5|ISO_8859_6|ISO_8859_7|ISO_8859_8)
183183
MULTIBYTE=$enableval;;
184184
*)
185185
AC_MSG_ERROR(
186186
[argument to --enable-multibyte must be one of:
187187
SQL_ASCII, EUC_JP, EUC_CN, EUC_KR, EUC_TW,
188188
UNICODE, MULE_INTERNAL,
189189
LATIN1, LATIN2, LATIN3, LATIN4, LATIN5,
190+
LATIN6, LATIN7, LATIN8, LATIN9, LATIN10,
190191
KOI8, WIN, ALT,
191-
ISO_8859_6, ISO_8859_7, ISO_8859_8,
192-
ISO_8859_10, ISO_8859_13, ISO_8859_14, ISO_8859_15, ISO_8859_16
192+
ISO_8859_5, ISO_8859_6, ISO_8859_7, ISO_8859_8
193193
Or do not specify an argument to the option to use the default.]);;
194194
esac
195195
],

‎src/backend/utils/mb/conv.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* WIN1250 client encoding support contributed by Pavel Behal
77
* SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya
88
*
9-
* $Id: conv.c,v 1.31 2001/10/11 14:20:35 ishii Exp $
9+
* $Id: conv.c,v 1.32 2001/10/16 10:09:17 ishii Exp $
1010
*
1111
*
1212
*/
@@ -1692,18 +1692,19 @@ pg_enconv pg_enconv_tbl[] =
16921692
{PG_LATIN3,latin32mic,mic2latin3,iso8859_3_to_utf,utf_to_iso8859_3},
16931693
{PG_LATIN4,latin42mic,mic2latin4,iso8859_4_to_utf,utf_to_iso8859_4},
16941694
{PG_LATIN5,iso2mic,mic2iso,iso8859_9_to_utf,utf_to_iso8859_9},
1695+
{PG_LATIN6,0,0,iso8859_10_to_utf,utf_to_iso8859_10},
1696+
{PG_LATIN7,0,0,iso8859_13_to_utf,utf_to_iso8859_13},
1697+
{PG_LATIN8,0,0,iso8859_14_to_utf,utf_to_iso8859_14},
1698+
{PG_LATIN9,0,0,iso8859_15_to_utf,utf_to_iso8859_15},
1699+
{PG_LATIN10,0,0,iso8859_16_to_utf,utf_to_iso8859_16},
16951700
{PG_KOI8R,koi8r2mic,mic2koi8r,KOI8R_to_utf,utf_to_KOI8R},
16961701
{PG_WIN1251,win12512mic,mic2win1251,WIN1251_to_utf,utf_to_WIN1251},
16971702
{PG_ALT,alt2mic,mic2alt,ALT_to_utf,utf_to_ALT},
16981703
{PG_ISO_8859_5,0,0,iso8859_5_to_utf,utf_to_iso8859_5},
16991704
{PG_ISO_8859_6,0,0,iso8859_6_to_utf,utf_to_iso8859_6},
17001705
{PG_ISO_8859_7,0,0,iso8859_7_to_utf,utf_to_iso8859_7},
17011706
{PG_ISO_8859_8,0,0,iso8859_8_to_utf,utf_to_iso8859_8},
1702-
{PG_ISO_8859_10,0,0,iso8859_10_to_utf,utf_to_iso8859_10},
1703-
{PG_ISO_8859_13,0,0,iso8859_13_to_utf,utf_to_iso8859_13},
1704-
{PG_ISO_8859_14,0,0,iso8859_14_to_utf,utf_to_iso8859_14},
1705-
{PG_ISO_8859_15,0,0,iso8859_15_to_utf,utf_to_iso8859_15},
1706-
{PG_ISO_8859_16,0,0,iso8859_16_to_utf,utf_to_iso8859_16},
1707+
17071708
{PG_SJIS,sjis2mic,mic2sjis,sjis_to_utf,utf_to_sjis},
17081709
{PG_BIG5,big52mic,mic2big5,big5_to_utf,utf_to_big5},
17091710
{PG_WIN1250,win12502mic,mic2win1250,0,0},
@@ -1725,18 +1726,18 @@ pg_enconv pg_enconv_tbl[] =
17251726
{PG_LATIN3,latin32mic,mic2latin3,0,0},
17261727
{PG_LATIN4,latin42mic,mic2latin4,0,0},
17271728
{PG_LATIN5,iso2mic,mic2iso,0,0},
1729+
{PG_LATIN6,0,0,0,0},
1730+
{PG_LATIN7,0,0,0,0},
1731+
{PG_LATIN8,0,0,0,0},
1732+
{PG_LATIN9,0,0,0,0},
1733+
{PG_LATIN10,0,0,0,0},
17281734
{PG_KOI8R,koi8r2mic,mic2koi8r,0,0},
17291735
{PG_WIN1251,win12512mic,mic2win1251,0,0},
17301736
{PG_ALT,alt2mic,mic2alt,0,0},
17311737
{PG_ISO_8859_5,0,0,0,0},
17321738
{PG_ISO_8859_6,0,0,0,0},
17331739
{PG_ISO_8859_7,0,0,0,0},
17341740
{PG_ISO_8859_8,0,0,0,0},
1735-
{PG_ISO_8859_10,0,0,0,0},
1736-
{PG_ISO_8859_13,0,0,0,0},
1737-
{PG_ISO_8859_14,0,0,0,0},
1738-
{PG_ISO_8859_15,0,0,0,0},
1739-
{PG_ISO_8859_16,0,0,0,0},
17401741
{PG_SJIS,sjis2mic,mic2sjis,0,0},
17411742
{PG_BIG5,big52mic,mic2big5,0,0},
17421743
{PG_WIN1250,win12502mic,mic2win1250,0,0},

‎src/backend/utils/mb/encnames.c

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Encoding names and routines for work with it. All
33
* in this file is shared bedween FE and BE.
44
*
5-
* $Id: encnames.c,v 1.3 2001/10/11 14:20:35 ishii Exp $
5+
* $Id: encnames.c,v 1.4 2001/10/16 10:09:17 ishii Exp $
66
*/
77
#ifdefFRONTEND
88
#include"postgres_fe.h"
@@ -38,16 +38,16 @@ pg_encname pg_encname_tbl[] =
3838
{
3939
{"alt",PG_ALT },/* IBM866 */
4040
{"big5",PG_BIG5 },/* Big5; Chinese for Taiwan Multi-byte set */
41-
{"euccn",PG_EUC_CN },/* EUC-CN;??? */
42-
{"eucjp",PG_EUC_JP },/* EUC-JP; Extended UNIX CodeFixed Width for Japanese, stdandard OSF */
41+
{"euccn",PG_EUC_CN },/* EUC-CN;Extended Unix Code for simplified Chinese */
42+
{"eucjp",PG_EUC_JP },/* EUC-JP; Extended UNIX Codefixed Width for Japanese, stdandard OSF */
4343
{"euckr",PG_EUC_KR },/* EUC-KR; RFC1557,Choi */
44-
{"euctw",PG_EUC_TW },/* EUC-TW;??? */
44+
{"euctw",PG_EUC_TW },/* EUC-TW;Extended Unix Code for traditional Chinese */
4545
{"iso88591",PG_LATIN1 },/* ISO-8859-1; RFC1345,KXS2 */
46-
{"iso885910",PG_ISO_8859_10 },/* ISO-8859-10; RFC1345,KXS2 */
47-
{"iso885913",PG_ISO_8859_13 },/* ISO-8859-13; RFC1345,KXS2 */
48-
{"iso885914",PG_ISO_8859_14 },/* ISO-8859-14; RFC1345,KXS2 */
49-
{"iso885915",PG_ISO_8859_15 },/* ISO-8859-15; RFC1345,KXS2 */
50-
{"iso885916",PG_ISO_8859_16 },/* ISO-8859-15; RFC1345,KXS2 */
46+
{"iso885910",PG_LATIN6 },/* ISO-8859-10; RFC1345,KXS2 */
47+
{"iso885913",PG_LATIN7 },/* ISO-8859-13; RFC1345,KXS2 */
48+
{"iso885914",PG_LATIN8 },/* ISO-8859-14; RFC1345,KXS2 */
49+
{"iso885915",PG_LATIN9 },/* ISO-8859-15; RFC1345,KXS2 */
50+
{"iso885916",PG_LATIN10 },/* ISO-8859-16; RFC1345,KXS2 */
5151
{"iso88592",PG_LATIN2 },/* ISO-8859-2; RFC1345,KXS2 */
5252
{"iso88593",PG_LATIN3 },/* ISO-8859-3; RFC1345,KXS2 */
5353
{"iso88594",PG_LATIN4 },/* ISO-8859-4; RFC1345,KXS2 */
@@ -59,14 +59,15 @@ pg_encname pg_encname_tbl[] =
5959
{"koi8",PG_KOI8R },/* _dirty_ alias for KOI8-R (backward compatibility) */
6060
{"koi8r",PG_KOI8R },/* KOI8-R; RFC1489 */
6161
{"latin1",PG_LATIN1 },/* alias for ISO-8859-1 */
62+
{"latin10",PG_LATIN10},/* alias for ISO-8859-16 */
6263
{"latin2",PG_LATIN2 },/* alias for ISO-8859-2 */
6364
{"latin3",PG_LATIN3 },/* alias for ISO-8859-3 */
6465
{"latin4",PG_LATIN4 },/* alias for ISO-8859-4 */
6566
{"latin5",PG_LATIN5 },/* alias for ISO-8859-9 */
66-
{"latin6",PG_ISO_8859_10},/* alias for ISO-8859-10 */
67-
{"latin7",PG_ISO_8859_13},/* alias for ISO-8859-13 */
68-
{"latin8",PG_ISO_8859_14},/* alias for ISO-8859-14 */
69-
{"latin9",PG_ISO_8859_15},/* alias for ISO-8859-15 */
67+
{"latin6",PG_LATIN6},/* alias for ISO-8859-10 */
68+
{"latin7",PG_LATIN7},/* alias for ISO-8859-13 */
69+
{"latin8",PG_LATIN8},/* alias for ISO-8859-14 */
70+
{"latin9",PG_LATIN9},/* alias for ISO-8859-15 */
7071
{"mskanji",PG_SJIS },/* alias for Shift_JIS */
7172
{"muleinternal",PG_MULE_INTERNAL },
7273
{"shiftjis",PG_SJIS },/* Shift_JIS; JIS X 0202-1991 */
@@ -87,7 +88,8 @@ unsigned int pg_encname_tbl_sz = \
8788
sizeof(pg_encname_tbl) /sizeof(pg_encname_tbl[0])-1;
8889

8990
/* ----------
90-
* WARNING: sorted by pg_enc enum (pg_wchar.h)!
91+
* These are "official" encoding names.
92+
* XXX must be sorted by the same order as pg_enc type (see mb/pg_wchar.h)
9193
* ----------
9294
*/
9395
pg_enc2namepg_enc2name_tbl[]=
@@ -104,18 +106,18 @@ pg_enc2name pg_enc2name_tbl[] =
104106
{"LATIN3",PG_LATIN3 },
105107
{"LATIN4",PG_LATIN4 },
106108
{"LATIN5",PG_LATIN5 },
109+
{"LATIN6",PG_LATIN6 },
110+
{"LATIN7",PG_LATIN7 },
111+
{"LATIN8",PG_LATIN8 },
112+
{"LATIN9",PG_LATIN9 },
113+
{"LATIN10",PG_LATIN10 },
107114
{"KOI8",PG_KOI8R },
108115
{"WIN",PG_WIN1251 },
109116
{"ALT",PG_ALT },
110117
{"ISO_8859_5",PG_ISO_8859_5 },
111118
{"ISO_8859_6",PG_ISO_8859_6 },
112119
{"ISO_8859_7",PG_ISO_8859_7 },
113120
{"ISO_8859_8",PG_ISO_8859_8 },
114-
{"ISO_8859_10",PG_ISO_8859_10 },
115-
{"ISO_8859_13",PG_ISO_8859_13 },
116-
{"ISO_8859_14",PG_ISO_8859_14 },
117-
{"ISO_8859_15",PG_ISO_8859_15 },
118-
{"ISO_8859_16",PG_ISO_8859_16 },
119121
{"SJIS",PG_SJIS },
120122
{"BIG5",PG_BIG5 },
121123
{"WIN1250",PG_WIN1250 }

‎src/include/mb/pg_wchar.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: pg_wchar.h,v 1.33 2001/10/11 14:20:35 ishii Exp $ */
1+
/* $Id: pg_wchar.h,v 1.34 2001/10/16 10:09:17 ishii Exp $ */
22

33
#ifndefPG_WCHAR_H
44
#definePG_WCHAR_H
@@ -141,7 +141,7 @@ typedef unsigned int pg_wchar;
141141
* Encoding numeral identificators
142142
*
143143
* WARNING: the order of this table must be same as order
144-
* in the pg_enconv[] (mb/conv.c) and pg_enc2name[] (mb/names.c) array!
144+
* in the pg_enconv[] (mb/conv.c) and pg_enc2name[] (mb/encnames.c) array!
145145
*
146146
* If you add some encoding don'y forget check
147147
* PG_ENCODING_[BE|FE]_LAST macros.
@@ -157,24 +157,24 @@ typedef enum pg_enc
157157
PG_EUC_TW,/* EUC for Taiwan */
158158
PG_UTF8,/* Unicode UTF-8 */
159159
PG_MULE_INTERNAL,/* Mule internal code */
160-
PG_LATIN1,/* ISO-8859 Latin 1 */
161-
PG_LATIN2,/* ISO-8859 Latin 2 */
162-
PG_LATIN3,/* ISO-8859 Latin 3 */
163-
PG_LATIN4,/* ISO-8859 Latin 4 */
160+
PG_LATIN1,/* ISO-8859-1 Latin 1 */
161+
PG_LATIN2,/* ISO-8859-2 Latin 2 */
162+
PG_LATIN3,/* ISO-8859-3 Latin 3 */
163+
PG_LATIN4,/* ISO-8859-4 Latin 4 */
164164
PG_LATIN5,/* ISO-8859-9 Latin 5 */
165+
PG_LATIN6,/* ISO-8859-10 Latin6 */
166+
PG_LATIN7,/* ISO-8859-13 Latin7 */
167+
PG_LATIN8,/* ISO-8859-14 Latin8 */
168+
PG_LATIN9,/* ISO-8859-15 Latin9 */
169+
PG_LATIN10,/* ISO-8859-16 Latin10 */
165170
PG_KOI8R,/* KOI8-R */
166171
PG_WIN1251,/* windows-1251 (was: WIN) */
167172
PG_ALT,/* (MS-DOS CP866) */
168173
PG_ISO_8859_5,/* ISO-8859-5 */
169174
PG_ISO_8859_6,/* ISO-8859-6 */
170175
PG_ISO_8859_7,/* ISO-8859-7 */
171176
PG_ISO_8859_8,/* ISO-8859-8 */
172-
PG_ISO_8859_10,/* ISO-8859-10 Latin6 */
173-
PG_ISO_8859_13,/* ISO-8859-13 Latin7 */
174-
PG_ISO_8859_14,/* ISO-8859-14 Latin8 */
175-
PG_ISO_8859_15,/* ISO-8859-15 Latin9 */
176-
PG_ISO_8859_16,/* ISO-8859-16 */
177-
177+
178178
/* followings are for client encoding only */
179179
PG_SJIS,/* Shift JIS */
180180
PG_BIG5,/* Big5 */
@@ -184,7 +184,7 @@ typedef enum pg_enc
184184

185185
}pg_enc;
186186

187-
#definePG_ENCODING_BE_LASTPG_ISO_8859_16
187+
#definePG_ENCODING_BE_LASTPG_ISO_8859_8
188188
#definePG_ENCODING_FE_LASTPG_WIN1250
189189

190190

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp