Various fixes required for psql
Submitted by: Bruce
This commit is contained in:
parent
edb519b14c
commit
64b130a8e7
@ -7,7 +7,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.9 1996/07/27 02:55:11 scrappy Exp $
|
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.10 1996/07/27 04:38:22 scrappy Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -1111,10 +1111,10 @@ main(int argc, char** argv)
|
|||||||
extern char* optarg;
|
extern char* optarg;
|
||||||
extern int optind;
|
extern int optind;
|
||||||
|
|
||||||
char* dbname = (char *)NULL;
|
char* dbname = NULL;
|
||||||
char* host = (char *)NULL;
|
char* host = NULL;
|
||||||
char* port = (char *)NULL;
|
char* port = NULL;
|
||||||
char* qfilename = (char *)NULL;
|
char* qfilename = NULL;
|
||||||
char errbuf[ERROR_MSG_LENGTH];
|
char errbuf[ERROR_MSG_LENGTH];
|
||||||
|
|
||||||
PsqlSettings settings;
|
PsqlSettings settings;
|
||||||
@ -1148,19 +1148,19 @@ main(int argc, char** argv)
|
|||||||
fe_setauthsvc(optarg, errbuf);
|
fe_setauthsvc(optarg, errbuf);
|
||||||
break;
|
break;
|
||||||
case 'c':
|
case 'c':
|
||||||
singleQuery = optarg;
|
singleQuery = dupstr(optarg);
|
||||||
if ( singleQuery[0] == '\\' ) {
|
if ( singleQuery[0] == '\\' ) {
|
||||||
singleSlashCmd=1;
|
singleSlashCmd=1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'd':
|
case 'd':
|
||||||
dbname = optarg;
|
dbname = dupstr(optarg);
|
||||||
break;
|
break;
|
||||||
case 'e':
|
case 'e':
|
||||||
settings.echoQuery = 1;
|
settings.echoQuery = 1;
|
||||||
break;
|
break;
|
||||||
case 'f':
|
case 'f':
|
||||||
qfilename = optarg;
|
qfilename = dupstr(optarg);
|
||||||
break;
|
break;
|
||||||
case 'F':
|
case 'F':
|
||||||
settings.opt.fieldSep=dupstr(optarg);
|
settings.opt.fieldSep=dupstr(optarg);
|
||||||
@ -1169,7 +1169,7 @@ main(int argc, char** argv)
|
|||||||
listDatabases = 1;
|
listDatabases = 1;
|
||||||
break;
|
break;
|
||||||
case 'h':
|
case 'h':
|
||||||
host = optarg;
|
host = dupstr(optarg);
|
||||||
break;
|
break;
|
||||||
case 'H':
|
case 'H':
|
||||||
settings.opt.html3 = 1;
|
settings.opt.html3 = 1;
|
||||||
@ -1181,7 +1181,7 @@ main(int argc, char** argv)
|
|||||||
setFout(&settings, optarg);
|
setFout(&settings, optarg);
|
||||||
break;
|
break;
|
||||||
case 'p':
|
case 'p':
|
||||||
port = optarg;
|
port = dupstr(optarg);
|
||||||
break;
|
break;
|
||||||
case 'q':
|
case 'q':
|
||||||
settings.quiet = 1;
|
settings.quiet = 1;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user