mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-17 19:30:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert recent commit re positional arguments.

Browse Source
This commit is contained in:
Andrew Dunstan 2012-04-18 10:58:01 -04:00
parent 4fd49c7336
commit 5969ee4df7
6 changed files with 38 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/initdb/initdb.c
View File

@ -2563,11 +2563,8 @@ main(int argc, char *argv[])
}
/*
* Non-option argument specifies data directory
* as long as it wasn't already specified with -D / --pgdata
*/
if (optind < argc && strlen(pg_data) == 0)
/* Non-option argument specifies data directory */
if (optind < argc)
{
pg_data = xstrdup(argv[optind]);
optind++;

26
src/bin/scripts/clusterdb.c
View File

@ -106,22 +106,18 @@ main(int argc, char *argv[])
}
}
/*
* Non-option argument specifies database name
* as long as it wasn't already specified with -d / --dbname
*/
if (optind < argc && dbname == NULL)
switch (argc - optind)
{
dbname = argv[optind];
optind++;
}
if (optind < argc)
{
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
case 0:
break;
case 1:
dbname = argv[optind];
break;
default:
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
setup_cancel_handler();

14
src/bin/scripts/createlang.c
View File

@ -91,24 +91,14 @@ main(int argc, char *argv[])
}
}
/*
* We set dbname from positional arguments if it is not
* already set by option arguments -d. If not doing
* listlangs, positional dbname must follow positional
* langname.
*/
if (argc - optind > 0)
{
if (listlangs)
{
if (dbname == NULL)
dbname = argv[optind++];
}
dbname = argv[optind++];
else
{
langname = argv[optind++];
if (argc - optind > 0 && dbname == NULL)
if (argc - optind > 0)
dbname = argv[optind++];
}
}

14
src/bin/scripts/droplang.c
View File

@ -102,24 +102,14 @@ main(int argc, char *argv[])
}
}
/*
* We set dbname from positional arguments if it is not
* already set by option arguments -d. If not doing
* listlangs, positional dbname must follow positional
* langname.
*/
if (argc - optind > 0)
{
if (listlangs)
{
if (dbname == NULL)
dbname = argv[optind++];
}
dbname = argv[optind++];
else
{
langname = argv[optind++];
if (argc - optind > 0 && dbname == NULL)
if (argc - optind > 0)
dbname = argv[optind++];
}
}

25
src/bin/scripts/reindexdb.c
View File

@ -116,22 +116,17 @@ main(int argc, char *argv[])
}
}
/*
* Non-option argument specifies database name
* as long as it wasn't already specified with -d / --dbname
*/
if (optind < argc && dbname == NULL)
switch (argc - optind)
{
dbname = argv[optind];
optind++;
}
if (optind < argc)
{
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
case 0:
break;
case 1:
dbname = argv[optind];
break;
default:
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"), progname, argv[optind + 1]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
setup_cancel_handler();

27
src/bin/scripts/vacuumdb.c
View File

@ -129,23 +129,18 @@ main(int argc, char *argv[])
}
}
/*
* Non-option argument specifies database name
* as long as it wasn't already specified with -d / --dbname
*/
if (optind < argc && dbname == NULL)
switch (argc - optind)
{
dbname = argv[optind];
optind++;
}
if (optind < argc)
{
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
case 0:
break;
case 1:
dbname = argv[optind];
break;
default:
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind + 1]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1);
}
if (analyze_only)