From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 31 Jul 2018 23:06:32 +0000 (-0400)
Subject: pg_upgrade:  Add SYSTEMQUOTE for Windows paths with spaces
X-Git-Tag: REL9_3_24~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfc71a1b2567f9d43ba53fce6da4e381c0571c7c;p=thirdparty%2Fpostgresql.git

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 aef830882cd..a480e3c7da1 100644
--- 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);