mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for \encoding command.

Browse Source 
1) freeing null pointer
	2) invalid encoding info may be stored into psql variable
	3) fix indentation
This commit is contained in:
Tatsuo Ishii 2000-02-21 02:05:12 +00:00
parent f72aad5678
commit 320d3e06ee
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bin/psql/command.c
View File

@ -3,7 +3,7 @@
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* *
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.22 2000/02/20 14:28:20 petere Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.23 2000/02/21 02:05:12 ishii Exp $
*/ */
#include "postgres.h" #include "postgres.h"
#include "command.h" #include "command.h"
@ -354,28 +354,33 @@ exec_command(const char *cmd,
fputs("\n", fout); fputs("\n", fout);
} }
/* \encoding -- set client side encoding */ /* \encoding -- set/show client side encoding */
else if (strcmp(cmd, "encoding") == 0) else if (strcmp(cmd, "encoding") == 0)
{ {
char *encoding = scan_option(&string, OT_NORMAL, NULL); char *encoding = scan_option(&string, OT_NORMAL, NULL);
if (!encoding) if (!encoding)
/* show encoding */
puts(pg_encoding_to_char(pset.encoding)); puts(pg_encoding_to_char(pset.encoding));
else else
{ {
#ifdef MULTIBYTE #ifdef MULTIBYTE
/* set encoding */
if (PQsetClientEncoding(pset.db, encoding) == -1) if (PQsetClientEncoding(pset.db, encoding) == -1)
psql_error("%s: invalid encoding name\n", encoding); psql_error("%s: invalid encoding name\n", encoding);
else
{
/* save encoding info into psql internal data */ /* save encoding info into psql internal data */
pset.encoding = PQclientEncoding(pset.db); pset.encoding = PQclientEncoding(pset.db);
SetVariable(pset.vars, "ENCODING", pg_encoding_to_char(pset.encoding)); SetVariable(pset.vars, "ENCODING", pg_encoding_to_char(pset.encoding));
}
#else #else
psql_error("\\%s: multi-byte support is not enabled\n", cmd); psql_error("\\%s: multi-byte support is not enabled\n", cmd);
#endif #endif
}
free(encoding); free(encoding);
} }
}
/* \f -- change field separator */ /* \f -- change field separator */
else if (strcmp(cmd, "f") == 0) else if (strcmp(cmd, "f") == 0)