diff options
| author | Bruce Momjian <bruce@momjian.us> | 2020-12-25 22:47:16 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2020-12-25 22:47:16 -0500 |
| commit | 82f8c45be551a2940e3cbaf08aa7a521bdac8331 (patch) | |
| tree | 70fcfdf51db04d0a6dcefb7318d64f8c1fa889eb /src | |
| parent | 7705f8ca03713457bf7cde0b859a1ab45e4f268b (diff) | |
| download | postgresql-82f8c45be551a2940e3cbaf08aa7a521bdac8331.tar.gz postgresql-82f8c45be551a2940e3cbaf08aa7a521bdac8331.zip | |
pg_alterckey: adjust doc build and Win32 sleep/open build fails
Fix for commit 62afb42a7f.
Reported-by: Tom Lane
Discussion: https://postgr.es/m/1252111.1608953815@sss.pgh.pa.us
Backpatch-through: master
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_alterckey/pg_alterckey.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/bin/pg_alterckey/pg_alterckey.c b/src/bin/pg_alterckey/pg_alterckey.c index 78b06131654..6c473e33970 100644 --- a/src/bin/pg_alterckey/pg_alterckey.c +++ b/src/bin/pg_alterckey/pg_alterckey.c @@ -343,16 +343,17 @@ create_lockfile(void) unlink(pid_path); /* Sleep to reduce the likelihood of concurrent unlink */ - sleep(2); + pg_usleep(2000000L); /* 2 seconds */ } /* Create our own lockfile? */ - lock_fd = open(pid_path, O_RDWR | O_CREAT | O_EXCL -#ifdef WIN32 - /* delete on close */ - | O_TEMPORARY +#ifndef WIN32 + lock_fd = open(pid_path, O_RDWR | O_CREAT | O_EXCL, pg_file_create_mode); +#else + /* delete on close */ + lock_fd = open(pid_path, O_RDWR | O_CREAT | O_EXCL | O_TEMPORARY, + pg_file_create_mode); #endif - , pg_file_create_mode); if (lock_fd == -1) { |