open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove #ifdef MULTIBYTE per hackers list discussion.

Browse Source
REL7_3_STABLE
Tatsuo Ishii 23 years ago
parent 8e80dbb849
commit ed7baeaf4d
31 changed files with 81 additions and 761 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 36
      src/backend/commands/copy.c
  2. 8
      src/backend/commands/dbcommands.c
  3. 6
      src/backend/parser/analyze.c
  4. 15
      src/backend/parser/scan.l
  5. 9
      src/backend/postmaster/pgstat.c
  6. 17
      src/backend/regex/engine.c
  7. 114
      src/backend/regex/regcomp.c
  8. 5
      src/backend/regex/regerror.c
  9. 11
      src/backend/regex/regexec.c
  10. 3
      src/backend/regex/regfree.c
  11. 6
      src/backend/tcop/postgres.c
  12. 44
      src/backend/utils/adt/ascii.c
  13. 9
      src/backend/utils/adt/format_type.c
  14. 44
      src/backend/utils/adt/like.c
  15. 166
      src/backend/utils/adt/oracle_compat.c
  16. 100
      src/backend/utils/adt/quote.c
  17. 6
      src/backend/utils/adt/selfuncs.c
  18. 80
      src/backend/utils/adt/varchar.c
  19. 10
      src/backend/utils/adt/varlena.c
  20. 8
      src/backend/utils/error/elog.c
  21. 9
      src/backend/utils/init/postinit.c
  22. 33
      src/backend/utils/mb/mbutils.c
  23. 3
      src/include/regex/regex.h
  24. 23
      src/include/regex/regex2.h
  25. 4
      src/include/regex/utils.h
  26. 5
      src/include/utils/ascii.h
  27. 6
      src/include/utils/builtins.h
  28. 25
      src/interfaces/libpq/fe-connect.c
  29. 23
      src/interfaces/libpq/fe-misc.c
  30. 6
      src/interfaces/libpq/fe-print.c
  31. 8
      src/pl/plpgsql/src/pl_funcs.c

36
src/backend/commands/copy.c
Unescape View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.168 2002/08/29 00:17:03 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.169 2002/08/29 07:22:21 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -39,10 +39,7 @@
#include "utils/relcache.h" #include "utils/relcache.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#define ISOCTAL(c) (((c) >= '0') && ((c) <= '7')) #define ISOCTAL(c) (((c) >= '0') && ((c) <= '7'))
#define OCTVALUE(c) ((c) - '0') #define OCTVALUE(c) ((c) - '0')
@ -85,11 +82,8 @@ static bool fe_eof;
*/ */
static StringInfoData attribute_buf; static StringInfoData attribute_buf;
#ifdef MULTIBYTE
static int client_encoding; static int client_encoding;
static int server_encoding; static int server_encoding;
#endif
/* /*
* Internal communications functions * Internal communications functions
@ -387,10 +381,9 @@ DoCopy(const CopyStmt *stmt)
* Set up variables to avoid per-attribute overhead. * Set up variables to avoid per-attribute overhead.
*/ */
initStringInfo(&attribute_buf); initStringInfo(&attribute_buf);
#ifdef MULTIBYTE
client_encoding = pg_get_client_encoding(); client_encoding = pg_get_client_encoding();
server_encoding = GetDatabaseEncoding(); server_encoding = GetDatabaseEncoding();
#endif
if (is_from) if (is_from)
{ /* copy from file to database */ { /* copy from file to database */
@ -1231,14 +1224,12 @@ CopyReadAttribute(FILE *fp, const char *delim, CopyReadResult *result)
{ {
int c; int c;
int delimc = (unsigned char) delim[0]; int delimc = (unsigned char) delim[0];
#ifdef MULTIBYTE
int mblen; int mblen;
unsigned char s[2]; unsigned char s[2];
char *cvt; char *cvt;
int j; int j;
s[1] = 0; s[1] = 0;
#endif
/* reset attribute_buf to empty */ /* reset attribute_buf to empty */
attribute_buf.len = 0; attribute_buf.len = 0;
@ -1354,7 +1345,7 @@ CopyReadAttribute(FILE *fp, const char *delim, CopyReadResult *result)
} }
} }
appendStringInfoCharMacro(&attribute_buf, c); appendStringInfoCharMacro(&attribute_buf, c);
#ifdef MULTIBYTE
/* XXX shouldn't this be done even when encoding is the same? */ /* XXX shouldn't this be done even when encoding is the same? */
if (client_encoding != server_encoding) if (client_encoding != server_encoding)
{ {
@ -1372,12 +1363,10 @@ CopyReadAttribute(FILE *fp, const char *delim, CopyReadResult *result)
appendStringInfoCharMacro(&attribute_buf, c); appendStringInfoCharMacro(&attribute_buf, c);
} }
} }
#endif
} }
copy_eof: copy_eof:
#ifdef MULTIBYTE
if (client_encoding != server_encoding) if (client_encoding != server_encoding)
{ {
cvt = (char *) pg_client_to_server((unsigned char *) attribute_buf.data, cvt = (char *) pg_client_to_server((unsigned char *) attribute_buf.data,
@ -1391,7 +1380,6 @@ copy_eof:
pfree(cvt); pfree(cvt);
} }
} }
#endif
return attribute_buf.data; return attribute_buf.data;
} }
@ -1403,14 +1391,11 @@ CopyAttributeOut(FILE *fp, char *server_string, char *delim)
char c; char c;
char delimc = delim[0]; char delimc = delim[0];
#ifdef MULTIBYTE
bool same_encoding; bool same_encoding;
char *string_start; char *string_start;
int mblen; int mblen;
int i; int i;
#endif
#ifdef MULTIBYTE
same_encoding = (server_encoding == client_encoding); same_encoding = (server_encoding == client_encoding);
if (!same_encoding) if (!same_encoding)
{ {
@ -1423,19 +1408,11 @@ CopyAttributeOut(FILE *fp, char *server_string, char *delim)
string = server_string; string = server_string;
string_start = NULL; string_start = NULL;
} }
#else
string = server_string;
#endif
#ifdef MULTIBYTE
for (; (c = *string) != '\0'; string += mblen) for (; (c = *string) != '\0'; string += mblen)
#else
for (; (c = *string) != '\0'; string++)
#endif
{ {
#ifdef MULTIBYTE
mblen = 1; mblen = 1;
#endif
switch (c) switch (c)
{ {
case '\b': case '\b':
@ -1463,7 +1440,7 @@ CopyAttributeOut(FILE *fp, char *server_string, char *delim)
if (c == delimc) if (c == delimc)
CopySendChar('\\', fp); CopySendChar('\\', fp);
CopySendChar(c, fp); CopySendChar(c, fp);
#ifdef MULTIBYTE
/* XXX shouldn't this be done even when encoding is same? */ /* XXX shouldn't this be done even when encoding is same? */
if (!same_encoding) if (!same_encoding)
{ {
@ -1472,15 +1449,12 @@ CopyAttributeOut(FILE *fp, char *server_string, char *delim)
for (i = 1; i < mblen; i++) for (i = 1; i < mblen; i++)
CopySendChar(string[i], fp); CopySendChar(string[i], fp);
} }
#endif
break; break;
} }
} }
#ifdef MULTIBYTE
if (string_start) if (string_start)
pfree(string_start); /* pfree pg_server_to_client result */ pfree(string_start); /* pfree pg_server_to_client result */
#endif
} }
/* /*

8
src/backend/commands/dbcommands.c
Unescape View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.99 2002/08/09 16:45:14 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.100 2002/08/29 07:22:21 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -39,9 +39,7 @@
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" /* encoding check */ #include "mb/pg_wchar.h" /* encoding check */
#endif
/* non-export function prototypes */ /* non-export function prototypes */
@ -214,13 +212,9 @@ createdb(const CreatedbStmt *stmt)
if (encoding < 0) if (encoding < 0)
encoding = src_encoding; encoding = src_encoding;
#ifdef MULTIBYTE
/* Some encodings are client only */ /* Some encodings are client only */
if (!PG_VALID_BE_ENCODING(encoding)) if (!PG_VALID_BE_ENCODING(encoding))
elog(ERROR, "CREATE DATABASE: invalid backend encoding"); elog(ERROR, "CREATE DATABASE: invalid backend encoding");
#else
Assert(encoding == 0); /* zero is PG_SQL_ASCII */
#endif
/* /*
* Preassign OID for pg_database tuple, so that we can compute db * Preassign OID for pg_database tuple, so that we can compute db

6
src/backend/parser/analyze.c
Unescape View File

@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.245 2002/08/28 20:46:23 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.246 2002/08/29 07:22:22 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -42,9 +42,7 @@
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/relcache.h" #include "utils/relcache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
/* State shared by transformCreateSchemaStmt and its subroutines */ /* State shared by transformCreateSchemaStmt and its subroutines */
@ -634,12 +632,10 @@ makeObjectName(char *name1, char *name2, char *typename)
name2chars--; name2chars--;
} }
#ifdef MULTIBYTE
if (name1) if (name1)
name1chars = pg_mbcliplen(name1, name1chars, name1chars); name1chars = pg_mbcliplen(name1, name1chars, name1chars);
if (name2) if (name2)
name2chars = pg_mbcliplen(name2, name2chars, name2chars); name2chars = pg_mbcliplen(name2, name2chars, name2chars);
#endif
/* Now construct the string using the chosen lengths */ /* Now construct the string using the chosen lengths */
name = palloc(name1chars + name2chars + overhead + 1); name = palloc(name1chars + name2chars + overhead + 1);

