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

diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index 0f0064150c42e4a6a0c8b34de14d73f7bf610ea4..4e9504e11b6d2141375c5e5a6806e00aeb7380fb 100644 (file)
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -189,6 +189,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY values             SYSTEM "values.sgml">
 
 <!-- applications and utilities -->
+<!ENTITY pgalterckey        SYSTEM "pg_alterckey.sgml">
 <!ENTITY clusterdb          SYSTEM "clusterdb.sgml">
 <!ENTITY createdb           SYSTEM "createdb.sgml">
 <!ENTITY createuser         SYSTEM "createuser.sgml">
@@ -215,7 +216,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY pgtestfsync        SYSTEM "pgtestfsync.sgml">
 <!ENTITY pgtesttiming       SYSTEM "pgtesttiming.sgml">
 <!ENTITY pgupgrade          SYSTEM "pgupgrade.sgml">
-<!ENTITY pgwaldump         SYSTEM "pg_waldump.sgml">
+<!ENTITY pgwaldump          SYSTEM "pg_waldump.sgml">
 <!ENTITY postgres           SYSTEM "postgres-ref.sgml">
 <!ENTITY postmaster         SYSTEM "postmaster.sgml">
 <!ENTITY psqlRef            SYSTEM "psql-ref.sgml">

diff --git a/doc/src/sgml/ref/pg_alterkey.sgml b/doc/src/sgml/ref/pg_alterckey.sgml
similarity index 100%
rename from doc/src/sgml/ref/pg_alterkey.sgml
rename to doc/src/sgml/ref/pg_alterckey.sgml

diff --git a/src/bin/pg_alterckey/pg_alterckey.c b/src/bin/pg_alterckey/pg_alterckey.c
index 78b06131654354290de6cc17df1f6ba0b99aed3e..6c473e33970b898a211b829f5f661088c3f4cb12 100644 (file)
--- 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)
    {