database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-11 05:41:32 +03:00
Code

Complain if too many options are passed to pg_controldata or pg_resetxlog.

Browse Source
This commit is contained in:
Heikki Linnakangas 2014-10-24 18:59:08 +03:00
parent 22b743b2ca
commit 2d53003432
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/pg_controldata/pg_controldata.c
View File

@ -142,6 +142,16 @@ main(int argc, char *argv[])
DataDir = getenv("PGDATA"); DataDir = getenv("PGDATA");
} }
/* Complain if any arguments remain */
if (optind < argc)
{
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
exit(1);
}
if (DataDir == NULL) if (DataDir == NULL)
{ {
fprintf(stderr, _("%s: no data directory specified\n"), progname); fprintf(stderr, _("%s: no data directory specified\n"), progname);

17
src/bin/pg_resetxlog/pg_resetxlog.c
View File

@ -237,14 +237,25 @@ main(int argc, char *argv[])
} }
} }
if (DataDir == NULL && optind == argc) if (DataDir == NULL && optind < argc)
DataDir = argv[optind++];
/* Complain if any arguments remain */
if (optind < argc)
{
fprintf(stderr, _("%s: too many command-line arguments (first is \"%s\")\n"),
progname, argv[optind]);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
progname);
exit(1);
}
if (DataDir == NULL)
{ {
fprintf(stderr, _("%s: no data directory specified\n"), progname); fprintf(stderr, _("%s: no data directory specified\n"), progname);
fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
exit(1); exit(1);
} }
if (DataDir == NULL)
DataDir = argv[optind];
/* /*
* Don't allow pg_resetxlog to be run as root, to avoid overwriting the * Don't allow pg_resetxlog to be run as root, to avoid overwriting the