15
src/backend/parser/scan.l
Unescape View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.100 2002/08/18 03:35:08 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.101 2002/08/29 07:22:23 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -26,10 +26,7 @@
#include "parser/keywords.h" #include "parser/keywords.h"
#include "parser/parse.h" #include "parser/parse.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
/* No reason to constrain amount of data slurped */ /* No reason to constrain amount of data slurped */
#define YY_READ_BUF_SIZE 16777216 #define YY_READ_BUF_SIZE 16777216
@ -402,12 +399,9 @@ other .
if (literallen >= NAMEDATALEN) if (literallen >= NAMEDATALEN)
{ {
int len; int len;
#ifdef MULTIBYTE
len = pg_mbcliplen(literalbuf, literallen, len = pg_mbcliplen(literalbuf, literallen,
NAMEDATALEN-1); NAMEDATALEN-1);
#else
len = NAMEDATALEN-1;
#endif
elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"", elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"",
literalbuf, len, literalbuf); literalbuf, len, literalbuf);
literalbuf[len] = '\0'; literalbuf[len] = '\0';
@ -562,11 +556,8 @@ other .
if (i >= NAMEDATALEN) if (i >= NAMEDATALEN)
{ {
int len; int len;
#ifdef MULTIBYTE
len = pg_mbcliplen(ident, i, NAMEDATALEN-1); len = pg_mbcliplen(ident, i, NAMEDATALEN-1);
#else
len = NAMEDATALEN-1;
#endif
elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"", elog(NOTICE, "identifier \"%s\" will be truncated to \"%.*s\"",
ident, len, ident); ident, len, ident);
ident[len] = '\0'; ident[len] = '\0';

9
src/backend/postmaster/pgstat.c
Unescape View File

@ -16,7 +16,7 @@
* *
* Copyright (c) 2001, PostgreSQL Global Development Group * Copyright (c) 2001, PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.23 2002/08/04 05:09:36 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/pgstat.c,v 1.24 2002/08/29 07:22:23 ishii Exp $
* ---------- * ----------
*/ */
#include "postgres.h" #include "postgres.h"
@ -38,9 +38,7 @@
#include "catalog/pg_shadow.h" #include "catalog/pg_shadow.h"
#include "catalog/pg_database.h" #include "catalog/pg_database.h"
#include "libpq/pqsignal.h" #include "libpq/pqsignal.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#include "storage/backendid.h" #include "storage/backendid.h"
@ -434,12 +432,7 @@ pgstat_report_activity(char *what)
return; return;
len = strlen(what); len = strlen(what);
#ifdef MULTIBYTE
len = pg_mbcliplen((const unsigned char *)what, len, PGSTAT_ACTIVITY_SIZE - 1); len = pg_mbcliplen((const unsigned char *)what, len, PGSTAT_ACTIVITY_SIZE - 1);
#else
if (len >= PGSTAT_ACTIVITY_SIZE)
len = PGSTAT_ACTIVITY_SIZE - 1;
#endif
memcpy(msg.m_what, what, len); memcpy(msg.m_what, what, len);
msg.m_what[len] = '\0'; msg.m_what[len] = '\0';

17
src/backend/regex/engine.c
Unescape View File

@ -108,13 +108,8 @@ static states step(struct re_guts * g, sopno start,
#define EOW (BOL+5) #define EOW (BOL+5)
#define CODEMAX (BOL+5) /* highest code used */ #define CODEMAX (BOL+5) /* highest code used */
#ifdef MULTIBYTE
#define NONCHAR(c) ((c) > 16777216) /* 16777216 == 2^24 == 3 bytes */ #define NONCHAR(c) ((c) > 16777216) /* 16777216 == 2^24 == 3 bytes */
#define NNONCHAR (CODEMAX-16777216) #define NNONCHAR (CODEMAX-16777216)
#else
#define NONCHAR(c) ((c) > CHAR_MAX)
#define NNONCHAR (CODEMAX-CHAR_MAX)
#endif
#ifdef REDEBUG #ifdef REDEBUG
static void print(struct match * m, pg_wchar *caption, states st, int ch, static void print(struct match * m, pg_wchar *caption, states st, int ch,
@ -168,11 +163,7 @@ matcher(struct re_guts * g, pg_wchar *string, size_t nmatch,
else else
{ {
start = string; start = string;
#ifdef MULTIBYTE
stop = start + pg_wchar_strlen(start); stop = start + pg_wchar_strlen(start);
#else
stop = start + strlen(start);
#endif
} }
if (stop < start) if (stop < start)
return REG_INVARG; return REG_INVARG;
@ -182,11 +173,7 @@ matcher(struct re_guts * g, pg_wchar *string, size_t nmatch,
{ {
for (dp = start; dp < stop; dp++) for (dp = start; dp < stop; dp++)
if (*dp == g->must[0] && stop - dp >= g->mlen && if (*dp == g->must[0] && stop - dp >= g->mlen &&
#ifdef MULTIBYTE
memcmp(dp, g->must, (size_t) (g->mlen * sizeof(pg_wchar))) == 0 memcmp(dp, g->must, (size_t) (g->mlen * sizeof(pg_wchar))) == 0
#else
memcmp(dp, g->must, (size_t) g->mlen) == 0
#endif
) )
break; break;
if (dp == stop) /* we didn't find g->must */ if (dp == stop) /* we didn't find g->must */
@ -1090,11 +1077,7 @@ pchar(int ch)
static int static int
pg_isprint(int c) pg_isprint(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && isprint((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && isprint((unsigned char) c));
#else
return (isprint((unsigned char) c));
#endif
} }
#endif #endif
#endif #endif

114
src/backend/regex/regcomp.c
Unescape View File

@ -91,13 +91,7 @@ static void p_b_cclass(struct parse * p, cset *cs);
static void p_b_eclass(struct parse * p, cset *cs); static void p_b_eclass(struct parse * p, cset *cs);
static pg_wchar p_b_symbol(struct parse * p); static pg_wchar p_b_symbol(struct parse * p);
static char p_b_coll_elem(struct parse * p, int endc); static char p_b_coll_elem(struct parse * p, int endc);
#ifdef MULTIBYTE
static unsigned char othercase(int ch); static unsigned char othercase(int ch);
#else
static char othercase(int ch);
#endif
static void bothcases(struct parse * p, int ch); static void bothcases(struct parse * p, int ch);
static void ordinary(struct parse * p, int ch); static void ordinary(struct parse * p, int ch);
static void nonnewline(struct parse * p); static void nonnewline(struct parse * p);
@ -184,10 +178,7 @@ pg_regcomp(regex_t *preg, const char *pattern, int cflags)
struct parse *p = &pa; struct parse *p = &pa;
int i; int i;
size_t len; size_t len;
#ifdef MULTIBYTE
pg_wchar *wcp; pg_wchar *wcp;
#endif
if ( cclasses == NULL ) if ( cclasses == NULL )
cclasses = cclass_init(); cclasses = cclass_init();
@ -204,29 +195,19 @@ pg_regcomp(regex_t *preg, const char *pattern, int cflags)
if (cflags & REG_PEND) if (cflags & REG_PEND)
{ {
#ifdef MULTIBYTE
wcp = preg->patsave; wcp = preg->patsave;
if (preg->re_endp < wcp) if (preg->re_endp < wcp)
return REG_INVARG; return REG_INVARG;
len = preg->re_endp - wcp; len = preg->re_endp - wcp;
#else
if (preg->re_endp < pattern)
return REG_INVARG;
len = preg->re_endp - pattern;
#endif
} }
else else
{ {
#ifdef MULTIBYTE
wcp = (pg_wchar *) malloc((strlen(pattern) + 1) * sizeof(pg_wchar)); wcp = (pg_wchar *) malloc((strlen(pattern) + 1) * sizeof(pg_wchar));
if (wcp == NULL) if (wcp == NULL)
return REG_ESPACE; return REG_ESPACE;
preg->patsave = wcp; preg->patsave = wcp;
(void) pg_mb2wchar((unsigned char *) pattern, wcp); (void) pg_mb2wchar((unsigned char *) pattern, wcp);
len = pg_wchar_strlen(wcp); len = pg_wchar_strlen(wcp);
#else
len = strlen((char *) pattern);
#endif
} }
/* do the mallocs early so failure handling is easy */ /* do the mallocs early so failure handling is easy */
@ -246,12 +227,7 @@ pg_regcomp(regex_t *preg, const char *pattern, int cflags)
/* set things up */ /* set things up */
p->g = g; p->g = g;
#ifdef MULTIBYTE
p->next = wcp; p->next = wcp;
#else
p->next = (pg_wchar *) pattern; /* convenience; we do not modify
* it */
#endif
p->end = p->next + len; p->end = p->next + len;
p->error = 0; p->error = 0;
p->ncsalloc = 0; p->ncsalloc = 0;
@ -591,11 +567,7 @@ p_simp_re(struct parse * p,
if (c == '\\') if (c == '\\')
{ {
REQUIRE(MORE(), REG_EESCAPE); REQUIRE(MORE(), REG_EESCAPE);
#ifdef MULTIBYTE
c = BACKSL | (pg_wchar) GETNEXT(); c = BACKSL | (pg_wchar) GETNEXT();
#else
c = BACKSL | (unsigned char) GETNEXT();
#endif
} }
switch (c) switch (c)
{ {
@ -736,27 +708,17 @@ p_bracket(struct parse * p)
cset *cs = allocset(p); cset *cs = allocset(p);
int invert = 0; int invert = 0;
#ifdef MULTIBYTE
pg_wchar sp1[] = {'[', ':', '<', ':', ']', ']'}; pg_wchar sp1[] = {'[', ':', '<', ':', ']', ']'};
pg_wchar sp2[] = {'[', ':', '>', ':', ']', ']'}; pg_wchar sp2[] = {'[', ':', '>', ':', ']', ']'};
#endif
/* Dept of Truly Sickening Special-Case Kludges */ /* Dept of Truly Sickening Special-Case Kludges */
#ifdef MULTIBYTE
if (p->next + 5 < p->end && pg_wchar_strncmp(p->next, sp1, 6) == 0) if (p->next + 5 < p->end && pg_wchar_strncmp(p->next, sp1, 6) == 0)
#else
if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]", 6) == 0)
#endif
{ {
EMIT(OBOW, 0); EMIT(OBOW, 0);
NEXTn(6); NEXTn(6);
return; return;
} }
#ifdef MULTIBYTE
if (p->next + 5 < p->end && pg_wchar_strncmp(p->next, sp2, 6) == 0) if (p->next + 5 < p->end && pg_wchar_strncmp(p->next, sp2, 6) == 0)
#else
if (p->next + 5 < p->end && strncmp(p->next, "[:>:]]", 6) == 0)
#endif
{ {
EMIT(OEOW, 0); EMIT(OEOW, 0);
NEXTn(6); NEXTn(6);
@ -881,10 +843,10 @@ p_b_term(struct parse * p, cset *cs)
finish = start; finish = start;
/* xxx what about signed chars here... */ /* xxx what about signed chars here... */
REQUIRE(start <= finish, REG_ERANGE); REQUIRE(start <= finish, REG_ERANGE);
#ifdef MULTIBYTE
if (CHlc(start) != CHlc(finish)) if (CHlc(start) != CHlc(finish))
SETERROR(REG_ERANGE); SETERROR(REG_ERANGE);
#endif
for (i = start; i <= finish; i++) for (i = start; i <= finish; i++)
CHadd(cs, i); CHadd(cs, i);
break; break;
@ -906,13 +868,11 @@ p_b_cclass(struct parse * p, cset *cs)
while (MORE() && pg_isalpha(PEEK())) while (MORE() && pg_isalpha(PEEK()))
NEXT(); NEXT();
len = p->next - sp; len = p->next - sp;
for (cp = cclasses; cp->name != NULL; cp++) for (cp = cclasses; cp->name != NULL; cp++)
#ifdef MULTIBYTE
if (pg_char_and_wchar_strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0') if (pg_char_and_wchar_strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
#else
if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
#endif
break; break;
if (cp->name == NULL) if (cp->name == NULL)
{ {
/* oops, didn't find it */ /* oops, didn't find it */
@ -977,13 +937,11 @@ p_b_coll_elem(struct parse * p, int endc)
return 0; return 0;
} }
len = p->next - sp; len = p->next - sp;
for (cp = cnames; cp->name != NULL; cp++) for (cp = cnames; cp->name != NULL; cp++)
#ifdef MULTIBYTE
if (pg_char_and_wchar_strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0') if (pg_char_and_wchar_strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
#else
if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
#endif
return cp->code; /* known name */ return cp->code; /* known name */
if (len == 1) if (len == 1)
return *sp; /* single character */ return *sp; /* single character */
SETERROR(REG_ECOLLATE); /* neither */ SETERROR(REG_ECOLLATE); /* neither */
@ -993,33 +951,17 @@ p_b_coll_elem(struct parse * p, int endc)
/* /*
* othercase - return the case counterpart of an alphabetic * othercase - return the case counterpart of an alphabetic
*/ */
#ifdef MULTIBYTE
static unsigned char /* if no counterpart, return ch */ static unsigned char /* if no counterpart, return ch */
#else
static char /* if no counterpart, return ch */
#endif
othercase(int ch) othercase(int ch)
{ {
assert(pg_isalpha(ch)); assert(pg_isalpha(ch));
if (pg_isupper(ch)) if (pg_isupper(ch))
#ifdef MULTIBYTE
return (unsigned char) tolower((unsigned char) ch); return (unsigned char) tolower((unsigned char) ch);
#else
return tolower((unsigned char) ch);
#endif
else if (pg_islower(ch)) else if (pg_islower(ch))
#ifdef MULTIBYTE
return (unsigned char) toupper((unsigned char) ch); return (unsigned char) toupper((unsigned char) ch);
#else
return toupper((unsigned char) ch);
#endif
else else
/* peculiar, but could happen */ /* peculiar, but could happen */
#ifdef MULTIBYTE
return (unsigned char) ch; return (unsigned char) ch;
#else
return ch;
#endif
} }
/* /*
@ -1058,11 +1000,7 @@ ordinary(struct parse * p, int ch)
bothcases(p, ch); bothcases(p, ch);
else else
{ {
#ifdef MULTIBYTE
EMIT(OCHAR, (pg_wchar) ch); EMIT(OCHAR, (pg_wchar) ch);
#else
EMIT(OCHAR, (unsigned char) ch);
#endif
if (ch >= CHAR_MIN && ch <= CHAR_MAX && cap[ch] == 0) if (ch >= CHAR_MIN && ch <= CHAR_MAX && cap[ch] == 0)
cap[ch] = p->g->ncategories++; cap[ch] = p->g->ncategories++;
} }
@ -1633,11 +1571,7 @@ findmust(struct parse * p, struct re_guts * g)
return; return;
/* turn it into a character string */ /* turn it into a character string */
#ifdef MULTIBYTE
g->must = (pg_wchar *) malloc((size_t) (g->mlen + 1) * sizeof(pg_wchar)); g->must = (pg_wchar *) malloc((size_t) (g->mlen + 1) * sizeof(pg_wchar));
#else
g->must = malloc((size_t) g->mlen + 1);
#endif
if (g->must == NULL) if (g->must == NULL)
{ /* argh; just forget it */ { /* argh; just forget it */
g->mlen = 0; g->mlen = 0;
@ -1697,91 +1631,55 @@ pluscount(struct parse * p, struct re_guts * g)
static int static int
pg_isdigit(int c) pg_isdigit(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && isdigit((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && isdigit((unsigned char) c));
#else
return (isdigit((unsigned char) c));
#endif
} }
static int static int
pg_isalpha(int c) pg_isalpha(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && isalpha((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && isalpha((unsigned char) c));
#else
return (isalpha((unsigned char) c));
#endif
} }
static int static int
pg_isalnum(int c) pg_isalnum(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && isalnum((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && isalnum((unsigned char) c));
#else
return (isalnum((unsigned char) c));
#endif
} }
static int static int
pg_isupper(int c) pg_isupper(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && isupper((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && isupper((unsigned char) c));
#else
return (isupper((unsigned char) c));
#endif
} }
static int static int
pg_islower(int c) pg_islower(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && islower((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && islower((unsigned char) c));
#else
return (islower((unsigned char) c));
#endif
} }
static int static int
pg_iscntrl(int c) pg_iscntrl(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && iscntrl((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && iscntrl((unsigned char) c));
#else
return (iscntrl((unsigned char) c));
#endif
} }
static int static int
pg_isgraph(int c) pg_isgraph(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && isgraph((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && isgraph((unsigned char) c));
#else
return (isgraph((unsigned char) c));
#endif
} }
static int static int
pg_isprint(int c) pg_isprint(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && isprint((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && isprint((unsigned char) c));
#else
return (isprint((unsigned char) c));
#endif
} }
static int static int
pg_ispunct(int c) pg_ispunct(int c)
{ {
#ifdef MULTIBYTE
return (c >= 0 && c <= UCHAR_MAX && ispunct((unsigned char) c)); return (c >= 0 && c <= UCHAR_MAX && ispunct((unsigned char) c));
#else
return (ispunct((unsigned char) c));
#endif
} }
static struct cclass * static struct cclass *

5
src/backend/regex/regerror.c
Unescape View File

@ -171,12 +171,9 @@ regatoi(const regex_t *preg, char *localbuf)
struct rerr *r; struct rerr *r;
for (r = rerrs; r->code != 0; r++) for (r = rerrs; r->code != 0; r++)
#ifdef MULTIBYTE
if (pg_char_and_wchar_strcmp(r->name, preg->re_endp) == 0) if (pg_char_and_wchar_strcmp(r->name, preg->re_endp) == 0)
#else
if (strcmp(r->name, preg->re_endp) == 0)
#endif
break; break;
if (r->code == 0) if (r->code == 0)
return "0"; return "0";

11
src/backend/regex/regexec.c
Unescape View File

@ -154,10 +154,8 @@ pg_regexec(const regex_t *preg, const char *string, size_t nmatch,
{ {
struct re_guts *g = preg->re_g; struct re_guts *g = preg->re_g;
#ifdef MULTIBYTE
pg_wchar *str; pg_wchar *str;
int sts; int sts;
#endif
#ifdef REDEBUG #ifdef REDEBUG
#define GOODFLAGS(f) (f) #define GOODFLAGS(f) (f)
@ -172,7 +170,6 @@ pg_regexec(const regex_t *preg, const char *string, size_t nmatch,
return REG_BADPAT; return REG_BADPAT;
eflags = GOODFLAGS(eflags); eflags = GOODFLAGS(eflags);
#ifdef MULTIBYTE
str = (pg_wchar *) malloc((strlen(string) + 1) * sizeof(pg_wchar)); str = (pg_wchar *) malloc((strlen(string) + 1) * sizeof(pg_wchar));
if (!str) if (!str)
return (REG_ESPACE); return (REG_ESPACE);
@ -183,12 +180,4 @@ pg_regexec(const regex_t *preg, const char *string, size_t nmatch,
sts = lmatcher(g, str, nmatch, pmatch, eflags); sts = lmatcher(g, str, nmatch, pmatch, eflags);
free((char *) str); free((char *) str);
return (sts); return (sts);
#else
if (g->nstates <= CHAR_BIT * sizeof(states1) && !(eflags & REG_LARGE))
return smatcher(g, (pg_wchar *) string, nmatch, pmatch, eflags);
else
return lmatcher(g, (pg_wchar *) string, nmatch, pmatch, eflags);
#endif
} }

3
src/backend/regex/regfree.c
Unescape View File

@ -61,10 +61,9 @@ pg_regfree(regex_t *preg)
return; return;
preg->re_magic = 0; /* mark it invalid */ preg->re_magic = 0; /* mark it invalid */
g->magic = 0; /* mark it invalid */ g->magic = 0; /* mark it invalid */
#ifdef MULTIBYTE
if (preg->patsave != NULL) if (preg->patsave != NULL)
free((char *) preg->patsave); free((char *) preg->patsave);
#endif
if (g->strip != NULL) if (g->strip != NULL)
free((char *) g->strip); free((char *) g->strip);
if (g->sets != NULL) if (g->sets != NULL)

6
src/backend/tcop/postgres.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.284 2002/08/27 04:55:11 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.285 2002/08/29 07:22:23 ishii Exp $
* *
* NOTES * NOTES
* this is the "main" module of the postgres backend and * this is the "main" module of the postgres backend and
@ -57,9 +57,7 @@
#include "utils/guc.h" #include "utils/guc.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#include "utils/ps_status.h" #include "utils/ps_status.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#include "pgstat.h" #include "pgstat.h"
@ -1666,7 +1664,7 @@ PostgresMain(int argc, char *argv[], const char *username)
if (!IsUnderPostmaster) if (!IsUnderPostmaster)
{ {
puts("\nPOSTGRES backend interactive interface "); puts("\nPOSTGRES backend interactive interface ");
puts("$Revision: 1.284 $ $Date: 2002/08/27 04:55:11 $\n"); puts("$Revision: 1.285 $ $Date: 2002/08/29 07:22:23 $\n");
} }
/* /*

44
src/backend/utils/adt/ascii.c
Unescape View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
* ascii.c * ascii.c
* *
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.12 2001/11/05 17:46:28 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.13 2002/08/29 07:22:26 ishii Exp $
* *
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
* *
@ -18,46 +18,6 @@
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#include "utils/ascii.h" #include "utils/ascii.h"
/* ----------
* even if MULTIBYTE is not enabled, these functions must exist
* since pg_proc.h has references to them.
* ----------
*/
#ifndef MULTIBYTE
static void multibyte_error(void);
static void
multibyte_error(void)
{
elog(ERROR, "Multi-byte support is not enabled");
}
Datum
to_ascii_encname(PG_FUNCTION_ARGS)
{
multibyte_error();
return 0; /* keep compiler quiet */
}
Datum
to_ascii_enc(PG_FUNCTION_ARGS)
{
multibyte_error();
return 0; /* keep compiler quiet */
}
Datum
to_ascii_default(PG_FUNCTION_ARGS)
{
multibyte_error();
return 0; /* keep compiler quiet */
}
#else /* with MULTIBYTE */
static text *encode_to_ascii(text *data, int enc); static text *encode_to_ascii(text *data, int enc);
/* ---------- /* ----------
@ -190,5 +150,3 @@ to_ascii_default(PG_FUNCTION_ARGS)
) )
); );
} }
#endif /* MULTIBYTE */

9
src/backend/utils/adt/format_type.c
Unescape View File

@ -8,7 +8,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.32 2002/08/24 15:00:46 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.33 2002/08/29 07:22:26 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -25,9 +25,7 @@
#include "utils/numeric.h" #include "utils/numeric.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/syscache.h" #include "utils/syscache.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#define MAX_INT32_LEN 11 #define MAX_INT32_LEN 11
#define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str)) #define _textin(str) DirectFunctionCall1(textin, CStringGetDatum(str))
@ -433,14 +431,11 @@ type_maximum_size(Oid type_oid, int32 typemod)
case BPCHAROID: case BPCHAROID:
case VARCHAROID: case VARCHAROID:
/* typemod includes varlena header */ /* typemod includes varlena header */
#ifdef MULTIBYTE
/* typemod is in characters not bytes */ /* typemod is in characters not bytes */
return (typemod - VARHDRSZ) * return (typemod - VARHDRSZ) *
pg_encoding_max_length(GetDatabaseEncoding()) pg_encoding_max_length(GetDatabaseEncoding())
+ VARHDRSZ; + VARHDRSZ;
#else
return typemod;
#endif
case NUMERICOID: case NUMERICOID:
/* precision (ie, max # of digits) is in upper bits of typmod */ /* precision (ie, max # of digits) is in upper bits of typmod */

44
src/backend/utils/adt/like.c
Unescape View File

@ -11,7 +11,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.50 2002/08/22 04:45:11 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/like.c,v 1.51 2002/08/29 07:22:26 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -19,9 +19,7 @@
#include <ctype.h> #include <ctype.h>
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#include "utils/builtins.h" #include "utils/builtins.h"
@ -38,7 +36,6 @@ static int MatchBytea(unsigned char *t, int tlen,
unsigned char *p, int plen); unsigned char *p, int plen);
static text *do_like_escape(text *, text *); static text *do_like_escape(text *, text *);
#ifdef MULTIBYTE
static int MBMatchText(unsigned char *t, int tlen, static int MBMatchText(unsigned char *t, int tlen,
unsigned char *p, int plen); unsigned char *p, int plen);
static int MBMatchTextIC(unsigned char *t, int tlen, static int MBMatchTextIC(unsigned char *t, int tlen,
@ -107,9 +104,7 @@ iwchareq(unsigned char *p1, unsigned char *p2)
c2[0] = tolower(c2[0]); c2[0] = tolower(c2[0]);
return (c1[0] == c2[0]); return (c1[0] == c2[0]);
} }
#endif
#ifdef MULTIBYTE
#define CHAREQ(p1, p2) wchareq(p1, p2) #define CHAREQ(p1, p2) wchareq(p1, p2)
#define ICHAREQ(p1, p2) iwchareq(p1, p2) #define ICHAREQ(p1, p2) iwchareq(p1, p2)
#define NextChar(p, plen) \ #define NextChar(p, plen) \
@ -132,7 +127,6 @@ iwchareq(unsigned char *p1, unsigned char *p2)
#undef MatchText #undef MatchText
#undef MatchTextIC #undef MatchTextIC
#undef do_like_escape #undef do_like_escape
#endif
#define CHAREQ(p1, p2) (*(p1) == *(p2)) #define CHAREQ(p1, p2) (*(p1) == *(p2))
#define ICHAREQ(p1, p2) (tolower(*(p1)) == tolower(*(p2))) #define ICHAREQ(p1, p2) (tolower(*(p1)) == tolower(*(p2)))
@ -164,14 +158,10 @@ namelike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchText(s, slen, p, plen) == LIKE_TRUE); result = (MatchText(s, slen, p, plen) == LIKE_TRUE);
else else
result = (MBMatchText(s, slen, p, plen) == LIKE_TRUE); result = (MBMatchText(s, slen, p, plen) == LIKE_TRUE);
#else
result = (MatchText(s, slen, p, plen) == LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -192,14 +182,10 @@ namenlike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchText(s, slen, p, plen) != LIKE_TRUE); result = (MatchText(s, slen, p, plen) != LIKE_TRUE);
else else
result = (MBMatchText(s, slen, p, plen) != LIKE_TRUE); result = (MBMatchText(s, slen, p, plen) != LIKE_TRUE);
#else
result = (MatchText(s, slen, p, plen) != LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -220,14 +206,10 @@ textlike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchText(s, slen, p, plen) == LIKE_TRUE); result = (MatchText(s, slen, p, plen) == LIKE_TRUE);
else else
result = (MBMatchText(s, slen, p, plen) == LIKE_TRUE); result = (MBMatchText(s, slen, p, plen) == LIKE_TRUE);
#else
result = (MatchText(s, slen, p, plen) == LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -248,14 +230,10 @@ textnlike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchText(s, slen, p, plen) != LIKE_TRUE); result = (MatchText(s, slen, p, plen) != LIKE_TRUE);
else else
result = (MBMatchText(s, slen, p, plen) != LIKE_TRUE); result = (MBMatchText(s, slen, p, plen) != LIKE_TRUE);
#else
result = (MatchText(s, slen, p, plen) != LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -322,14 +300,10 @@ nameiclike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE); result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE);
else else
result = (MBMatchTextIC(s, slen, p, plen) == LIKE_TRUE); result = (MBMatchTextIC(s, slen, p, plen) == LIKE_TRUE);
#else
result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -350,14 +324,10 @@ nameicnlike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE); result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE);
else else
result = (MBMatchTextIC(s, slen, p, plen) != LIKE_TRUE); result = (MBMatchTextIC(s, slen, p, plen) != LIKE_TRUE);
#else
result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -378,14 +348,10 @@ texticlike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE); result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE);
else else
result = (MBMatchTextIC(s, slen, p, plen) == LIKE_TRUE); result = (MBMatchTextIC(s, slen, p, plen) == LIKE_TRUE);
#else
result = (MatchTextIC(s, slen, p, plen) == LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -406,14 +372,10 @@ texticnlike(PG_FUNCTION_ARGS)
p = VARDATA(pat); p = VARDATA(pat);
plen = (VARSIZE(pat) - VARHDRSZ); plen = (VARSIZE(pat) - VARHDRSZ);
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE); result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE);
else else
result = (MBMatchTextIC(s, slen, p, plen) != LIKE_TRUE); result = (MBMatchTextIC(s, slen, p, plen) != LIKE_TRUE);
#else
result = (MatchTextIC(s, slen, p, plen) != LIKE_TRUE);
#endif
PG_RETURN_BOOL(result); PG_RETURN_BOOL(result);
} }
@ -429,14 +391,10 @@ like_escape(PG_FUNCTION_ARGS)
text *esc = PG_GETARG_TEXT_P(1); text *esc = PG_GETARG_TEXT_P(1);
text *result; text *result;
#ifdef MULTIBYTE
if (pg_database_encoding_max_length() == 1) if (pg_database_encoding_max_length() == 1)
result = do_like_escape(pat, esc); result = do_like_escape(pat, esc);
else else
result = MB_do_like_escape(pat, esc); result = MB_do_like_escape(pat, esc);
#else
result = do_like_escape(pat, esc);
#endif
PG_RETURN_TEXT_P(result); PG_RETURN_TEXT_P(result);
} }

166
src/backend/utils/adt/oracle_compat.c
Unescape View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/oracle_compat.c,v 1.41 2002/08/22 05:05:19 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/oracle_compat.c,v 1.42 2002/08/29 07:22:27 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -20,9 +20,7 @@
#include "utils/builtins.h" #include "utils/builtins.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
/******************************************************************** /********************************************************************
* *
@ -172,9 +170,7 @@ lpad(PG_FUNCTION_ARGS)
s1len, s1len,
s2len; s2len;
#ifdef MULTIBYTE
int bytelen; int bytelen;
#endif
/* Negative len is silently taken as zero */ /* Negative len is silently taken as zero */
if (len < 0) if (len < 0)
@ -188,16 +184,14 @@ lpad(PG_FUNCTION_ARGS)
if (s2len < 0) if (s2len < 0)
s2len = 0; /* shouldn't happen */ s2len = 0; /* shouldn't happen */
#ifdef MULTIBYTE
s1len = pg_mbstrlen_with_len(VARDATA(string1), s1len); s1len = pg_mbstrlen_with_len(VARDATA(string1), s1len);
#endif
if (s1len > len) if (s1len > len)
s1len = len; /* truncate string1 to len chars */ s1len = len; /* truncate string1 to len chars */
if (s2len <= 0) if (s2len <= 0)
len = s1len; /* nothing to pad with, so don't pad */ len = s1len; /* nothing to pad with, so don't pad */
#ifdef MULTIBYTE
bytelen = pg_database_encoding_max_length() * len; bytelen = pg_database_encoding_max_length() * len;
/* check for integer overflow */ /* check for integer overflow */
@ -205,16 +199,13 @@ lpad(PG_FUNCTION_ARGS)
elog(ERROR, "Requested length too large"); elog(ERROR, "Requested length too large");
ret = (text *) palloc(VARHDRSZ + bytelen); ret = (text *) palloc(VARHDRSZ + bytelen);
#else
ret = (text *) palloc(VARHDRSZ + len);
#endif
m = len - s1len; m = len - s1len;
ptr2 = VARDATA(string2); ptr2 = VARDATA(string2);
ptr2end = ptr2 + s2len; ptr2end = ptr2 + s2len;
ptr_ret = VARDATA(ret); ptr_ret = VARDATA(ret);
#ifdef MULTIBYTE
while (m--) while (m--)
{ {
int mlen = pg_mblen(ptr2); int mlen = pg_mblen(ptr2);
@ -225,18 +216,9 @@ lpad(PG_FUNCTION_ARGS)
if (ptr2 == ptr2end) /* wrap around at end of s2 */ if (ptr2 == ptr2end) /* wrap around at end of s2 */
ptr2 = VARDATA(string2); ptr2 = VARDATA(string2);
} }
#else
while (m--)
{
*ptr_ret++ = *ptr2++;
if (ptr2 == ptr2end) /* wrap around at end of s2 */
ptr2 = VARDATA(string2);
}
#endif
ptr1 = VARDATA(string1); ptr1 = VARDATA(string1);
#ifdef MULTIBYTE
while (s1len--) while (s1len--)
{ {
int mlen = pg_mblen(ptr1); int mlen = pg_mblen(ptr1);
@ -245,10 +227,6 @@ lpad(PG_FUNCTION_ARGS)
ptr_ret += mlen; ptr_ret += mlen;
ptr1 += mlen; ptr1 += mlen;
} }
#else
while (s1len--)
*ptr_ret++ = *ptr1++;
#endif
VARATT_SIZEP(ret) = ptr_ret - (char *) ret; VARATT_SIZEP(ret) = ptr_ret - (char *) ret;
@ -287,9 +265,7 @@ rpad(PG_FUNCTION_ARGS)
s1len, s1len,
s2len; s2len;
#ifdef MULTIBYTE
int bytelen; int bytelen;
#endif
/* Negative len is silently taken as zero */ /* Negative len is silently taken as zero */
if (len < 0) if (len < 0)
@ -303,9 +279,7 @@ rpad(PG_FUNCTION_ARGS)
if (s2len < 0) if (s2len < 0)
s2len = 0; /* shouldn't happen */ s2len = 0; /* shouldn't happen */
#ifdef MULTIBYTE
s1len = pg_mbstrlen_with_len(VARDATA(string1), s1len); s1len = pg_mbstrlen_with_len(VARDATA(string1), s1len);
#endif
if (s1len > len) if (s1len > len)
s1len = len; /* truncate string1 to len chars */ s1len = len; /* truncate string1 to len chars */
@ -313,7 +287,6 @@ rpad(PG_FUNCTION_ARGS)
if (s2len <= 0) if (s2len <= 0)
len = s1len; /* nothing to pad with, so don't pad */ len = s1len; /* nothing to pad with, so don't pad */
#ifdef MULTIBYTE
bytelen = pg_database_encoding_max_length() * len; bytelen = pg_database_encoding_max_length() * len;
/* Check for integer overflow */ /* Check for integer overflow */
@ -321,15 +294,11 @@ rpad(PG_FUNCTION_ARGS)
elog(ERROR, "Requested length too large"); elog(ERROR, "Requested length too large");
ret = (text *) palloc(VARHDRSZ + bytelen); ret = (text *) palloc(VARHDRSZ + bytelen);
#else
ret = (text *) palloc(VARHDRSZ + len);
#endif
m = len - s1len; m = len - s1len;
ptr1 = VARDATA(string1); ptr1 = VARDATA(string1);
ptr_ret = VARDATA(ret); ptr_ret = VARDATA(ret);
#ifdef MULTIBYTE
while (s1len--) while (s1len--)
{ {
int mlen = pg_mblen(ptr1); int mlen = pg_mblen(ptr1);
@ -338,15 +307,10 @@ rpad(PG_FUNCTION_ARGS)
ptr_ret += mlen; ptr_ret += mlen;
ptr1 += mlen; ptr1 += mlen;
} }
#else
while (s1len--)
*ptr_ret++ = *ptr1++;
#endif
ptr2 = VARDATA(string2); ptr2 = VARDATA(string2);
ptr2end = ptr2 + s2len; ptr2end = ptr2 + s2len;
#ifdef MULTIBYTE
while (m--) while (m--)
{ {
int mlen = pg_mblen(ptr2); int mlen = pg_mblen(ptr2);
@ -357,14 +321,6 @@ rpad(PG_FUNCTION_ARGS)
if (ptr2 == ptr2end) /* wrap around at end of s2 */ if (ptr2 == ptr2end) /* wrap around at end of s2 */
ptr2 = VARDATA(string2); ptr2 = VARDATA(string2);
} }
#else
while (m--)
{
*ptr_ret++ = *ptr2++;
if (ptr2 == ptr2end) /* wrap around at end of s2 */
ptr2 = VARDATA(string2);
}
#endif
VARATT_SIZEP(ret) = ptr_ret - (char *) ret; VARATT_SIZEP(ret) = ptr_ret - (char *) ret;
@ -399,13 +355,11 @@ btrim(PG_FUNCTION_ARGS)
*end2; *end2;
int m; int m;
#ifdef MULTIBYTE
char **mp; char **mp;
int mplen; int mplen;
char *p; char *p;
int mblen; int mblen;
int len; int len;
#endif
if ((m = VARSIZE(string) - VARHDRSZ) <= 0 || if ((m = VARSIZE(string) - VARHDRSZ) <= 0 ||
(VARSIZE(set) - VARHDRSZ) <= 0) (VARSIZE(set) - VARHDRSZ) <= 0)
@ -413,7 +367,6 @@ btrim(PG_FUNCTION_ARGS)
ptr = VARDATA(string); ptr = VARDATA(string);
#ifdef MULTIBYTE
len = m; len = m;
mp = (char **) palloc(len * sizeof(char *)); mp = (char **) palloc(len * sizeof(char *));
p = ptr; p = ptr;
@ -428,12 +381,8 @@ btrim(PG_FUNCTION_ARGS)
len -= mblen; len -= mblen;
} }
mplen--; mplen--;
#else
end = VARDATA(string) + VARSIZE(string) - VARHDRSZ - 1;
#endif
end2 = VARDATA(set) + VARSIZE(set) - VARHDRSZ - 1; end2 = VARDATA(set) + VARSIZE(set) - VARHDRSZ - 1;
#ifdef MULTIBYTE
while (m > 0) while (m > 0)
{ {
int str_len = pg_mblen(ptr); int str_len = pg_mblen(ptr);
@ -475,37 +424,6 @@ btrim(PG_FUNCTION_ARGS)
m -= str_len; m -= str_len;
} }
pfree(mp); pfree(mp);
#else
while (m > 0)
{
ptr2 = VARDATA(set);
while (ptr2 <= end2)
{
if (*ptr == *ptr2)
break;
++ptr2;
}
if (ptr2 > end2)
break;
ptr++;
m--;
}
while (m > 0)
{
ptr2 = VARDATA(set);
while (ptr2 <= end2)
{
if (*end == *ptr2)
break;
++ptr2;
}
if (ptr2 > end2)
break;
end--;
m--;
}
#endif
ret = (text *) palloc(VARHDRSZ + m); ret = (text *) palloc(VARHDRSZ + m);
VARATT_SIZEP(ret) = VARHDRSZ + m; VARATT_SIZEP(ret) = VARHDRSZ + m;
memcpy(VARDATA(ret), ptr, m); memcpy(VARDATA(ret), ptr, m);
@ -619,7 +537,6 @@ ltrim(PG_FUNCTION_ARGS)
ptr = VARDATA(string); ptr = VARDATA(string);
end2 = VARDATA(set) + VARSIZE(set) - VARHDRSZ - 1; end2 = VARDATA(set) + VARSIZE(set) - VARHDRSZ - 1;
#ifdef MULTIBYTE
while (m > 0) while (m > 0)
{ {
int str_len = pg_mblen(ptr); int str_len = pg_mblen(ptr);
@ -639,22 +556,6 @@ ltrim(PG_FUNCTION_ARGS)
ptr += str_len; ptr += str_len;
m -= str_len; m -= str_len;
} }
#else
while (m > 0)
{
ptr2 = VARDATA(set);
while (ptr2 <= end2)
{
if (*ptr == *ptr2)
break;
++ptr2;
}
if (ptr2 > end2)
break;
ptr++;
m--;
}
#endif
ret = (text *) palloc(VARHDRSZ + m); ret = (text *) palloc(VARHDRSZ + m);
VARATT_SIZEP(ret) = VARHDRSZ + m; VARATT_SIZEP(ret) = VARHDRSZ + m;
memcpy(VARDATA(ret), ptr, m); memcpy(VARDATA(ret), ptr, m);
@ -691,13 +592,11 @@ rtrim(PG_FUNCTION_ARGS)
*end2; *end2;
int m; int m;
#ifdef MULTIBYTE
char **mp; char **mp;
int mplen; int mplen;
char *p; char *p;
int mblen; int mblen;
int len; int len;
#endif
if ((m = VARSIZE(string) - VARHDRSZ) <= 0 || if ((m = VARSIZE(string) - VARHDRSZ) <= 0 ||
(VARSIZE(set) - VARHDRSZ) <= 0) (VARSIZE(set) - VARHDRSZ) <= 0)
@ -705,7 +604,6 @@ rtrim(PG_FUNCTION_ARGS)
ptr = VARDATA(string); ptr = VARDATA(string);
#ifdef MULTIBYTE
len = m; len = m;
mp = (char **) palloc(len * sizeof(char *)); mp = (char **) palloc(len * sizeof(char *));
p = ptr; p = ptr;
@ -720,12 +618,8 @@ rtrim(PG_FUNCTION_ARGS)
len -= mblen; len -= mblen;
} }
mplen--; mplen--;
#else
end = VARDATA(string) + VARSIZE(string) - VARHDRSZ - 1;
#endif
end2 = VARDATA(set) + VARSIZE(set) - VARHDRSZ - 1; end2 = VARDATA(set) + VARSIZE(set) - VARHDRSZ - 1;
#ifdef MULTIBYTE
while (m > 0) while (m > 0)
{ {
int str_len; int str_len;
@ -747,22 +641,6 @@ rtrim(PG_FUNCTION_ARGS)
m -= str_len; m -= str_len;
} }
pfree(mp); pfree(mp);
#else
while (m > 0)
{
ptr2 = VARDATA(set);
while (ptr2 <= end2)
{
if (*end == *ptr2)
break;
++ptr2;
}
if (ptr2 > end2)
break;
end--;
m--;
}
#endif
ret = (text *) palloc(VARHDRSZ + m); ret = (text *) palloc(VARHDRSZ + m);
VARATT_SIZEP(ret) = VARHDRSZ + m; VARATT_SIZEP(ret) = VARHDRSZ + m;
memcpy(VARDATA(ret), ptr, m); memcpy(VARDATA(ret), ptr, m);
@ -805,13 +683,11 @@ translate(PG_FUNCTION_ARGS)
retlen, retlen,
i; i;
#ifdef MULTIBYTE
int str_len; int str_len;
int estimate_len; int estimate_len;
int len; int len;
int source_len; int source_len;
int from_index; int from_index;
#endif
if ((m = VARSIZE(string) - VARHDRSZ) <= 0) if ((m = VARSIZE(string) - VARHDRSZ) <= 0)
PG_RETURN_TEXT_P(string); PG_RETURN_TEXT_P(string);
@ -821,20 +697,15 @@ translate(PG_FUNCTION_ARGS)
tolen = VARSIZE(to) - VARHDRSZ; tolen = VARSIZE(to) - VARHDRSZ;
to_ptr = VARDATA(to); to_ptr = VARDATA(to);
#ifdef MULTIBYTE
str_len = VARSIZE(string); str_len = VARSIZE(string);
estimate_len = (tolen * 1.0 / fromlen + 0.5) * str_len; estimate_len = (tolen * 1.0 / fromlen + 0.5) * str_len;
estimate_len = estimate_len > str_len ? estimate_len : str_len; estimate_len = estimate_len > str_len ? estimate_len : str_len;
result = (text *) palloc(estimate_len); result = (text *) palloc(estimate_len);
#else
result = (text *) palloc(VARSIZE(string));
#endif
source = VARDATA(string); source = VARDATA(string);
target = VARDATA(result); target = VARDATA(result);
retlen = 0; retlen = 0;
#ifdef MULTIBYTE
while (m > 0) while (m > 0)
{ {
source_len = pg_mblen(source); source_len = pg_mblen(source);
@ -880,37 +751,6 @@ translate(PG_FUNCTION_ARGS)
source += source_len; source += source_len;
m -= source_len; m -= source_len;
} }
#else
while (m-- > 0)
{
char rep = *source++;
for (i = 0; i < fromlen; i++)
{
if (from_ptr[i] == rep)
break;
}
if (i < fromlen)
{
if (i < tolen)
{
/* substitute */
*target++ = to_ptr[i];
retlen++;
}
else
{
/* discard */
}
}
else
{
/* no match, so copy */
*target++ = rep;
retlen++;
}
}
#endif
VARATT_SIZEP(result) = retlen + VARHDRSZ; VARATT_SIZEP(result) = retlen + VARHDRSZ;

100
src/backend/utils/adt/quote.c
Unescape View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.7 2002/04/04 04:25:49 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/quote.c,v 1.8 2002/08/29 07:22:27 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -70,102 +70,6 @@ quote_literal(PG_FUNCTION_ARGS)
* *
*/ */
#ifndef MULTIBYTE
/* Check if a given identifier needs quoting */
static bool
quote_ident_required(text *iptr)
{
char *cp;
char *ep;
cp = VARDATA(iptr);
ep = VARDATA(iptr) + VARSIZE(iptr) - VARHDRSZ;
if (cp >= ep)
return true;
if (!(*cp == '_' || (*cp >= 'a' && *cp <= 'z')))
return true;
while ((++cp) < ep)
{
if (*cp >= 'a' && *cp <= 'z')
continue;
if (*cp >= '0' && *cp <= '9')
continue;
if (*cp == '_')
continue;
return true;
}
return false;
}
/* Return a properly quoted identifier */
static text *
do_quote_ident(text *iptr)
{
text *result;
char *cp1;
char *cp2;
int len;
len = VARSIZE(iptr) - VARHDRSZ;
result = (text *) palloc(len * 2 + VARHDRSZ + 2);
cp1 = VARDATA(iptr);
cp2 = VARDATA(result);
*cp2++ = '"';
while (len-- > 0)
{
if (*cp1 == '"')
*cp2++ = '"';
*cp2++ = *cp1++;
}
*cp2++ = '"';
VARATT_SIZEP(result) = cp2 - ((char *) result);
return result;
}
/* Return a properly quoted literal value */
static text *
do_quote_literal(text *lptr)
{
text *result;
char *cp1;
char *cp2;
int len;
len = VARSIZE(lptr) - VARHDRSZ;
result = (text *) palloc(len * 2 + VARHDRSZ + 2);
cp1 = VARDATA(lptr);
cp2 = VARDATA(result);
*cp2++ = '\'';
while (len-- > 0)
{
if (*cp1 == '\'')
*cp2++ = '\'';
if (*cp1 == '\\')
*cp2++ = '\\';
*cp2++ = *cp1++;
}
*cp2++ = '\'';
VARATT_SIZEP(result) = cp2 - ((char *) result);
return result;
}
#else
/* Check if a given identifier needs quoting (MULTIBYTE version) */ /* Check if a given identifier needs quoting (MULTIBYTE version) */
static bool static bool
quote_ident_required(text *iptr) quote_ident_required(text *iptr)
@ -285,5 +189,3 @@ do_quote_literal(text *lptr)
return result; return result;
} }
#endif

6
src/backend/utils/adt/selfuncs.c
Unescape View File

@ -15,7 +15,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.113 2002/08/22 00:01:44 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/selfuncs.c,v 1.114 2002/08/29 07:22:27 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -3250,12 +3250,8 @@ make_greater_string(const char *str, Oid datatype)
* Truncate off the last character, which might be more than 1 * Truncate off the last character, which might be more than 1
* byte in MULTIBYTE case. * byte in MULTIBYTE case.
*/ */
#ifdef MULTIBYTE
len = pg_mbcliplen((const unsigned char *) workstr, len, len - 1); len = pg_mbcliplen((const unsigned char *) workstr, len, len - 1);
workstr[len] = '\0'; workstr[len] = '\0';
#else
*lastchar = '\0';
#endif
} }
/* Failed... */ /* Failed... */

