Fix pg_ctl -D handling for Win32:

bmomjian · bmomjian · commit 8613eac6c437 · 2004-10-15T04:54:33.000Z
C:\msys\1.0\home\y-asaba&gt;pg_ctl -D data restart
	waiting for postmaster to shut down...LOG:  received smart shutdown
	request.
	LOG:  shutting down
	LOG:  database system is shut down
	done
	postmaster stopped

	postmaster starting

	C:\msys\1.0\home\y-asaba&gt;postmaster.exe: invalid argument: "'-D'"
	Try "postmaster.exe --help" for more information.

Yoshiyuki Asaba
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.433 2004/10/14 20:23:45 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.434 2004/10/15 04:54:31 momjian Exp $
  *
  * NOTES
  *
@@ -3301,7 +3301,7 @@ CreateOptsFile(int argc, char *argv[], char *fullprogname)
 
 	fprintf(fp, "%s", fullprogname);
 	for (i = 1; i < argc; i++)
-		fprintf(fp, " '%s'", argv[i]);
+		fprintf(fp, " %s%s%s", SYSTEMQUOTE, argv[i], SYSTEMQUOTE);
 	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-2004, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.37 2004/10/15 04:32:14 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.38 2004/10/15 04:54:33 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -501,7 +501,7 @@ do_start(void)
 			{
 				char	   *arg1;
 
-				arg1 = strchr(optline, '\'');
+				arg1 = strchr(optline, *SYSTEMQUOTE);
 				if (arg1 == NULL || arg1 == optline)
 					post_opts = "";
 				else

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.433 2004/10/14 20:23:45 momjian Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.434 2004/10/15 04:54:31 momjian Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -3301,7 +3301,7 @@ CreateOptsFile(int argc, char argv[], char fullprogname)`
`3301`	`3301`
`3302`	`3302`	`fprintf(fp, "%s", fullprogname);`
`3303`	`3303`	`for (i = 1; i < argc; i++)`
`3304`		`- fprintf(fp, " '%s'", argv[i]);`
	`3304`	`+ fprintf(fp, " %s%s%s", SYSTEMQUOTE, argv[i], SYSTEMQUOTE);`
`3305`	`3305`	`fputs("\n", fp);`
`3306`	`3306`
`3307`	`3307`	`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-2004, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.37 2004/10/15 04:32:14 momjian Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.38 2004/10/15 04:54:33 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -501,7 +501,7 @@ do_start(void)`
`501`	`501`	`{`
`502`	`502`	`char *arg1;`
`503`	`503`
`504`		`- arg1 = strchr(optline, '\'');`
	`504`	`+ arg1 = strchr(optline, *SYSTEMQUOTE);`
`505`	`505`	`if (arg1 == NULL \|\| arg1 == optline)`
`506`	`506`	`post_opts = "";`
`507`	`507`	`else`