Fix pg_update to properly test for the data directory's existence on

Win32.

Backpatch to 9.1.

diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index ef21899463bd0d29b24207b43a756bb61554483f..b632584d5c42fb3a17c928f990bacb6d90d15c3d 100644 (file)
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -168,7 +168,9 @@ check_data_dir(const char *pg_data)
        {
                struct stat statBuf;
 
-               snprintf(subDirName, sizeof(subDirName), "%s/%s", pg_data,
+               snprintf(subDirName, sizeof(subDirName), "%s%s%s", pg_data,
+                       /* Win32 can't stat() a directory with a trailing slash. */
+                                *requiredSubdirs[subdirnum] ? "/" : "",
                                 requiredSubdirs[subdirnum]);
 
                if (stat(subDirName, &statBuf) != 0)