pg_upgrade: Add SYSTEMQUOTE for Windows paths with spaces

Another fix for commit 244142d32afd02e7408a2ef1f249b00393983822.  We
added SYSTEMQUOTE to the win32 popen() compatibility function in PG 9.4.

Backpatch-through: 9.3 only

diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
index aef830882cdfbeca91567f38d963bd7d8c5c7a73..a480e3c7da1655f2018669641160ff3c2111184f 100644 (file)
--- a/contrib/pg_upgrade/controldata.c
+++ b/contrib/pg_upgrade/controldata.c
@@ -117,7 +117,7 @@ get_control_data(ClusterInfo *cluster, bool live_check)
    if (!live_check || cluster == &new_cluster)
    {
        /* only pg_controldata outputs the cluster state */
-       snprintf(cmd, sizeof(cmd), "\"%s/pg_controldata\" \"%s\"",
+       snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/pg_controldata\" \"%s\"" SYSTEMQUOTE,
                 cluster->bindir, cluster->pgdata);
        fflush(stdout);
        fflush(stderr);