* 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 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.
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
m4/alphasort.m4
Depends-on:
-dirent
+dirent-h
extensions
configure.ac:
m4/closedir.m4
Depends-on:
-dirent
+dirent-h
dirfd [test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1]
configure.ac:
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>
LGPLv2+
Maintainer:
-all
+++ /dev/null
-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
--- /dev/null
+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
--- /dev/null
+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
--- /dev/null
+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
m4/dirent-safer.m4
Depends-on:
-dirent
+dirent-h
closedir
dirfd
fcntl
+++ /dev/null
-Files:
-tests/test-dirent.c
-
-Depends-on:
-dirent-c++-tests
-
-configure.ac:
-
-Makefile.am:
-TESTS += test-dirent
-check_PROGRAMS += test-dirent
m4/dirfd.m4
Depends-on:
-dirent
+dirent-h
extensions
errno [test $HAVE_DIRFD = 0 || test $REPLACE_DIRFD = 1]
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]
m4/fdopendir.m4
Depends-on:
-dirent
+dirent-h
extensions
at-internal [test $HAVE_FDOPENDIR = 0]
dirfd [test $HAVE_FDOPENDIR = 0]
acl-permissions
assert-h
attribute
-dirent
+dirent-h
errno
extern-inline
minmax
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]
Depends-on:
c99
-dirent
+dirent-h
fcntl-h
fdopendir
openat
# All modules that depend on 'snippet/warn-on-use'.
arpa_inet-h
ctype
-dirent
+dirent-h
fcntl-h
fnmatch-h
glob-h
m4/readdir.m4
Depends-on:
-dirent
+dirent-h
largefile
configure.ac:
m4/rewinddir.m4
Depends-on:
-dirent
+dirent-h
largefile
configure.ac:
Depends-on:
attribute
closedir
-dirent
+dirent-h
fdopendir
free-posix
opendir
Depends-on:
builtin-expect
closedir
-dirent
+dirent-h
extensions
extensions-aix
largefile
+++ /dev/null
-/* Test of <dirent.h> substitute in C++ mode.
- Copyright (C) 2010-2024 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>. */
-
-/* Written by Bruno Haible <bruno@clisp.org>, 2010. */
-
-#define GNULIB_NAMESPACE gnulib
-#include <config.h>
-
-#include <dirent.h>
-
-#include "signature.h"
-
-
-#if GNULIB_TEST_OPENDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::opendir, DIR *, (const char *));
-#endif
-
-#if GNULIB_TEST_READDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::readdir, struct dirent *, (DIR *));
-#endif
-
-#if GNULIB_TEST_REWINDDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::rewinddir, void, (DIR *));
-#endif
-
-#if GNULIB_TEST_CLOSEDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::closedir, int, (DIR *));
-#endif
-
-#if GNULIB_TEST_DIRFD
-SIGNATURE_CHECK (GNULIB_NAMESPACE::dirfd, int, (DIR *));
-#endif
-
-#if GNULIB_TEST_FDOPENDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::fdopendir, DIR *, (int));
-#endif
-
-#if GNULIB_TEST_SCANDIR
-SIGNATURE_CHECK (GNULIB_NAMESPACE::scandir, int,
- (const char *, struct dirent ***,
- int (*) (const struct dirent *),
- int (*) (const struct dirent **, const struct dirent **)));
-#endif
-
-#if GNULIB_TEST_ALPHASORT
-SIGNATURE_CHECK (GNULIB_NAMESPACE::alphasort, int,
- (const struct dirent **, const struct dirent **));
-#endif
-
-
-int
-main ()
-{
-}
--- /dev/null
+/* Test of <dirent.h> substitute in C++ mode.
+ Copyright (C) 2010-2024 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2010. */
+
+#define GNULIB_NAMESPACE gnulib
+#include <config.h>
+
+#include <dirent.h>
+
+#include "signature.h"
+
+
+#if GNULIB_TEST_OPENDIR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::opendir, DIR *, (const char *));
+#endif
+
+#if GNULIB_TEST_READDIR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::readdir, struct dirent *, (DIR *));
+#endif
+
+#if GNULIB_TEST_REWINDDIR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::rewinddir, void, (DIR *));
+#endif
+
+#if GNULIB_TEST_CLOSEDIR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::closedir, int, (DIR *));
+#endif
+
+#if GNULIB_TEST_DIRFD
+SIGNATURE_CHECK (GNULIB_NAMESPACE::dirfd, int, (DIR *));
+#endif
+
+#if GNULIB_TEST_FDOPENDIR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::fdopendir, DIR *, (int));
+#endif
+
+#if GNULIB_TEST_SCANDIR
+SIGNATURE_CHECK (GNULIB_NAMESPACE::scandir, int,
+ (const char *, struct dirent ***,
+ int (*) (const struct dirent *),
+ int (*) (const struct dirent **, const struct dirent **)));
+#endif
+
+#if GNULIB_TEST_ALPHASORT
+SIGNATURE_CHECK (GNULIB_NAMESPACE::alphasort, int,
+ (const struct dirent **, const struct dirent **));
+#endif
+
+
+int
+main ()
+{
+}
--- /dev/null
+/* Test of <dirent.h> substitute.
+ Copyright (C) 2009-2024 Free Software Foundation, Inc.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+/* Written by Eric Blake <ebb9@byu.net>, 2009. */
+
+#include <config.h>
+
+#include <dirent.h>
+
+/* Check for existence of required types. */
+_GL_UNUSED static DIR *dir;
+static struct dirent d;
+static ino_t i;
+
+int
+main (void)
+{
+ return d.d_name[0] + i;
+}
+++ /dev/null
-/* Test of <dirent.h> substitute.
- Copyright (C) 2009-2024 Free Software Foundation, Inc.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>. */
-
-/* Written by Eric Blake <ebb9@byu.net>, 2009. */
-
-#include <config.h>
-
-#include <dirent.h>
-
-/* Check for existence of required types. */
-_GL_UNUSED static DIR *dir;
-static struct dirent d;
-static ino_t i;
-
-int
-main (void)
-{
- return d.d_name[0] + i;
-}