Remove undocumented -h (help) option

bmomjian · bmomjian · commit 06b804377cc5 · 2013-07-01T12:40:33.000-04:00
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.
diff --git a/contrib/pg_test_fsync/pg_test_fsync.c b/contrib/pg_test_fsync/pg_test_fsync.c
@@ -146,8 +146,7 @@ handle_args(int argc, char *argv[])
 
 	if (argc > 1)
 	{
-		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ||
-			strcmp(argv[1], "-?") == 0)
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
 		{
 			printf("Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n", progname);
 			exit(0);
diff --git a/contrib/pg_test_timing/pg_test_timing.c b/contrib/pg_test_timing/pg_test_timing.c
@@ -49,8 +49,7 @@ handle_args(int argc, char *argv[])
 
 	if (argc > 1)
 	{
-		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 ||
-			strcmp(argv[1], "-?") == 0)
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
 		{
 			printf("Usage: %s [-d DURATION]\n", progname);
 			exit(0);
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -2002,13 +2002,12 @@ main(int argc, char **argv)
 	/* support --help and --version even if invoked as root */
 	if (argc > 1)
 	{
-		if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 ||
-			strcmp(argv[1], "-?") == 0)
+		if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0)
 		{
 			do_help();
 			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);
 			exit(0);
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
@@ -558,7 +558,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts * options)
 				break;
 			case '?':
 				/* 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();
 					exit(EXIT_SUCCESS);

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,7 @@ handle_args(int argc, char *argv[])`
`146`	`146`
`147`	`147`	`if (argc > 1)`
`148`	`148`	`{`
`149`		`- if (strcmp(argv[1], "--help") == 0 \|\| strcmp(argv[1], "-h") == 0 \|\|`
`150`		`- strcmp(argv[1], "-?") == 0)`
	`149`	`+ if (strcmp(argv[1], "--help") == 0 \|\| strcmp(argv[1], "-?") == 0)`
`151`	`150`	`{`
`152`	`151`	`printf("Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n", progname);`
`153`	`152`	`exit(0);`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ handle_args(int argc, char *argv[])`
`49`	`49`
`50`	`50`	`if (argc > 1)`
`51`	`51`	`{`
`52`		`- if (strcmp(argv[1], "--help") == 0 \|\| strcmp(argv[1], "-h") == 0 \|\|`
`53`		`- strcmp(argv[1], "-?") == 0)`
	`52`	`+ if (strcmp(argv[1], "--help") == 0 \|\| strcmp(argv[1], "-?") == 0)`
`54`	`53`	`{`
`55`	`54`	`printf("Usage: %s [-d DURATION]\n", progname);`
`56`	`55`	`exit(0);`
Original file line number	Diff line number	Diff line change
`@@ -2002,13 +2002,12 @@ main(int argc, char **argv)`
`2002`	`2002`	`/* support --help and --version even if invoked as root */`
`2003`	`2003`	`if (argc > 1)`
`2004`	`2004`	`{`
`2005`		`- if (strcmp(argv[1], "-h") == 0 \|\| strcmp(argv[1], "--help") == 0 \|\|`
`2006`		`- strcmp(argv[1], "-?") == 0)`
	`2005`	`+ if (strcmp(argv[1], "--help") == 0 \|\| strcmp(argv[1], "-?") == 0)`
`2007`	`2006`	`{`
`2008`	`2007`	`do_help();`
`2009`	`2008`	`exit(0);`
`2010`	`2009`	`}`
`2011`		`- else if (strcmp(argv[1], "-V") == 0 \|\| strcmp(argv[1], "--version") == 0)`
	`2010`	`+ else if (strcmp(argv[1], "--version") == 0 \|\| strcmp(argv[1], "-V") == 0)`
`2012`	`2011`	`{`
`2013`	`2012`	`puts("pg_ctl (PostgreSQL) " PG_VERSION);`
`2014`	`2013`	`exit(0);`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ parse_psql_options(int argc, char argv[], struct adhoc_opts options)`
`558`	`558`	`break;`
`559`	`559`	`case '?':`
`560`	`560`	`/* Actual help option given */`
`561`		`- if (strcmp(argv[optind - 1], "-?") == 0 \|\| strcmp(argv[optind - 1], "--help") == 0)`
	`561`	`+ if (strcmp(argv[optind - 1], "--help") == 0 \|\| strcmp(argv[optind - 1], "-?") == 0)`
`562`	`562`	`{`
`563`	`563`	`usage();`
`564`	`564`	`exit(EXIT_SUCCESS);`