Fix 'pg_ctl reload' to properly preserve postmaster commend-line

arguments on restart.  Patch to releases 8.0 - 8.3.X.

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index f3fc485512bb71efe285ee87c7dca2b01e07bb6f..7d0e6d08897573538273b9de0d10b86fa294e69e 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -3762,7 +3762,7 @@ CreateOptsFile(int argc, char *argv[], char *fullprogname)
 
        fprintf(fp, "%s", fullprogname);
        for (i = 1; i < argc; i++)
-               fprintf(fp, " %s%s%s", SYSTEMQUOTE, argv[i], SYSTEMQUOTE);
+               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
index d9366ba3fff3a418fd47eab8f077469a183108fa..e29710f6e455feef6377d3c1dc8d0838f5e59207 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -578,15 +578,18 @@ read_post_opts(void)
                        {
                                char       *arg1;
 
-                               arg1 = strchr(optline, *SYSTEMQUOTE);
-                               if (arg1 == NULL || arg1 == optline)
-                                       post_opts = "";
-                               else
+                               /*
+                                * Are we at the first option, as defined by space and
+                                * double-quote?
+                                */
+                               if ((arg1 = strstr(optline, " \"")) != NULL ||
+                                       /* check in case this is an older server */
+                                   (arg1 = strstr(optline, " -")) != NULL)
                                {
-                                       *(arg1 - 1) = '\0'; /* this should be a space */
-                                       post_opts = arg1;
+                                       *arg1 = '\0';   /* terminate so we get only program name */
+                                       post_opts = arg1 + 1; /* point past whitespace */
                                }
-                               if (postgres_path != NULL)
+                               if (postgres_path == NULL)
                                        postgres_path = optline;
                        }
                        else