database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-24 14:22:24 +03:00
Code Activity

Eliminate using putenv().

Browse Source
This commit is contained in:
Tatsuo Ishii
2000-01-15 05:37:21 +00:00
parent 6095e36cca
commit 8fc386a2d8
4 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/interfaces/libpq/fe-print.c
View File

@ -9,7 +9,7 @@
* didn't really belong there.
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.28 1999/11/11 00:10:14 momjian Exp $
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.29 2000/01/15 05:37:21 ishii Exp $
*
*-------------------------------------------------------------------------
*/
@ -498,27 +498,39 @@ PQprintTuples(const PGresult *res,
* the backend is assumed.
*/
int
PQmblen(const unsigned char *s)
PQmblen(const unsigned char *s, int encoding)
{
return (pg_encoding_mblen(encoding, s));
}
/*
* Get encoding id from environment variable PGCLIENTENCODING.
*/
int
PQenv2encoding(void)
{
char *str;
int encoding = -1;
int encoding = SQL_ASCII;
str = getenv("PGCLIENTENCODING");
if (str && *str != '\0')
encoding = pg_char_to_encoding(str);
if (encoding < 0)
encoding = MULTIBYTE;
return (pg_encoding_mblen(encoding, s));
return(encoding);
}
#else
/* Provide a default definition in case someone calls it anyway */
int
PQmblen(const unsigned char *s)
PQmblen(const unsigned char *s, int encoding)
{
return 1;
}
int
PQenv2encoding(void)
{
return 0;
}
#endif /* MULTIBYTE */
@ -560,7 +572,7 @@ do_field(const PQprintOpt *po, const PGresult *res,
char ch = '0';
#ifdef MULTIBYTE
for (p = pval; *p; p += PQmblen(p))
for (p = pval; *p; p += PQmblen(p, PQclientencoding(res->conn)))
#else
for (p = pval; *p; p++)
#endif