fcntl-h: rename from fcntl, in preparation for fcntl(2)

* modules/fcntl: Move <fcntl.h> header replacement...
* modules/fcntl-h: ...to new name, so as not to collide with
like-named function.
* tests/test-fcntl.c: Rename...
* tests/test-fcntl-h.c: ...to this.  Test FD_CLOEXEC.
* modules/fcntl-tests: Rename...
* modules/fcntl-h-tests: ...to this.  Update test file name.
* modules/chdir-long (Depends-on): Update clients.
* modules/chdir-safer (Depends-on): Likewise.
* modules/fcntl-safer (Depends-on): Likewise.
* modules/fts (Depends-on): Likewise.
* modules/mkancesdirs (Depends-on): Likewise.
* modules/mkdir-p (Depends-on): Likewise.
* modules/open (Depends-on): Likewise.
* modules/savewd (Depends-on): Likewise.
* MODULES.html.sh (systems lacking POSIX:2008): Update name.
* doc/posix-headers/fcntl.texi (fcntl.h): Update documentation.

Signed-off-by: Eric Blake <ebb9@byu.net>

12 files changed, 65 insertions, 45 deletions

diff --git a/modules/chdir-long b/modules/chdir-long
index d06878ba52..4025b45afc 100644
--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -9,7 +9,7 @@ m4/chdir-long.m4
 Depends-on:
 atexit
 fchdir
-fcntl
+fcntl-h
 openat
 memchr
 mempcpy
diff --git a/modules/chdir-safer b/modules/chdir-safer
index 95103e8e5b..b3b47e16f6 100644
--- a/modules/chdir-safer
+++ b/modules/chdir-safer
@@ -8,7 +8,7 @@ m4/chdir-safer.m4
 
 Depends-on:
 fchdir
-fcntl
+fcntl-h
 open
 same-inode
 stdbool
diff --git a/modules/fcntl b/modules/fcntl
index 8e2af03e65..a63c4e387a 100644
--- a/modules/fcntl
+++ b/modules/fcntl
@@ -1,35 +1,14 @@
 Description:
-Like <fcntl.h>, but with non-working flags defined to 0.
+Placeholder for eventual fcntl() replacement.
 
 Files:
-lib/fcntl.in.h
-m4/fcntl_h.m4
 
 Depends-on:
-include_next
-unistd
-extensions
+fcntl-h
 
 configure.ac:
-gl_FCNTL_H
 
 Makefile.am:
-BUILT_SOURCES += $(FCNTL_H)
-
-# We need the following in order to create <fcntl.h> when the system
-# doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h
-	$(AM_V_GEN)rm -f $@-t $@ && \
-	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
-	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
-	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
-	      < $(srcdir)/fcntl.in.h; \
-	} > $@-t && \
-	mv $@-t $@
-MOSTLYCLEANFILES += fcntl.h fcntl.h-t
 
 Include:
 #include <fcntl.h>
@@ -38,4 +17,4 @@ License:
 LGPL
 
 Maintainer:
-all
+Eric Blake
diff --git a/modules/fcntl-h b/modules/fcntl-h
new file mode 100644
index 0000000000..8e2af03e65
--- /dev/null
+++ b/modules/fcntl-h
@@ -0,0 +1,41 @@
+Description:
+Like <fcntl.h>, but with non-working flags defined to 0.
+
+Files:
+lib/fcntl.in.h
+m4/fcntl_h.m4
+
+Depends-on:
+include_next
+unistd
+extensions
+
+configure.ac:
+gl_FCNTL_H
+
+Makefile.am:
+BUILT_SOURCES += $(FCNTL_H)
+
+# We need the following in order to create <fcntl.h> when the system
+# doesn't have one that works with the given compiler.
+fcntl.h: fcntl.in.h
+	$(AM_V_GEN)rm -f $@-t $@ && \
+	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
+	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
+	      < $(srcdir)/fcntl.in.h; \
+	} > $@-t && \
+	mv $@-t $@
+MOSTLYCLEANFILES += fcntl.h fcntl.h-t
+
+Include:
+#include <fcntl.h>
+
+License:
+LGPL
+
+Maintainer:
+all
diff --git a/modules/fcntl-h-tests b/modules/fcntl-h-tests
new file mode 100644
index 0000000000..f0cf17364e
--- /dev/null
+++ b/modules/fcntl-h-tests
@@ -0,0 +1,13 @@
+Files:
+tests/test-fcntl-h.c
+
+Depends-on:
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-fcntl-h
+check_PROGRAMS += test-fcntl-h
+
+License:
+LGPL
diff --git a/modules/fcntl-safer b/modules/fcntl-safer
index b9da466083..918223e870 100644
--- a/modules/fcntl-safer
+++ b/modules/fcntl-safer
@@ -10,7 +10,7 @@ m4/fcntl-safer.m4
 m4/mode_t.m4
 
 Depends-on:
-fcntl
+fcntl-h
 open
 unistd-safer
 
diff --git a/modules/fcntl-tests b/modules/fcntl-tests
deleted file mode 100644
index 86d91e5f68..0000000000
--- a/modules/fcntl-tests
+++ /dev/null
@@ -1,13 +0,0 @@
-Files:
-tests/test-fcntl.c
-
-Depends-on:
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-fcntl
-check_PROGRAMS += test-fcntl
-
-License:
-LGPL
diff --git a/modules/fts b/modules/fts
index 2cbed1c1fe..38b22567bb 100644
--- a/modules/fts
+++ b/modules/fts
@@ -13,7 +13,7 @@ d-ino
 d-type
 dirfd
 fchdir
-fcntl
+fcntl-h
 fcntl-safer
 hash
 i-ring
diff --git a/modules/mkancesdirs b/modules/mkancesdirs
index 5bb1ea7bec..5a5c66a3fe 100644
--- a/modules/mkancesdirs
+++ b/modules/mkancesdirs
@@ -8,7 +8,7 @@ m4/mkancesdirs.m4
 
 Depends-on:
 dirname
-fcntl
+fcntl-h
 savewd
 stat-macros
 sys_stat
diff --git a/modules/mkdir-p b/modules/mkdir-p
index 31e873c36a..20e3a23b49 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -10,7 +10,7 @@ m4/mkdir-p.m4
 
 Depends-on:
 error
-fcntl
+fcntl-h
 gettext-h
 lchmod
 lchown
diff --git a/modules/open b/modules/open
index e89efde20c..601e0641d0 100644
--- a/modules/open
+++ b/modules/open
@@ -7,7 +7,7 @@ m4/open.m4
 m4/mode_t.m4
 
 Depends-on:
-fcntl
+fcntl-h
 
 configure.ac:
 gl_FUNC_OPEN
diff --git a/modules/savewd b/modules/savewd
index c2fd42f1a1..360d4b9a38 100644
--- a/modules/savewd
+++ b/modules/savewd
@@ -11,7 +11,7 @@ dirname
 exit
 fchdir
 fcntl-safer
-fcntl
+fcntl-h
 raise
 stdbool
 xalloc