80
src/backend/utils/adt/varchar.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.91 2002/08/26 17:53:59 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.92 2002/08/29 07:22:27 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -21,9 +21,7 @@
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/fmgroids.h" #include "utils/fmgroids.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
/* /*
@ -76,37 +74,26 @@ bpcharin(PG_FUNCTION_ARGS)
maxlen; maxlen;
int i; int i;
#ifdef MULTIBYTE
int charlen; /* number of charcters in the input string */ int charlen; /* number of charcters in the input string */
char *ermsg; char *ermsg;
#endif
len = strlen(s); len = strlen(s);
#ifdef MULTIBYTE
if ((ermsg = pg_verifymbstr(s, len))) if ((ermsg = pg_verifymbstr(s, len)))
elog(ERROR, "%s", ermsg); elog(ERROR, "%s", ermsg);
charlen = pg_mbstrlen(s); charlen = pg_mbstrlen(s);
#endif
/* If typmod is -1 (or invalid), use the actual string length */ /* If typmod is -1 (or invalid), use the actual string length */
if (atttypmod < (int32) VARHDRSZ) if (atttypmod < (int32) VARHDRSZ)
#ifdef MULTIBYTE
maxlen = charlen; maxlen = charlen;
#else
maxlen = len;
#endif
else else
maxlen = atttypmod - VARHDRSZ; maxlen = atttypmod - VARHDRSZ;
#ifdef MULTIBYTE
if (charlen > maxlen) if (charlen > maxlen)
#else
if (len > maxlen)
#endif
{ {
/* Verify that extra characters are spaces, and clip them off */ /* Verify that extra characters are spaces, and clip them off */
#ifdef MULTIBYTE
size_t mbmaxlen = pg_mbcharcliplen(s, len, maxlen); size_t mbmaxlen = pg_mbcharcliplen(s, len, maxlen);
/* /*
@ -125,15 +112,7 @@ bpcharin(PG_FUNCTION_ARGS)
* the number of CHARACTERS! * the number of CHARACTERS!
*/ */
maxlen = len; maxlen = len;
#else
if (strspn(s + maxlen, " ") == len - maxlen)
len = maxlen;
else
elog(ERROR, "value too long for type character(%d)",
(int) maxlen);
#endif
} }
#ifdef MULTIBYTE
else else
{ {
/* /*
@ -142,7 +121,6 @@ bpcharin(PG_FUNCTION_ARGS)
*/ */
maxlen = len + (maxlen - charlen); maxlen = len + (maxlen - charlen);
} }
#endif
result = palloc(maxlen + VARHDRSZ); result = palloc(maxlen + VARHDRSZ);
VARATT_SIZEP(result) = maxlen + VARHDRSZ; VARATT_SIZEP(result) = maxlen + VARHDRSZ;
@ -202,26 +180,19 @@ bpchar(PG_FUNCTION_ARGS)
char *s; char *s;
int i; int i;
#ifdef MULTIBYTE
int charlen; /* number of charcters in the input string int charlen; /* number of charcters in the input string
* + VARHDRSZ */ * + VARHDRSZ */
#endif
len = VARSIZE(source); len = VARSIZE(source);
#ifdef MULTIBYTE
charlen = pg_mbstrlen_with_len(VARDATA(source), len - VARHDRSZ) + VARHDRSZ; charlen = pg_mbstrlen_with_len(VARDATA(source), len - VARHDRSZ) + VARHDRSZ;
#endif
/* No work if typmod is invalid or supplied data matches it already */ /* No work if typmod is invalid or supplied data matches it already */
if (maxlen < (int32) VARHDRSZ || len == maxlen) if (maxlen < (int32) VARHDRSZ || len == maxlen)
PG_RETURN_BPCHAR_P(source); PG_RETURN_BPCHAR_P(source);
#ifdef MULTIBYTE
if (charlen > maxlen) if (charlen > maxlen)
#else
if (len > maxlen)
#endif
{ {
/* Verify that extra characters are spaces, and clip them off */ /* Verify that extra characters are spaces, and clip them off */
#ifdef MULTIBYTE
size_t maxmblen; size_t maxmblen;
maxmblen = pg_mbcharcliplen(VARDATA(source), len - VARHDRSZ, maxmblen = pg_mbcharcliplen(VARDATA(source), len - VARHDRSZ,
@ -239,16 +210,7 @@ bpchar(PG_FUNCTION_ARGS)
* length+VARHDRSZ, not the number of CHARACTERS! * length+VARHDRSZ, not the number of CHARACTERS!
*/ */
maxlen = len; maxlen = len;
#else
for (i = maxlen - VARHDRSZ; i < len - VARHDRSZ; i++)
if (*(VARDATA(source) + i) != ' ')
elog(ERROR, "value too long for type character(%d)",
maxlen - VARHDRSZ);
len = maxlen;
#endif
} }
#ifdef MULTIBYTE
else else
{ {
/* /*
@ -257,7 +219,6 @@ bpchar(PG_FUNCTION_ARGS)
*/ */
maxlen = len + (maxlen - charlen); maxlen = len + (maxlen - charlen);
} }
#endif
s = VARDATA(source); s = VARDATA(source);
@ -408,29 +369,22 @@ varcharin(PG_FUNCTION_ARGS)
size_t len, size_t len,
maxlen; maxlen;
#ifdef MULTIBYTE
char *ermsg; char *ermsg;
#endif
len = strlen(s); len = strlen(s);
#ifdef MULTIBYTE
if ((ermsg = pg_verifymbstr(s, len))) if ((ermsg = pg_verifymbstr(s, len)))
elog(ERROR, "%s", ermsg); elog(ERROR, "%s", ermsg);
#endif
maxlen = atttypmod - VARHDRSZ; maxlen = atttypmod - VARHDRSZ;
if (atttypmod >= (int32) VARHDRSZ && len > maxlen) if (atttypmod >= (int32) VARHDRSZ && len > maxlen)
{ {
/* Verify that extra characters are spaces, and clip them off */ /* Verify that extra characters are spaces, and clip them off */
#ifdef MULTIBYTE
size_t mbmaxlen = pg_mbcharcliplen(s, len, maxlen); size_t mbmaxlen = pg_mbcharcliplen(s, len, maxlen);
if (strspn(s + mbmaxlen, " ") == len - mbmaxlen) if (strspn(s + mbmaxlen, " ") == len - mbmaxlen)
len = mbmaxlen; len = mbmaxlen;
#else
if (strspn(s + maxlen, " ") == len - maxlen)
len = maxlen;
#endif
else else
elog(ERROR, "value too long for type character varying(%d)", elog(ERROR, "value too long for type character varying(%d)",
(int) maxlen); (int) maxlen);
@ -493,7 +447,6 @@ varchar(PG_FUNCTION_ARGS)
/* only reach here if string is too long... */ /* only reach here if string is too long... */
#ifdef MULTIBYTE
{ {
size_t maxmblen; size_t maxmblen;
@ -508,15 +461,6 @@ varchar(PG_FUNCTION_ARGS)
len = maxmblen; len = maxmblen;
} }
#else
for (i = maxlen - VARHDRSZ; i < len - VARHDRSZ; i++)
if (*(VARDATA(source) + i) != ' ')
elog(ERROR, "value too long for type character varying(%d)",
maxlen - VARHDRSZ);
/* clip extra spaces */
len = maxlen;
#endif
result = palloc(len); result = palloc(len);
VARATT_SIZEP(result) = len; VARATT_SIZEP(result) = len;
@ -584,7 +528,6 @@ bpcharlen(PG_FUNCTION_ARGS)
{ {
BpChar *arg = PG_GETARG_BPCHAR_P(0); BpChar *arg = PG_GETARG_BPCHAR_P(0);
#ifdef MULTIBYTE
/* optimization for single byte encoding */ /* optimization for single byte encoding */
if (pg_database_encoding_max_length() <= 1) if (pg_database_encoding_max_length() <= 1)
PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ); PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ);
@ -592,9 +535,6 @@ bpcharlen(PG_FUNCTION_ARGS)
PG_RETURN_INT32( PG_RETURN_INT32(
pg_mbstrlen_with_len(VARDATA(arg), VARSIZE(arg) - VARHDRSZ) pg_mbstrlen_with_len(VARDATA(arg), VARSIZE(arg) - VARHDRSZ)
); );
#else
PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ);
#endif
} }
Datum Datum
@ -796,7 +736,6 @@ varcharlen(PG_FUNCTION_ARGS)
{ {
VarChar *arg = PG_GETARG_VARCHAR_P(0); VarChar *arg = PG_GETARG_VARCHAR_P(0);
#ifdef MULTIBYTE
/* optimization for single byte encoding */ /* optimization for single byte encoding */
if (pg_database_encoding_max_length() <= 1) if (pg_database_encoding_max_length() <= 1)
PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ); PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ);
@ -804,9 +743,6 @@ varcharlen(PG_FUNCTION_ARGS)
PG_RETURN_INT32( PG_RETURN_INT32(
pg_mbstrlen_with_len(VARDATA(arg), VARSIZE(arg) - VARHDRSZ) pg_mbstrlen_with_len(VARDATA(arg), VARSIZE(arg) - VARHDRSZ)
); );
#else
PG_RETURN_INT32(VARSIZE(arg) - VARHDRSZ);
#endif
} }
Datum Datum

