NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitebe30ad

committed

pg_ctl, pg_upgrade: allow multiple -o/-O options, append them

Report by Pavel Raiskup

1 parentbf1c866 commitebe30adCopy full SHA for ebe30ad

File tree

5 files changed

+39

-8

lines changed

contrib/pg_upgrade
- option.c
doc/src/sgml
- pgupgrade.sgml
- ref
  - pg_ctl-ref.sgml
  - postgres-ref.sgml
src/bin/pg_ctl
- pg_ctl.c

5 files changed

+39

-8

lines changed

`‎contrib/pg_upgrade/option.c`

Lines changed: 21 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,17 +137,35 @@ parseCommandLine(int argc, char *argv[])`
`137`	`137`	`break;`
`138`	`138`
`139`	`139`	`case'o':`
`140`		`-old_cluster.pgopts=pg_strdup(optarg);`
	`140`	`+/* append option? */`
	`141`	`+if (!old_cluster.pgopts)`
	`142`	`+old_cluster.pgopts=pg_strdup(optarg);`
	`143`	`+else`
	`144`	`+{`
	`145`	`+char*old_pgopts=old_cluster.pgopts;`
	`146`	`+`
	`147`	`+old_cluster.pgopts=psprintf("%s %s",old_pgopts,optarg);`
	`148`	`+free(old_pgopts);`
	`149`	`+}`
`141`	`150`	`break;`
`142`	`151`
`143`	`152`	`case'O':`
`144`		`-new_cluster.pgopts=pg_strdup(optarg);`
	`153`	`+/* append option? */`
	`154`	`+if (!new_cluster.pgopts)`
	`155`	`+new_cluster.pgopts=pg_strdup(optarg);`
	`156`	`+else`
	`157`	`+{`
	`158`	`+char*new_pgopts=new_cluster.pgopts;`
	`159`	`+`
	`160`	`+new_cluster.pgopts=psprintf("%s %s",new_pgopts,optarg);`
	`161`	`+free(new_pgopts);`
	`162`	`+}`
`145`	`163`	`break;`
`146`	`164`
`147`	`165`	`/*`
`148`	`166`	`* Someday, the port number option could be removed and passed`
`149`	`167`	`* using -o/-O, but that requires postmaster -C to be`
`150`		`- * supported on all old/new versions.`
	`168`	`+ * supported on all old/new versions (added in PG 9.2).`
`151`	`169`	`*/`
`152`	`170`	`case'p':`
`153`	`171`	`if ((old_cluster.port=atoi(optarg)) <=0)`

`‎doc/src/sgml/pgupgrade.sgml`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -130,14 +130,16 @@`
`130`	`130`	`<term><option>-o</option> <replaceable class="parameter">options</replaceable></term>`
`131`	`131`	`<term><option>--old-options</option> <replaceable class="parameter">options</replaceable></term>`
`132`	`132`	`<listitem><para>options to be passed directly to the`
`133`		`- old <command>postgres</command> command</para></listitem>`
	`133`	`+ old <command>postgres</command> command; multiple`
	`134`	`+ option invocations are appended</para></listitem>`
`134`	`135`	`</varlistentry>`
`135`	`136`
`136`	`137`	`<varlistentry>`
`137`	`138`	`<term><option>-O</option> <replaceable class="parameter">options</replaceable></term>`
`138`	`139`	`<term><option>--new-options</option> <replaceable class="parameter">options</replaceable></term>`
`139`	`140`	`<listitem><para>options to be passed directly to the`
`140`		`- new <command>postgres</command> command</para></listitem>`
	`141`	`+ new <command>postgres</command> command; multiple`
	`142`	`+ option invocations are appended</para></listitem>`
`141`	`143`	`</varlistentry>`
`142`	`144`
`143`	`145`	`<varlistentry>`

`‎doc/src/sgml/ref/pg_ctl-ref.sgml`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,8 @@ PostgreSQL documentation`
`302`	`302`	`<listitem>`
`303`	`303`	`<para>`
`304`	`304`	`Specifies options to be passed directly to the`
`305`		`- <command>postgres</command> command.`
	`305`	`+ <command>postgres</command> command; multiple`
	`306`	`+ option invocations are appended.`
`306`	`307`	`</para>`
`307`	`308`	`<para>`
`308`	`309`	`The options should usually be surrounded by single or double`

`‎doc/src/sgml/ref/postgres-ref.sgml`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,8 @@ PostgreSQL documentation`
`288`	`288`	`class="parameter">extra-options</replaceable> are passed to`
`289`	`289`	`all server processes started by this`
`290`	`290`	`<command>postgres</command> process. If the option string contains`
`291`		`- any spaces, the entire string must be quoted.`
	`291`	`+ any spaces, the entire string must be quoted; multiple`
	`292`	`+ option invocations are appended.`
`292`	`293`	`</para>`
`293`	`294`
`294`	`295`	`<para>`

`‎src/bin/pg_ctl/pg_ctl.c`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2184,7 +2184,16 @@ main(int argc, char **argv)`
`2184`	`2184`	`register_servicename=pg_strdup(optarg);`
`2185`	`2185`	`break;`
`2186`	`2186`	`case'o':`
`2187`		`-post_opts=pg_strdup(optarg);`
	`2187`	`+/* append option? */`
	`2188`	`+if (!post_opts)`
	`2189`	`+post_opts=pg_strdup(optarg);`
	`2190`	`+else`
	`2191`	`+{`
	`2192`	`+char*old_post_opts=post_opts;`
	`2193`	`+`
	`2194`	`+post_opts=psprintf("%s %s",old_post_opts,optarg);`
	`2195`	`+free(old_post_opts);`
	`2196`	`+}`
`2188`	`2197`	`break;`
`2189`	`2198`	`case'p':`
`2190`	`2199`	`exec_path=pg_strdup(optarg);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitebe30ad

File tree

5 files changed

5 files changed

`‎contrib/pg_upgrade/option.c`

`‎doc/src/sgml/pgupgrade.sgml`

`‎doc/src/sgml/ref/pg_ctl-ref.sgml`

`‎doc/src/sgml/ref/postgres-ref.sgml`

`‎src/bin/pg_ctl/pg_ctl.c`

0 commit comments