rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-10-01 19:11:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove undocumented -h (help) option

Browse Source 
The -h option was not supported by many tools, and not documented, so
remove them for consistency from pg_upgrade, pg_test_fsync, and
pg_test_timing.
This commit is contained in:
Bruce Momjian 2013-07-01 12:40:02 -04:00
parent 031cc55bbe
commit 06b804377c
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/pg_test_fsync/pg_test_fsync.c
View File

@ -146,8 +146,7 @@ handle_args(int argc, char *argv[])
if (argc > 1) if (argc > 1)
{ {
if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 || if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
strcmp(argv[1], "-?") == 0)
{ {
printf("Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n", progname); printf("Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n", progname);
exit(0); exit(0);

3
contrib/pg_test_timing/pg_test_timing.c
View File

@ -49,8 +49,7 @@ handle_args(int argc, char *argv[])
if (argc > 1) if (argc > 1)
{ {
if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 || if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
strcmp(argv[1], "-?") == 0)
{ {
printf("Usage: %s [-d DURATION]\n", progname); printf("Usage: %s [-d DURATION]\n", progname);
exit(0); exit(0);

5
src/bin/pg_ctl/pg_ctl.c
View File

@ -2002,13 +2002,12 @@ main(int argc, char **argv)
/* support --help and --version even if invoked as root */ /* support --help and --version even if invoked as root */
if (argc > 1) if (argc > 1)
{ {
if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
strcmp(argv[1], "-?") == 0)
{ {
do_help(); do_help();
exit(0); exit(0);
} }
else if (strcmp(argv[1], "-V") == 0 || strcmp(argv[1], "--version") == 0) else if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
{ {
puts("pg_ctl (PostgreSQL) " PG_VERSION); puts("pg_ctl (PostgreSQL) " PG_VERSION);
exit(0); exit(0);

2
src/bin/psql/startup.c
View File

@ -558,7 +558,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
break; break;
case '?': case '?':
/* Actual help option given */ /* Actual help option given */
if (strcmp(argv[optind - 1], "-?") == 0 || strcmp(argv[optind - 1], "--help") == 0) if (strcmp(argv[optind - 1], "--help") == 0 || strcmp(argv[optind - 1], "-?") == 0)
{ {
usage(); usage();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);