rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 'pg_ctl restart' to preserve command-line arguments.

This commit is contained in:
Bruce Momjian 2008-06-26 02:47:19 +00:00
parent a1183238be
commit 067f1e5fa8
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/postmaster/postmaster.c
View File

@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.560 2008/06/26 01:35:45 momjian Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.561 2008/06/26 02:47:19 momjian Exp $
*
* NOTES
*
@ -4184,7 +4184,7 @@ CreateOptsFile(int argc, char *argv[], char *fullprogname)
fprintf(fp, "%s", fullprogname);
for (i = 1; i < argc; i++)
fprintf(fp, " " SYSTEMQUOTE "%s" SYSTEMQUOTE, argv[i]);
fprintf(fp, " \"%s\"", argv[i]);
fputs("\n", fp);
if (fclose(fp))

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

@ -4,7 +4,7 @@
*
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.100 2008/06/26 01:35:45 momjian Exp $
* $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.101 2008/06/26 02:47:19 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -573,11 +573,11 @@ read_post_opts(void)
{
if (post_opts == NULL)
{
char **optlines;
post_opts = ""; /* defatult */
if (ctl_command == RESTART_COMMAND)
{
char **optlines;
optlines = readfile(postopts_file);
if (optlines == NULL)
{
@ -593,20 +593,26 @@ read_post_opts(void)
else
{
int len;
char *optline = NULL;
char *optline;
char *arg1;
optline = optlines[0];
/* trim off line endings */
len = strcspn(optline, "\r\n");
optline[len] = '\0';
arg1 = strchr(optline, *SYSTEMQUOTE);
if (arg1 == NULL || arg1 == optline)
post_opts = "";
else
for (arg1 = optline; *arg1; arg1++)
{
*(arg1 - 1) = '\0'; /* this should be a space */
post_opts = arg1;
/*
* Are we at the first option, as defined by space,
* double-quote, and a dash?
*/
if (*arg1 == ' ' && *(arg1+1) == '"' && *(arg1+2) == '-')
{
*arg1 = '\0'; /* terminate so we get only program name */
post_opts = arg1 + 1; /* point past whitespace */
break;
}
}
if (postgres_path != NULL)
postgres_path = optline;