diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-07-30 01:50:19 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-07-30 01:50:51 -0400 |
| commit | 4d2d5b8196c774a1ac23cd7e7567e8bbd589b6aa (patch) | |
| tree | d51ed7fd00315c45fb3b07e348bb892ef1f38dc0 | |
| parent | 4798aa5b09d8da9a221da4b91e92f1683174ad1e (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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index ef21899463b..b632584d5c4 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) |