10
src/backend/utils/adt/varlena.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.89 2002/08/28 20:46:24 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.90 2002/08/29 07:22:27 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -217,16 +217,12 @@ textin(PG_FUNCTION_ARGS)
text *result; text *result;
int len; int len;
#ifdef MULTIBYTE
char *ermsg; char *ermsg;
#endif
len = strlen(inputText) + VARHDRSZ; len = strlen(inputText) + VARHDRSZ;
#ifdef MULTIBYTE
if ((ermsg = pg_verifymbstr(inputText, len - VARHDRSZ))) if ((ermsg = pg_verifymbstr(inputText, len - VARHDRSZ)))
elog(ERROR, "%s", ermsg); elog(ERROR, "%s", ermsg);
#endif
result = (text *) palloc(len); result = (text *) palloc(len);
VARATT_SIZEP(result) = len; VARATT_SIZEP(result) = len;
@ -1476,12 +1472,8 @@ SplitIdentifierString(char *rawstring, char separator,
curlen = strlen(curname); curlen = strlen(curname);
if (curlen >= NAMEDATALEN) if (curlen >= NAMEDATALEN)
{ {
#ifdef MULTIBYTE
curlen = pg_mbcliplen(curname, curlen, NAMEDATALEN - 1); curlen = pg_mbcliplen(curname, curlen, NAMEDATALEN - 1);
curname[curlen] = '\0'; curname[curlen] = '\0';
#else
curname[NAMEDATALEN - 1] = '\0';
#endif
} }
/* /*

8
src/backend/utils/error/elog.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.99 2002/06/20 20:29:39 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.100 2002/08/29 07:22:28 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -35,9 +35,7 @@
#include "tcop/tcopprot.h" #include "tcop/tcopprot.h"
#include "utils/memutils.h" #include "utils/memutils.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
int server_min_messages; int server_min_messages;
char *server_min_messages_str = NULL; char *server_min_messages_str = NULL;
@ -694,14 +692,14 @@ write_syslog(int level, const char *line)
*strchr(buf, '\n') = '\0'; *strchr(buf, '\n') = '\0';
l = strlen(buf); l = strlen(buf);
#ifdef MULTIBYTE
/* trim to multibyte letter boundary */ /* trim to multibyte letter boundary */
buflen = pg_mbcliplen(buf, l, l); buflen = pg_mbcliplen(buf, l, l);
if (buflen <= 0) if (buflen <= 0)
return; return;
buf[buflen] = '\0'; buf[buflen] = '\0';
l = strlen(buf); l = strlen(buf);
#endif
/* already word boundary? */ /* already word boundary? */
if (isspace((unsigned char) line[l]) || line[l] == '\0') if (isspace((unsigned char) line[l]) || line[l] == '\0')
buflen = l; buflen = l;

9
src/backend/utils/init/postinit.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.109 2002/07/20 05:16:59 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.110 2002/08/29 07:22:28 ishii Exp $
* *
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
@ -130,17 +130,10 @@ ReverifyMyDatabase(const char *name)
* encoding info out of the pg_database tuple --- or complain, if we * encoding info out of the pg_database tuple --- or complain, if we
* can't support it. * can't support it.
*/ */
#ifdef MULTIBYTE
SetDatabaseEncoding(dbform->encoding); SetDatabaseEncoding(dbform->encoding);
/* If we have no other source of client_encoding, use server encoding */ /* If we have no other source of client_encoding, use server encoding */
SetConfigOption("client_encoding", GetDatabaseEncodingName(), SetConfigOption("client_encoding", GetDatabaseEncodingName(),
PGC_BACKEND, PGC_S_DEFAULT); PGC_BACKEND, PGC_S_DEFAULT);
#else
if (dbform->encoding != PG_SQL_ASCII)
elog(FATAL, "database was initialized with MULTIBYTE encoding %d,\n\tbut the backend was compiled without multibyte support.\n\tlooks like you need to initdb or recompile.",
dbform->encoding);
#endif
/* /*
* Set up database-specific configuration variables. * Set up database-specific configuration variables.
*/ */

33
src/backend/utils/mb/mbutils.c
Unescape View File

@ -3,7 +3,7 @@
* client encoding and server internal encoding. * client encoding and server internal encoding.
* (currently mule internal code (mic) is used) * (currently mule internal code (mic) is used)
* Tatsuo Ishii * Tatsuo Ishii
* $Id: mbutils.c,v 1.32 2002/08/19 04:08:08 ishii Exp $ * $Id: mbutils.c,v 1.33 2002/08/29 07:22:28 ishii Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "access/xact.h" #include "access/xact.h"
@ -34,6 +34,9 @@ static FmgrInfo *ToClientConvPorc = NULL;
static unsigned char * static unsigned char *
perform_default_encoding_conversion(unsigned char *src, int len, bool is_client_to_server); perform_default_encoding_conversion(unsigned char *src, int len, bool is_client_to_server);
static int
cliplen(const unsigned char *str, int len, int limit);
/* /*
* Set the client encoding and save fmgrinfo for the converion * Set the client encoding and save fmgrinfo for the converion
* function if necessary. if encoding conversion between client/server * function if necessary. if encoding conversion between client/server
@ -371,6 +374,10 @@ pg_mbstrlen(const unsigned char *mbstr)
{ {
int len = 0; int len = 0;
/* optimization for single byte encoding */
if (pg_database_encoding_max_length() == 1)
return strlen((char *)mbstr);
while (*mbstr) while (*mbstr)
{ {
mbstr += pg_mblen(mbstr); mbstr += pg_mblen(mbstr);
@ -409,6 +416,10 @@ pg_mbcliplen(const unsigned char *mbstr, int len, int limit)
int clen = 0; int clen = 0;
int l; int l;
/* optimization for single byte encoding */
if (pg_database_encoding_max_length() == 1)
return cliplen(mbstr, len, limit);
while (len > 0 && *mbstr) while (len > 0 && *mbstr)
{ {
l = pg_mblen(mbstr); l = pg_mblen(mbstr);
@ -424,7 +435,7 @@ pg_mbcliplen(const unsigned char *mbstr, int len, int limit)
} }
/* /*
* Similar to pg_mbcliplen but the limit parameter specifies the * Similar to pg_mbcliplen except the limit parameter specifies the
* character length, not the byte length. */ * character length, not the byte length. */
int int
pg_mbcharcliplen(const unsigned char *mbstr, int len, int limit) pg_mbcharcliplen(const unsigned char *mbstr, int len, int limit)
@ -433,6 +444,10 @@ pg_mbcharcliplen(const unsigned char *mbstr, int len, int limit)
int nch = 0; int nch = 0;
int l; int l;
/* optimization for single byte encoding */
if (pg_database_encoding_max_length() == 1)
return cliplen(mbstr, len, limit);
while (len > 0 && *mbstr) while (len > 0 && *mbstr)
{ {
l = pg_mblen(mbstr); l = pg_mblen(mbstr);
@ -489,3 +504,17 @@ pg_client_encoding(PG_FUNCTION_ARGS)
Assert(ClientEncoding); Assert(ClientEncoding);
return DirectFunctionCall1(namein, CStringGetDatum(ClientEncoding->name)); return DirectFunctionCall1(namein, CStringGetDatum(ClientEncoding->name));
} }
static int
cliplen(const unsigned char *str, int len, int limit)
{
int l = 0;
const unsigned char *s;
for (s = str; *s; s++, l++)
{
if (l >= len || l >= limit)
return l;
}
return (s - str);
}

3
src/include/regex/regex.h
Unescape View File

@ -52,10 +52,7 @@ typedef struct
size_t re_nsub; /* number of parenthesized subexpressions */ size_t re_nsub; /* number of parenthesized subexpressions */
const pg_wchar *re_endp; /* end pointer for REG_PEND */ const pg_wchar *re_endp; /* end pointer for REG_PEND */
struct re_guts *re_g; /* none of your business :-) */ struct re_guts *re_g; /* none of your business :-) */
#ifdef MULTIBYTE
pg_wchar *patsave; /* me too :-) */ pg_wchar *patsave; /* me too :-) */
#endif
} regex_t; } regex_t;
typedef struct typedef struct

23
src/include/regex/regex2.h
Unescape View File

@ -113,18 +113,13 @@ typedef struct
{ {
uch *ptr; /* -> uch [csetsize] */ uch *ptr; /* -> uch [csetsize] */
uch mask; /* bit within array */ uch mask; /* bit within array */
#ifdef MULTIBYTE
pg_wchar hash; /* hash code */ pg_wchar hash; /* hash code */
unsigned int lc; /* leading character (character-set) */ unsigned int lc; /* leading character (character-set) */
#else
uch hash; /* hash code */
#endif
size_t smultis; size_t smultis;
char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */ char *multis; /* -> char[smulti] ab\0cd\0ef\0\0 */
} cset; } cset;
/* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */ /* note that CHadd and CHsub are unsafe, and CHIN doesn't yield 0/1 */
#ifdef MULTIBYTE
#define CHlc(c) (((unsigned)(c)&0xff0000)>>16) #define CHlc(c) (((unsigned)(c)&0xff0000)>>16)
#define CHadd(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] |= (cs)->mask, (cs)->hash += (unsigned)(c)&0xffff,\ #define CHadd(cs, c) ((cs)->ptr[(unsigned)(c)&0xffff] |= (cs)->mask, (cs)->hash += (unsigned)(c)&0xffff,\
(cs)->lc = CHlc(c)) (cs)->lc = CHlc(c))
@ -135,15 +130,6 @@ typedef struct
* fns */ * fns */
#define MCsub(p, cs, cp) mcsub(p, cs, cp) #define MCsub(p, cs, cp) mcsub(p, cs, cp)
#define MCin(p, cs, cp) mcin(p, cs, cp) #define MCin(p, cs, cp) mcin(p, cs, cp)
#else
#define CHadd(cs, c) ((cs)->ptr[(uch)(c)] |= (cs)->mask, (cs)->hash += (c))
#define CHsub(cs, c) ((cs)->ptr[(uch)(c)] &= ~(cs)->mask, (cs)->hash -= (c))
#define CHIN(cs, c) ((cs)->ptr[(uch)(c)] & (cs)->mask)
#define MCadd(p, cs, cp) mcadd(p, cs, cp) /* regcomp() internal
* fns */
#define MCsub(p, cs, cp) mcsub(p, cs, cp)
#define MCin(p, cs, cp) mcin(p, cs, cp)
#endif
/* stuff for character categories */ /* stuff for character categories */
typedef unsigned char cat_t; typedef unsigned char cat_t;
@ -182,16 +168,7 @@ struct re_guts
}; };
/* misc utilities */ /* misc utilities */
#ifdef MULTIBYTE
#define OUT (16777216+1) /* 16777216 == 2^24 == 3 bytes */ #define OUT (16777216+1) /* 16777216 == 2^24 == 3 bytes */
#else
#define OUT (CHAR_MAX+1) /* a non-character value */
#endif
#ifdef MULTIBYTE
#define ISWORD(c) (((c) >= 0 && (c) <= UCHAR_MAX) && \ #define ISWORD(c) (((c) >= 0 && (c) <= UCHAR_MAX) && \
(isalnum((unsigned char) (c)) || (c) == '_')) (isalnum((unsigned char) (c)) || (c) == '_'))
#else
#define ISWORD(c) (isalnum((unsigned char) (c)) || (c) == '_')
#endif

