summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2011-07-30 05:50:18 +0000
committerBruce Momjian2011-07-30 05:50:55 +0000
commita31dc392d684627d0943fe67491bea91c5e619aa (patch)
tree369a35a54ce526c0fc87dfb11b589c539645c533
parentb4fbe392f8ff6ff1a66b488eb7197eef9e1770a4 (diff)
Fix pg_update to properly test for the data directory's existence on
Win32. Backpatch to 9.1.
-rw-r--r--contrib/pg_upgrade/exec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index 3493696f92..2f5e76da2d 100644
--- 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)