Index: src/backend/postmaster/postmaster.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v
retrieving revision 1.433
retrieving revision 1.434
diff -c -r1.433 -r1.434
*** src/backend/postmaster/postmaster.c	14 Oct 2004 20:23:45 -0000	1.433
--- src/backend/postmaster/postmaster.c	15 Oct 2004 04:54:31 -0000	1.434
***************
*** 3301,3307 ****
  
  	fprintf(fp, "%s", fullprogname);
  	for (i = 1; i < argc; i++)
! 		fprintf(fp, " '%s'", argv[i]);
  	fputs("\n", fp);
  
  	if (fclose(fp))
--- 3301,3307 ----
  
  	fprintf(fp, "%s", fullprogname);
  	for (i = 1; i < argc; i++)
! 		fprintf(fp, " %s%s%s", SYSTEMQUOTE, argv[i], SYSTEMQUOTE);
  	fputs("\n", fp);
  
  	if (fclose(fp))
Index: src/bin/pg_ctl/pg_ctl.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/pg_ctl/pg_ctl.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** src/bin/pg_ctl/pg_ctl.c	15 Oct 2004 04:32:14 -0000	1.37
--- src/bin/pg_ctl/pg_ctl.c	15 Oct 2004 04:54:33 -0000	1.38
***************
*** 501,507 ****
  			{
  				char	   *arg1;
  
! 				arg1 = strchr(optline, '\'');
  				if (arg1 == NULL || arg1 == optline)
  					post_opts = "";
  				else
--- 501,507 ----
  			{
  				char	   *arg1;
  
! 				arg1 = strchr(optline, *SYSTEMQUOTE);
  				if (arg1 == NULL || arg1 == optline)
  					post_opts = "";
  				else