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

bmomjian · bmomjian · commit 067f1e5fa85d · 2008-06-26T02:47:19.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -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))
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.560 2008/06/26 01:35:45 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.561 2008/06/26 02:47:19 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -4184,7 +4184,7 @@ CreateOptsFile(int argc, char argv[], char fullprogname)`
`4184`	`4184`
`4185`	`4185`	`fprintf(fp, "%s", fullprogname);`
`4186`	`4186`	`for (i = 1; i < argc; i++)`
`4187`		`- fprintf(fp, " " SYSTEMQUOTE "%s" SYSTEMQUOTE, argv[i]);`
	`4187`	`+ fprintf(fp, " \"%s\"", argv[i]);`
`4188`	`4188`	`fputs("\n", fp);`
`4189`	`4189`
`4190`	`4190`	`if (fclose(fp))`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.100 2008/06/26 01:35:45 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.101 2008/06/26 02:47:19 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -573,11 +573,11 @@ read_post_opts(void)`
`573`	`573`	`{`
`574`	`574`	`if (post_opts == NULL)`
`575`	`575`	`{`
`576`		`- char **optlines;`
`577`		`-`
`578`	`576`	`post_opts = ""; /* defatult */`
`579`	`577`	`if (ctl_command == RESTART_COMMAND)`
`580`	`578`	`{`
	`579`	`+ char **optlines;`
	`580`	`+`
`581`	`581`	`optlines = readfile(postopts_file);`
`582`	`582`	`if (optlines == NULL)`
`583`	`583`	`{`
`@@ -593,20 +593,26 @@ read_post_opts(void)`
`593`	`593`	`else`
`594`	`594`	`{`
`595`	`595`	`int len;`
`596`		`- char *optline = NULL;`
	`596`	`+ char *optline;`
`597`	`597`	`char *arg1;`
`598`	`598`
`599`	`599`	`optline = optlines[0];`
	`600`	`+ /* trim off line endings */`
`600`	`601`	`len = strcspn(optline, "\r\n");`
`601`	`602`	`optline[len] = '\0';`
`602`	`603`
`603`		`- arg1 = strchr(optline, *SYSTEMQUOTE);`
`604`		`- if (arg1 == NULL \|\| arg1 == optline)`
`605`		`- post_opts = "";`
`606`		`- else`
	`604`	`+ for (arg1 = optline; *arg1; arg1++)`
`607`	`605`	`{`
`608`		`- (arg1 - 1) = '\0'; / this should be a space */`
`609`		`- post_opts = arg1;`
	`606`	`+ /*`
	`607`	`+ * Are we at the first option, as defined by space,`
	`608`	`+ * double-quote, and a dash?`
	`609`	`+ */`
	`610`	`+ if (arg1 == ' ' && (arg1+1) == '"' && *(arg1+2) == '-')`
	`611`	`+ {`
	`612`	`+ arg1 = '\0'; / terminate so we get only program name */`
	`613`	`+ post_opts = arg1 + 1; /* point past whitespace */`
	`614`	`+ break;`
	`615`	`+ }`
`610`	`616`	`}`
`611`	`617`	`if (postgres_path != NULL)`
`612`	`618`	`postgres_path = optline;`