Add missing SYSTEMQUOTEs

Some popen() calls were missing SYSTEMQUOTEs, which caused initdb and
pg_upgrade to fail on Windows, if the installation path contained both
spaces and @ signs.

Patch by Nikhil Deshpande. Backpatch to all supported versions.

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index d22b6d38e291da113c796833ec651ed57fbfc7fa..56e912d8c3d9e775c371c8b1c9c09e06d5a1693a 100644 (file)
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -970,7 +970,7 @@ get_bin_version(ClusterInfo *cluster)
    int         pre_dot,
                post_dot;
 
-   snprintf(cmd, sizeof(cmd), "\"%s/pg_ctl\" --version", cluster->bindir);
+   snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/pg_ctl\" --version" SYSTEMQUOTE, cluster->bindir);
 
    if ((output = popen(cmd, "r")) == NULL ||
        fgets(cmd_output, sizeof(cmd_output), output) == NULL)

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 55083b254df614eea2eab7c4de3bf395d7edc1c4..b53fa8bd088e6480625e26418ea686694c73a6f3 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1503,7 +1503,7 @@ bootstrap_template1(void)
    unsetenv("PGCLIENTENCODING");
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" --boot -x1 %s %s %s",
+            SYSTEMQUOTE "\"%s\" --boot -x1 %s %s %s" SYSTEMQUOTE,
             backend_exec,
             data_checksums ? "-k" : "",
             boot_options, talkargs);
@@ -1544,7 +1544,7 @@ setup_auth(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -1622,7 +1622,7 @@ get_set_pwd(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -1722,7 +1722,7 @@ setup_depend(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -1755,7 +1755,7 @@ setup_sysviews(void)
     * We use -j here to avoid backslashing stuff in system_views.sql
     */
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s -j template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s -j template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -1786,7 +1786,7 @@ setup_description(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -1893,7 +1893,7 @@ setup_collation(void)
 
 #if defined(HAVE_LOCALE_T) && !defined(WIN32)
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2038,7 +2038,7 @@ setup_conversion(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2076,7 +2076,7 @@ setup_dictionary(void)
     * We use -j here to avoid backslashing stuff
     */
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s -j template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s -j template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2127,7 +2127,7 @@ setup_privileges(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2190,7 +2190,7 @@ setup_schema(void)
     * We use -j here to avoid backslashing stuff in information_schema.sql
     */
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s -j template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s -j template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2207,7 +2207,7 @@ setup_schema(void)
    PG_CMD_CLOSE;
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2241,7 +2241,7 @@ load_plpgsql(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2266,7 +2266,7 @@ vacuum_db(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2322,7 +2322,7 @@ make_template0(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);
 
@@ -2354,7 +2354,7 @@ make_postgres(void)
    fflush(stdout);
 
    snprintf(cmd, sizeof(cmd),
-            "\"%s\" %s template1 >%s",
+            SYSTEMQUOTE "\"%s\" %s template1 >%s" SYSTEMQUOTE,
             backend_exec, backend_options,
             DEVNULL);