From: Bruno Haible <bruno@clisp.org>
Date: Fri, 27 Dec 2024 22:12:58 +0000 (+0100)
Subject: Rename module dirent to dirent-h.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=604083f4439a3b4fca628c3e1546043c1d75cae7;p=thirdparty%2Fgnulib.git

Rename module dirent to dirent-h.

* modules/dirent-h: Renamed from modules/dirent.
* modules/dirent-h-tests: Renamed from modules/dirent-tests.
* modules/dirent-h-c++-tests: Renamed from modules/dirent-c++-tests.
* tests/test-dirent-h.c: Renamed from tests/test-dirent.c.
* tests/test-dirent-h-c++.cc: Renamed from tests/test-dirent-c++.cc.
* doc/posix-headers/dirent.texi: Update.
* modules/* (Depends-on): Update.
* modules/dirent: New file.
---

diff --git a/ChangeLog b/ChangeLog
index f55968a730..b687a04939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-12-27  Bruno Haible  <bruno@clisp.org>
+
+	Rename module dirent to dirent-h.
+	* modules/dirent-h: Renamed from modules/dirent.
+	* modules/dirent-h-tests: Renamed from modules/dirent-tests.
+	* modules/dirent-h-c++-tests: Renamed from modules/dirent-c++-tests.
+	* tests/test-dirent-h.c: Renamed from tests/test-dirent.c.
+	* tests/test-dirent-h-c++.cc: Renamed from tests/test-dirent-c++.cc.
+	* doc/posix-headers/dirent.texi: Update.
+	* modules/* (Depends-on): Update.
+	* modules/dirent: New file.
+
 2024-12-27  Bruno Haible  <bruno@clisp.org>
 
 	Rename module arpa_inet to arpa_inet-h.
diff --git a/doc/posix-headers/dirent.texi b/doc/posix-headers/dirent.texi
index e3531e607b..28ebb10c92 100644
--- a/doc/posix-headers/dirent.texi
+++ b/doc/posix-headers/dirent.texi
@@ -3,8 +3,8 @@
 
 POSIX specification:@* @url{https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/dirent.h.html}
 
-Gnulib module: dirent
-@mindex dirent
+Gnulib module: dirent-h
+@mindex dirent-h
 
 Portability problems fixed by Gnulib:
 @itemize
diff --git a/modules/alphasort b/modules/alphasort
index 786fcce5e6..bfded47ca4 100644
--- a/modules/alphasort
+++ b/modules/alphasort
@@ -6,7 +6,7 @@ lib/alphasort.c
 m4/alphasort.m4
 
 Depends-on:
-dirent
+dirent-h
 extensions
 
 configure.ac:
diff --git a/modules/closedir b/modules/closedir
index 9353e11f1c..c20870db47 100644
--- a/modules/closedir
+++ b/modules/closedir
@@ -7,7 +7,7 @@ lib/dirent-private.h
 m4/closedir.m4
 
 Depends-on:
-dirent
+dirent-h
 dirfd           [test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1]
 
 configure.ac:
diff --git a/modules/dirent b/modules/dirent
index 2d2f6c4e53..3b088461ae 100644
--- a/modules/dirent
+++ b/modules/dirent
@@ -1,70 +1,20 @@
 Description:
 A GNU-like <dirent.h>.
 
+Status:
+deprecated
+
+Notice:
+This module is deprecated. Use the module 'dirent-h' instead.
+
 Files:
-lib/dirent.in.h
-m4/dirent_h.m4
-m4/unistd_h.m4
-m4/pid_t.m4
 
 Depends-on:
-assert-h
-extensions
-gen-header
-include_next
-snippet/arg-nonnull
-snippet/c++defs
-snippet/warn-on-use
+dirent-h
 
 configure.ac:
-gl_DIRENT_H
-gl_DIRENT_H_REQUIRE_DEFAULTS
-AC_PROG_MKDIR_P
 
 Makefile.am:
-BUILT_SOURCES += dirent.h
-
-# We need the following in order to create <dirent.h> when the system
-# doesn't have one that works with the given compiler.
-dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
-@NMD@	$(AM_V_GEN)$(MKDIR_P) '%reldir%'
-	$(gl_V_at)$(SED_HEADER_STDOUT) \
-	      -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
-	      -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \
-	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
-	      -e 's/@''DIR_HAS_FD_MEMBER''@/$(DIR_HAS_FD_MEMBER)/g' \
-	      -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \
-	      -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \
-	      -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \
-	      -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \
-	      -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \
-	      -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \
-	      -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \
-	      -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \
-	      -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \
-	      -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \
-	      -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \
-	      -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \
-	      -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \
-	      -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \
-	      -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \
-	      -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \
-	      -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \
-	      -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \
-	      -e 's|@''REPLACE_READDIR''@|$(REPLACE_READDIR)|g' \
-	      -e 's|@''REPLACE_REWINDDIR''@|$(REPLACE_REWINDDIR)|g' \
-	      -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \
-	      -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \
-	      -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \
-	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
-	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
-	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
-	      $(srcdir)/dirent.in.h > $@-t
-	$(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += dirent.h dirent.h-t
 
 Include:
 <dirent.h>
@@ -73,4 +23,3 @@ License:
 LGPLv2+
 
 Maintainer:
-all
diff --git a/modules/dirent-c++-tests b/modules/dirent-c++-tests
deleted file mode 100644
index a777848334..0000000000
--- a/modules/dirent-c++-tests
+++ /dev/null
@@ -1,19 +0,0 @@
-Files:
-tests/test-dirent-c++.cc
-tests/signature.h
-
-Status:
-c++-test
-
-Depends-on:
-ansi-c++-opt
-
-configure.ac:
-
-Makefile.am:
-if ANSICXX
-TESTS += test-dirent-c++
-check_PROGRAMS += test-dirent-c++
-test_dirent_c___SOURCES = test-dirent-c++.cc
-test_dirent_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
-endif
diff --git a/modules/dirent-h b/modules/dirent-h
new file mode 100644
index 0000000000..2d2f6c4e53
--- /dev/null
+++ b/modules/dirent-h
@@ -0,0 +1,76 @@
+Description:
+A GNU-like <dirent.h>.
+
+Files:
+lib/dirent.in.h
+m4/dirent_h.m4
+m4/unistd_h.m4
+m4/pid_t.m4
+
+Depends-on:
+assert-h
+extensions
+gen-header
+include_next
+snippet/arg-nonnull
+snippet/c++defs
+snippet/warn-on-use
+
+configure.ac:
+gl_DIRENT_H
+gl_DIRENT_H_REQUIRE_DEFAULTS
+AC_PROG_MKDIR_P
+
+Makefile.am:
+BUILT_SOURCES += dirent.h
+
+# We need the following in order to create <dirent.h> when the system
+# doesn't have one that works with the given compiler.
+dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+@NMD@	$(AM_V_GEN)$(MKDIR_P) '%reldir%'
+	$(gl_V_at)$(SED_HEADER_STDOUT) \
+	      -e 's|@''GUARD_PREFIX''@|${gl_include_guard_prefix}|g' \
+	      -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+	      -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \
+	      -e 's/@''DIR_HAS_FD_MEMBER''@/$(DIR_HAS_FD_MEMBER)/g' \
+	      -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \
+	      -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \
+	      -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \
+	      -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \
+	      -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \
+	      -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \
+	      -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \
+	      -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \
+	      -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \
+	      -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \
+	      -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \
+	      -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \
+	      -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \
+	      -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \
+	      -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \
+	      -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \
+	      -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \
+	      -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \
+	      -e 's|@''REPLACE_READDIR''@|$(REPLACE_READDIR)|g' \
+	      -e 's|@''REPLACE_REWINDDIR''@|$(REPLACE_REWINDDIR)|g' \
+	      -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \
+	      -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \
+	      -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+	      $(srcdir)/dirent.in.h > $@-t
+	$(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += dirent.h dirent.h-t
+
+Include:
+<dirent.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+all
diff --git a/modules/dirent-h-c++-tests b/modules/dirent-h-c++-tests
new file mode 100644
index 0000000000..4964c3ec39
--- /dev/null
+++ b/modules/dirent-h-c++-tests
@@ -0,0 +1,19 @@
+Files:
+tests/test-dirent-h-c++.cc
+tests/signature.h
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-dirent-h-c++
+check_PROGRAMS += test-dirent-h-c++
+test_dirent_h_c___SOURCES = test-dirent-h-c++.cc
+test_dirent_h_c___LDADD = $(LDADD) $(LIBINTL) $(NANOSLEEP_LIB)
+endif
diff --git a/modules/dirent-h-tests b/modules/dirent-h-tests
new file mode 100644
index 0000000000..5b9706823b
--- /dev/null
+++ b/modules/dirent-h-tests
@@ -0,0 +1,11 @@
+Files:
+tests/test-dirent-h.c
+
+Depends-on:
+dirent-h-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-dirent-h
+check_PROGRAMS += test-dirent-h
diff --git a/modules/dirent-safer b/modules/dirent-safer
index 4ea4a25612..2d3c059e38 100644
--- a/modules/dirent-safer
+++ b/modules/dirent-safer
@@ -8,7 +8,7 @@ lib/opendir-safer.c
 m4/dirent-safer.m4
 
 Depends-on:
-dirent
+dirent-h
 closedir
 dirfd
 fcntl
diff --git a/modules/dirent-tests b/modules/dirent-tests
deleted file mode 100644
index 9e6f9a4d0f..0000000000
--- a/modules/dirent-tests
+++ /dev/null
@@ -1,11 +0,0 @@
-Files:
-tests/test-dirent.c
-
-Depends-on:
-dirent-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-dirent
-check_PROGRAMS += test-dirent
diff --git a/modules/dirfd b/modules/dirfd
index a87fa8b2e7..9f20c05cb1 100644
--- a/modules/dirfd
+++ b/modules/dirfd
@@ -7,7 +7,7 @@ lib/dirent-private.h
 m4/dirfd.m4
 
 Depends-on:
-dirent
+dirent-h
 extensions
 errno           [test $HAVE_DIRFD = 0 || test $REPLACE_DIRFD = 1]
 
diff --git a/modules/fchdir b/modules/fchdir
index 084806941b..df69fe0b44 100644
--- a/modules/fchdir
+++ b/modules/fchdir
@@ -6,7 +6,7 @@ lib/fchdir.c
 m4/fchdir.m4
 
 Depends-on:
-dirent
+dirent-h
 unistd
 assure           [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]
 chdir            [test $HAVE_FCHDIR = 0 || test $REPLACE_FCHDIR = 1]
diff --git a/modules/fdopendir b/modules/fdopendir
index 7412254b6e..a47049f377 100644
--- a/modules/fdopendir
+++ b/modules/fdopendir
@@ -7,7 +7,7 @@ lib/dirent-private.h
 m4/fdopendir.m4
 
 Depends-on:
-dirent
+dirent-h
 extensions
 at-internal     [test $HAVE_FDOPENDIR = 0]
 dirfd           [test $HAVE_FDOPENDIR = 0]
diff --git a/modules/file-has-acl b/modules/file-has-acl
index 2fac2027da..ad06e7f0cc 100644
--- a/modules/file-has-acl
+++ b/modules/file-has-acl
@@ -11,7 +11,7 @@ Depends-on:
 acl-permissions
 assert-h
 attribute
-dirent
+dirent-h
 errno
 extern-inline
 minmax
diff --git a/modules/opendir b/modules/opendir
index e0334d31be..17df7ad399 100644
--- a/modules/opendir
+++ b/modules/opendir
@@ -7,7 +7,7 @@ lib/dirent-private.h
 m4/opendir.m4
 
 Depends-on:
-dirent
+dirent-h
 largefile
 filename        [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1]
 unistd          [test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1]
diff --git a/modules/opendirat b/modules/opendirat
index 61500512ee..d62627cf7c 100644
--- a/modules/opendirat
+++ b/modules/opendirat
@@ -7,7 +7,7 @@ lib/opendirat.h
 
 Depends-on:
 c99
-dirent
+dirent-h
 fcntl-h
 fdopendir
 openat
diff --git a/modules/posixcheck b/modules/posixcheck
index f1cc19b1ae..e84a28279b 100644
--- a/modules/posixcheck
+++ b/modules/posixcheck
@@ -9,7 +9,7 @@ Depends-on:
 # All modules that depend on 'snippet/warn-on-use'.
 arpa_inet-h
 ctype
-dirent
+dirent-h
 fcntl-h
 fnmatch-h
 glob-h
diff --git a/modules/readdir b/modules/readdir
index 111fd307af..ec86f417f1 100644
--- a/modules/readdir
+++ b/modules/readdir
@@ -7,7 +7,7 @@ lib/dirent-private.h
 m4/readdir.m4
 
 Depends-on:
-dirent
+dirent-h
 largefile
 
 configure.ac:
diff --git a/modules/rewinddir b/modules/rewinddir
index e4ccd2a6a5..8af849f6f5 100644
--- a/modules/rewinddir
+++ b/modules/rewinddir
@@ -8,7 +8,7 @@ lib/dirent-private.h
 m4/rewinddir.m4
 
 Depends-on:
-dirent
+dirent-h
 largefile
 
 configure.ac:
diff --git a/modules/savedir b/modules/savedir
index e88373c16e..04253cc645 100644
--- a/modules/savedir
+++ b/modules/savedir
@@ -9,7 +9,7 @@ m4/savedir.m4
 Depends-on:
 attribute
 closedir
-dirent
+dirent-h
 fdopendir
 free-posix
 opendir
diff --git a/modules/scandir b/modules/scandir
index fa58900904..38ab51386a 100644
--- a/modules/scandir
+++ b/modules/scandir
@@ -8,7 +8,7 @@ m4/scandir.m4
 Depends-on:
 builtin-expect
 closedir
-dirent
+dirent-h
 extensions
 extensions-aix
 largefile
diff --git a/tests/test-dirent-c++.cc b/tests/test-dirent-h-c++.cc
similarity index 100%
rename from tests/test-dirent-c++.cc
rename to tests/test-dirent-h-c++.cc
diff --git a/tests/test-dirent.c b/tests/test-dirent-h.c
similarity index 100%
rename from tests/test-dirent.c
rename to tests/test-dirent-h.c