diff options
| author | Bruce Momjian <bruce@momjian.us> | 2011-05-18 12:13:37 -0400 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2011-05-18 12:13:37 -0400 |
| commit | 6fbf4e0e7c0839c33ed2d63f3c64abdc049f6d1b (patch) | |
| tree | 4f4cd08669a1adddce9d12fc6dea49c567a0bf2a | |
| parent | b3bc63efbc258874b06586aa7548fce37f3581e1 (diff) | |
| download | postgresql-6fbf4e0e7c0839c33ed2d63f3c64abdc049f6d1b.tar.gz postgresql-6fbf4e0e7c0839c33ed2d63f3c64abdc049f6d1b.zip | |
Fix pg_upgrade build problem on Windows when using X_OK access
permission check on the current directory.
| -rw-r--r-- | contrib/pg_upgrade/exec.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c index 6f1c6effabb..ec2f94436bf 100644 --- a/contrib/pg_upgrade/exec.c +++ b/contrib/pg_upgrade/exec.c @@ -94,7 +94,16 @@ void verify_directories(void) { - if (access(".", R_OK | W_OK | X_OK) != 0) + if (access(".", R_OK | W_OK +#ifndef WIN32 + /* + * Directory execute permission on NTFS means "can execute scripts", + * which we don't care about, so skip the check. Also, X_OK is not + * defined in the API. + */ + | X_OK +#endif + ) != 0) pg_log(PG_FATAL, "You must have read and write access in the current directory.\n"); |