4
src/include/regex/utils.h
Unescape View File

@ -46,11 +46,7 @@
#define DUPMAX 100000000 /* xxx is this right? */ #define DUPMAX 100000000 /* xxx is this right? */
#define INFINITY (DUPMAX + 1) #define INFINITY (DUPMAX + 1)
#ifdef MULTIBYTE
#define NC (SHRT_MAX - SHRT_MIN + 1) #define NC (SHRT_MAX - SHRT_MIN + 1)
#else
#define NC (CHAR_MAX - CHAR_MIN + 1)
#endif
typedef unsigned char uch; typedef unsigned char uch;

5
src/include/utils/ascii.h
Unescape View File

@ -2,7 +2,7 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
* ascii.h * ascii.h
* *
* $Id: ascii.h,v 1.8 2001/11/05 17:46:36 momjian Exp $ * $Id: ascii.h,v 1.9 2002/08/29 07:22:29 ishii Exp $
* *
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group * Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
* *
@ -18,10 +18,7 @@ extern Datum to_ascii_encname(PG_FUNCTION_ARGS);
extern Datum to_ascii_enc(PG_FUNCTION_ARGS); extern Datum to_ascii_enc(PG_FUNCTION_ARGS);
extern Datum to_ascii_default(PG_FUNCTION_ARGS); extern Datum to_ascii_default(PG_FUNCTION_ARGS);
#ifdef MULTIBYTE
extern char *pg_to_ascii(unsigned char *src, unsigned char *src_end, extern char *pg_to_ascii(unsigned char *src, unsigned char *src_end,
unsigned char *desc, int enc); unsigned char *desc, int enc);
#endif /* MULTIBYTE */
#endif /* _ASCII_H_ */ #endif /* _ASCII_H_ */

