diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1999-01-27 01:18:23 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1999-01-27 01:18:23 +0000 |
| commit | 2ae5d51668a4599427a801da62313584ab565c38 (patch) | |
| tree | f77d6bf5d0663e426839802c5af177018bdce8c4 /src/interfaces/libpq | |
| parent | e27f8791f921d2a91a38ae329df88ceb4881d5ed (diff) | |
| download | postgresql-2ae5d51668a4599427a801da62313584ab565c38.tar.gz postgresql-2ae5d51668a4599427a801da62313584ab565c38.zip | |
From: Tatsuo Ishii <t-ishii@sra.co.jp>
Included patches fix a portability problem of unsetenv() used in
6.4.2 multi-byte support. unsetenv() is only avaliable on FreeBSD and
Linux so I decided to replace with putenv().
Diffstat (limited to 'src/interfaces/libpq')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-print.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 4c5f70035ae..f3608612247 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.88 1999/01/17 06:19:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.89 1999/01/27 01:18:22 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -816,7 +816,7 @@ PQsetenv(PGconn *conn) #ifdef MULTIBYTE /* query server encoding */ env = getenv(envname); - if (!env) + if (!env || *env == NULL) { rtn = PQexec(conn, "select getdatabaseencoding()"); if (rtn && PQresultStatus(rtn) == PGRES_TUPLES_OK) diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c index 08e111310ac..a99fc27ba26 100644 --- a/src/interfaces/libpq/fe-print.c +++ b/src/interfaces/libpq/fe-print.c @@ -9,7 +9,7 @@ * didn't really belong there. * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.15 1998/10/06 14:16:50 tgl Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.16 1999/01/27 01:18:23 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -506,7 +506,7 @@ PQmblen(unsigned char *s) int encoding = -1; str = getenv("PGCLIENTENCODING"); - if (str) + if (str && *str != NULL) encoding = pg_char_to_encoding(str); if (encoding < 0) encoding = MULTIBYTE; |