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

Commit2aab1b9

Browse files
committed
>Applied.
Thanks. But patches for src/backend/catalog/Makefile seems missingin the current source tree. Please apply attached patches.It also includes some corrections to src/backend/util/mb/wchar.c.-- Tatsuo Ishii t-ishii@sra.co.jp
1 parent6f36e9f commit2aab1b9

File tree

2 files changed

+27
-21
lines changed

2 files changed

+27
-21
lines changed

‎src/backend/catalog/Makefile

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.12 1998/07/26 04:30:20 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.13 1998/08/25 04:19:14 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -24,28 +24,11 @@ SUBSYS.o: $(OBJS)
2424

2525
GENBKI= ./genbki.sh
2626

27-
ifdefMULTIBYTE
28-
GLOBALBKI_SRCS=$(addprefix ../../include/catalog/, \
29-
pg_database_mb.h pg_variable.h pg_shadow.h \
30-
pg_group.h pg_log.h \
31-
)
32-
else
3327
GLOBALBKI_SRCS=$(addprefix ../../include/catalog/, \
3428
pg_database.h pg_variable.h pg_shadow.h \
3529
pg_group.h pg_log.h \
3630
)
37-
endif
3831

39-
ifdefMULTIBYTE
40-
LOCALBKI_SRCS=$(addprefix ../../include/catalog/, \
41-
pg_proc.h pg_type.h pg_attribute_mb.h pg_class_mb.h \
42-
pg_inherits.h pg_index.h pg_version.h pg_statistic.h \
43-
pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
44-
pg_language.h pg_parg.h \
45-
pg_aggregate.h pg_ipl.h pg_inheritproc.h \
46-
pg_rewrite.h pg_listener.h pg_description.h indexing.h \
47-
)
48-
else
4932
LOCALBKI_SRCS=$(addprefix ../../include/catalog/, \
5033
pg_proc.h pg_type.h pg_attribute.h pg_class.h \
5134
pg_inherits.h pg_index.h pg_version.h pg_statistic.h \
@@ -54,7 +37,7 @@ LOCALBKI_SRCS= $(addprefix ../../include/catalog/, \
5437
pg_aggregate.h pg_ipl.h pg_inheritproc.h \
5538
pg_rewrite.h pg_listener.h pg_description.h indexing.h \
5639
)
57-
endif
40+
5841
global1.bki.source:$(GENBKI)$(GLOBALBKI_SRCS)
5942
sh$(SHOPTS)$(GENBKI)$(BKIOPTS)$(GLOBALBKI_SRCS)>$@2>global1.description
6043

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* conversion functions between pg_wchar and multi-byte streams.
33
* Tatsuo Ishii
4-
* $Id: wchar.c,v 1.2 1998/08/24 01:14:01 momjian Exp $
4+
* $Id: wchar.c,v 1.3 1998/08/25 04:19:16 momjian Exp $
55
*/
66

77
#include"mb/pg_wchar.h"
@@ -13,6 +13,29 @@
1313
* supported in the client, you don't need to define
1414
* mb2wchar_with_len() function (SJIS is the case).
1515
*/
16+
17+
/*
18+
* SQL/ASCII
19+
*/
20+
staticvoidpg_ascii2wchar_with_len
21+
(constunsignedchar*from,pg_wchar*to,intlen)
22+
{
23+
while (*from&&len>0) {
24+
*to++=*from++;
25+
len--;
26+
}
27+
*to=0;
28+
}
29+
30+
staticintpg_ascii_mblen(constunsignedchar*s)
31+
{
32+
return(1);
33+
}
34+
35+
/*
36+
* EUC
37+
*/
38+
1639
staticvoidpg_euc2wchar_with_len
1740
(constunsignedchar*from,pg_wchar*to,intlen)
1841
{
@@ -316,7 +339,7 @@ static int pg_sjis_mblen(const unsigned char *s)
316339
}
317340

318341
pg_wchar_tblpg_wchar_table[]= {
319-
{0,0},
342+
{pg_ascii2wchar_with_len,pg_ascii_mblen},
320343
{pg_eucjp2wchar_with_len,pg_eucjp_mblen},
321344
{pg_euccn2wchar_with_len,pg_euccn_mblen},
322345
{pg_euckr2wchar_with_len,pg_euckr_mblen},

0 commit comments

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