Commit9d77708

committed

Cleanup on --help-config: Now called --describe-config, no further options,

machine readable, without headers, not sorted. Parameter descriptionsadjusted to fit first sentence + rest convention.

1 parente341cdb commit9d77708Copy full SHA for 9d77708

File tree

+164

-445

lines changed

+164

-445

lines changed

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.64 2003/09/27 09:29:31 petere Exp $`
	`16`	`+ * $Header: /cvsroot/pgsql/src/backend/main/main.c,v 1.65 2003/10/18 22:59:08 petere Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -222,12 +222,11 @@ main(int argc, char *argv[])`
`222`	`222`	`exit(BootstrapMain(argc-1,new_argv+1));`
`223`	`223`
`224`	`224`	`/*`
`225`		`- * If the first argument is "--help-config", then invoke runtime`
`226`		`- * configuration option display mode. We remove "--help-config" from`
`227`		`- * the arguments passed on to GucInfoMain.`
	`225`	`+ * If the first argument is "--describe-config", then invoke runtime`
	`226`	`+ * configuration option display mode.`
`228`	`227`	`*/`
`229`		`-if (argc>1&&strcmp(new_argv[1],"--help-config")==0)`
`230`		`-exit(GucInfoMain(argc,new_argv));`
	`228`	`+if (argc>1&&strcmp(new_argv[1],"--describe-config")==0)`
	`229`	`+exit(GucInfoMain());`
`231`	`230`
`232`	`231`	`/*`
`233`	`232`	`* Otherwise we're a standalone backend. Invoke PostgresMain,`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.373 2003/10/16 16:50:41 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.374 2003/10/18 22:59:08 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* this is the "main" module of the postgres backend and`
`@@ -1989,8 +1989,7 @@ usage(char *progname)`
`1989`	`1989`	`printf(gettext(" -P disable system indexes\n"));`
`1990`	`1990`	`printf(gettext(" -s show statistics after each query\n"));`
`1991`	`1991`	`printf(gettext(" -S SORT-MEM set amount of memory for sorts (in kbytes)\n"));`
`1992`		`-printf(gettext(" --help-config show configuration parameters, then exit;\n"`
`1993`		`-" details: --help-config -h\n"));`
	`1992`	`+printf(gettext(" --describe-config describe configuration parameters, then exit\n"));`
`1994`	`1993`	`printf(gettext(" --help show this help, then exit\n"));`
`1995`	`1994`	`printf(gettext(" --version output version information, then exit\n"));`
`1996`	`1995`	`printf(gettext("\nDeveloper options:\n"));`
`@@ -2660,7 +2659,7 @@ PostgresMain(int argc, char argv[], const char username)`
`2660`	`2659`	`if (!IsUnderPostmaster)`
`2661`	`2660`	`{`
`2662`	`2661`	`puts("\nPOSTGRES backend interactive interface ");`
`2663`		`-puts("$Revision: 1.373 $ $Date: 2003/10/16 16:50:41 $\n");`
	`2662`	`+puts("$Revision: 1.374 $ $Date: 2003/10/18 22:59:08 $\n");`
`2664`	`2663`	`}`
`2665`	`2664`
`2666`	`2665`	`/*`

Comments

(0)