database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-31 22:04:40 +03:00
Code Activity

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

Browse Source 
Report by Pavel Raiskup
This commit is contained in:
Bruce Momjian
2014-08-25 16:30:26 -04:00
parent bf1c866597
commit ebe30ad59b
5 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/pg_upgrade/option.c
View File

@ -137,17 +137,35 @@ parseCommandLine(int argc, char *argv[])
break;
case 'o':
old_cluster.pgopts = pg_strdup(optarg);
/* append option? */
if (!old_cluster.pgopts)
old_cluster.pgopts = pg_strdup(optarg);
else
{
char *old_pgopts = old_cluster.pgopts;
old_cluster.pgopts = psprintf("%s %s", old_pgopts, optarg);
free(old_pgopts);
}
break;
case 'O':
new_cluster.pgopts = pg_strdup(optarg);
/* append option? */
if (!new_cluster.pgopts)
new_cluster.pgopts = pg_strdup(optarg);
else
{
char *new_pgopts = new_cluster.pgopts;
new_cluster.pgopts = psprintf("%s %s", new_pgopts, optarg);
free(new_pgopts);
}
break;
/*
* Someday, the port number option could be removed and passed
* using -o/-O, but that requires postmaster -C to be
* supported on all old/new versions.
* supported on all old/new versions (added in PG 9.2).
*/
case 'p':
if ((old_cluster.port = atoi(optarg)) <= 0)