6
src/include/utils/builtins.h
Unescape View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: builtins.h,v 1.196 2002/08/29 00:17:06 tgl Exp $ * $Id: builtins.h,v 1.197 2002/08/29 07:22:29 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -661,9 +661,7 @@ extern Datum RI_FKey_setnull_upd(PG_FUNCTION_ARGS);
extern Datum RI_FKey_setdefault_del(PG_FUNCTION_ARGS); extern Datum RI_FKey_setdefault_del(PG_FUNCTION_ARGS);
extern Datum RI_FKey_setdefault_upd(PG_FUNCTION_ARGS); extern Datum RI_FKey_setdefault_upd(PG_FUNCTION_ARGS);
/* even if MULTIBYTE is not enabled, these functions are necessary /* multibyte support functions */
* since pg_proc.h has references to them.
*/
extern Datum getdatabaseencoding(PG_FUNCTION_ARGS); extern Datum getdatabaseencoding(PG_FUNCTION_ARGS);
extern Datum database_character_set(PG_FUNCTION_ARGS); extern Datum database_character_set(PG_FUNCTION_ARGS);
extern Datum pg_client_encoding(PG_FUNCTION_ARGS); extern Datum pg_client_encoding(PG_FUNCTION_ARGS);

25
src/interfaces/libpq/fe-connect.c
Unescape View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.197 2002/08/27 16:21:51 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.198 2002/08/29 07:22:29 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -45,9 +45,7 @@
#include <crypt.h> #include <crypt.h>
#endif #endif
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#ifdef WIN32 #ifdef WIN32
static int static int
@ -157,11 +155,9 @@ static const struct EnvironmentOptions
{ {
"PGTZ", "timezone" "PGTZ", "timezone"
}, },
#ifdef MULTIBYTE
{ {
"PGCLIENTENCODING", "client_encoding" "PGCLIENTENCODING", "client_encoding"
}, },
#endif
/* internal performance-related settings */ /* internal performance-related settings */
{ {
"PGGEQO", "geqo" "PGGEQO", "geqo"
@ -1584,12 +1580,7 @@ PQsetenvStart(PGconn *conn)
conn->setenv_state != SETENV_STATE_IDLE) conn->setenv_state != SETENV_STATE_IDLE)
return false; return false;
#ifdef MULTIBYTE
conn->setenv_state = SETENV_STATE_ENCODINGS_SEND; conn->setenv_state = SETENV_STATE_ENCODINGS_SEND;
#else
conn->setenv_state = SETENV_STATE_OPTION_SEND;
#endif
conn->next_eo = EnvironmentOptions; conn->next_eo = EnvironmentOptions;
return true; return true;
@ -1606,9 +1597,7 @@ PQsetenvPoll(PGconn *conn)
{ {
PGresult *res; PGresult *res;
#ifdef MULTIBYTE
static const char envname[] = "PGCLIENTENCODING"; static const char envname[] = "PGCLIENTENCODING";
#endif
if (conn == NULL || conn->status == CONNECTION_BAD) if (conn == NULL || conn->status == CONNECTION_BAD)
return PGRES_POLLING_FAILED; return PGRES_POLLING_FAILED;
@ -1617,9 +1606,7 @@ PQsetenvPoll(PGconn *conn)
switch (conn->setenv_state) switch (conn->setenv_state)
{ {
/* These are reading states */ /* These are reading states */
#ifdef MULTIBYTE
case SETENV_STATE_ENCODINGS_WAIT: case SETENV_STATE_ENCODINGS_WAIT:
#endif
case SETENV_STATE_OPTION_WAIT: case SETENV_STATE_OPTION_WAIT:
{ {
/* Load waiting data */ /* Load waiting data */
@ -1634,9 +1621,7 @@ PQsetenvPoll(PGconn *conn)
} }
/* These are writing states, so we just proceed. */ /* These are writing states, so we just proceed. */
#ifdef MULTIBYTE
case SETENV_STATE_ENCODINGS_SEND: case SETENV_STATE_ENCODINGS_SEND:
#endif
case SETENV_STATE_OPTION_SEND: case SETENV_STATE_OPTION_SEND:
break; break;
@ -1660,7 +1645,6 @@ keep_going: /* We will come back to here until there
switch (conn->setenv_state) switch (conn->setenv_state)
{ {
#ifdef MULTIBYTE
case SETENV_STATE_ENCODINGS_SEND: case SETENV_STATE_ENCODINGS_SEND:
{ {
const char *env; const char *env;
@ -1734,7 +1718,6 @@ keep_going: /* We will come back to here until there
conn->setenv_state = SETENV_STATE_OPTION_SEND; conn->setenv_state = SETENV_STATE_OPTION_SEND;
goto keep_going; goto keep_going;
} }
#endif
case SETENV_STATE_OPTION_SEND: case SETENV_STATE_OPTION_SEND:
{ {
@ -2788,9 +2771,6 @@ PQclientEncoding(const PGconn *conn)
int int
PQsetClientEncoding(PGconn *conn, const char *encoding) PQsetClientEncoding(PGconn *conn, const char *encoding)
{ {
#ifdef MULTIBYTE
char qbuf[128]; char qbuf[128];
static char query[] = "set client_encoding to '%s'"; static char query[] = "set client_encoding to '%s'";
PGresult *res; PGresult *res;
@ -2822,9 +2802,6 @@ PQsetClientEncoding(PGconn *conn, const char *encoding)
} }
PQclear(res); PQclear(res);
return (status); return (status);
#else
return -1; /* Multibyte support isn't compiled in */
#endif
} }
void void

23
src/interfaces/libpq/fe-misc.c
Unescape View File

@ -25,7 +25,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.77 2002/08/17 12:33:18 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.78 2002/08/29 07:22:30 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -50,10 +50,7 @@
#include "libpq-fe.h" #include "libpq-fe.h"
#include "libpq-int.h" #include "libpq-int.h"
#include "pqsignal.h" #include "pqsignal.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
#define DONOTICE(conn,message) \ #define DONOTICE(conn,message) \
((*(conn)->noticeHook) ((conn)->noticeArg, (message))) ((*(conn)->noticeHook) ((conn)->noticeArg, (message)))
@ -847,7 +844,6 @@ retry5:
* to be in fe-print.c but that file is doomed. * to be in fe-print.c but that file is doomed.
*/ */
#ifdef MULTIBYTE
/* /*
* returns the byte length of the word beginning s, using the * returns the byte length of the word beginning s, using the
* specified encoding. * specified encoding.
@ -873,23 +869,6 @@ PQenv2encoding(void)
return (encoding); return (encoding);
} }
#else
/* Provide a default definition in case someone calls it anyway */
int
PQmblen(const unsigned char *s, int encoding)
{
(void) s;
(void) encoding;
return 1;
}
int
PQenv2encoding(void)
{
return 0;
}
#endif /* MULTIBYTE */
#ifdef ENABLE_NLS #ifdef ENABLE_NLS
char * char *

6
src/interfaces/libpq/fe-print.c
Unescape View File

@ -10,7 +10,7 @@
* didn't really belong there. * didn't really belong there.
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.45 2002/06/20 20:29:54 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.46 2002/08/29 07:22:30 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -352,11 +352,7 @@ do_field(const PQprintOpt *po, const PGresult *res,
/* Detect whether field contains non-numeric data */ /* Detect whether field contains non-numeric data */
char ch = '0'; char ch = '0';
#ifdef MULTIBYTE
for (p = pval; *p; p += PQmblen(p, res->client_encoding)) for (p = pval; *p; p += PQmblen(p, res->client_encoding))
#else
for (p = pval; *p; p++)
#endif
{ {
ch = *p; ch = *p;
if (!((ch >= '0' && ch <= '9') || if (!((ch >= '0' && ch <= '9') ||

8
src/pl/plpgsql/src/pl_funcs.c
Unescape View File

@ -3,7 +3,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.19 2002/08/08 01:36:05 tgl Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.20 2002/08/29 07:22:30 ishii Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -46,9 +46,7 @@
#include "plpgsql.h" #include "plpgsql.h"
#include "pl.tab.h" #include "pl.tab.h"
#ifdef MULTIBYTE
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#endif
/* ---------- /* ----------
@ -404,11 +402,7 @@ plpgsql_convert_ident(const char *s, char **output, int numidents)
{ {
int len; int len;
#ifdef MULTIBYTE
len = pg_mbcliplen(curident, i, NAMEDATALEN-1); len = pg_mbcliplen(curident, i, NAMEDATALEN-1);
#else
len = NAMEDATALEN-1;
#endif
curident[len] = '\0'; curident[len] = '\0';
} }

Write Preview
Loading…
Cancel
Save