Commit 0e887c54 authored by Marc G. Fournier's avatar Marc G. Fournier

reversed bruces patch to getopt() loop about optarg

submitted by: bruce
parent 4b3cb031
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.11 1996/07/28 06:48:42 julian Exp $ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.12 1996/07/28 06:59:43 scrappy Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -1148,28 +1148,28 @@ main(int argc, char** argv) ...@@ -1148,28 +1148,28 @@ main(int argc, char** argv)
fe_setauthsvc(optarg, errbuf); fe_setauthsvc(optarg, errbuf);
break; break;
case 'c': case 'c':
singleQuery = dupstr(optarg); singleQuery = optarg;
if ( singleQuery[0] == '\\' ) { if ( singleQuery[0] == '\\' ) {
singleSlashCmd=1; singleSlashCmd=1;
} }
break; break;
case 'd': case 'd':
dbname = dupstr(optarg); dbname = optarg;
break; break;
case 'e': case 'e':
settings.echoQuery = 1; settings.echoQuery = 1;
break; break;
case 'f': case 'f':
qfilename = dupstr(optarg); qfilename = optarg;
break; break;
case 'F': case 'F':
settings.opt.fieldSep=dupstr(optarg); settings.opt.fieldSep=optarg;
break; break;
case 'l': case 'l':
listDatabases = 1; listDatabases = 1;
break; break;
case 'h': case 'h':
host = dupstr(optarg); host = optarg;
break; break;
case 'H': case 'H':
settings.opt.html3 = 1; settings.opt.html3 = 1;
...@@ -1181,7 +1181,7 @@ main(int argc, char** argv) ...@@ -1181,7 +1181,7 @@ main(int argc, char** argv)
setFout(&settings, optarg); setFout(&settings, optarg);
break; break;
case 'p': case 'p':
port = dupstr(optarg); port = optarg;
break; break;
case 'q': case 'q':
settings.quiet = 1; settings.quiet = 1;
...@@ -1196,7 +1196,7 @@ main(int argc, char** argv) ...@@ -1196,7 +1196,7 @@ main(int argc, char** argv)
settings.opt.header = 0; settings.opt.header = 0;
break; break;
case 'T': case 'T':
settings.opt.tableOpt = dupstr(optarg); settings.opt.tableOpt = optarg;
break; break;
case 'x': case 'x':
settings.opt.expanded = 0; settings.opt.expanded = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment