From: Bruce Momjian Date: Fri, 15 Oct 2004 04:54:33 +0000 (+0000) Subject: Fix pg_ctl -D handling for Win32: X-Git-Tag: REL8_0_0BETA4~96 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8613eac6c43749b0683500250ebecadf4b3c5dc0;p=postgresql Fix pg_ctl -D handling for Win32: C:\msys\1.0\home\y-asaba>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>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 index 96503e0a81..e3361738ed 100644 --- 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 index 7f9ac2f468..9c87b39715 100644 --- 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